From dbe7fbc248a2917bd30942edeb3f88c569996ef8 Mon Sep 17 00:00:00 2001
From: Paul Franklin <pf98052@gmail.com>
Date: Thu, 29 Nov 2012 21:37:25 +0000
Subject: [PATCH] revert accidental 20685 regressions (and therefore 20699
 corrections)

svn: r20710
---
 gramps/cli/plug/__init__.py | 15 ++++++---------
 gramps/gen/plug/_options.py |  6 +++---
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/gramps/cli/plug/__init__.py b/gramps/cli/plug/__init__.py
index 4002d1dbd..ae5fc5cb0 100644
--- a/gramps/cli/plug/__init__.py
+++ b/gramps/cli/plug/__init__.py
@@ -417,8 +417,8 @@ class CommandLineReport(object):
                 self.options_help[name].append(option.get_help())
             else:
                 print(_("Unknown option: %s") % option)
-                print(_("   Valid options are:"), ", ".join(
-                                                     list(self.options_dict.keys())))
+                print(_("   Valid options are:"),
+                      ", ".join(list(self.options_dict.keys())))
                 print((_("   Use '%(donottranslate)s' to see description "
                          "and acceptable values") %
                        {'donottranslate' : "show=option"}))
@@ -437,8 +437,6 @@ class CommandLineReport(object):
         if _format_str:
             self.options_dict['off'] = _format_str
         
-        self.option_class.handler.output = self.options_dict['of']
-
         self.css_filename = None
         _chosen_format = None
 
@@ -472,7 +470,7 @@ class CommandLineReport(object):
                 _chosen_format = graphdoc.FORMATS[0]["ext"]
         else:
             self.format = None
-        if _chosen_format and  _format_str:
+        if _chosen_format and _format_str:
             print((_("Ignoring '%(notranslate1)s=%(notranslate2)s' "
                      "and using '%(notranslate1)s=%(notranslate3)s'.") %
                    {'notranslate1' : "off",
@@ -498,8 +496,8 @@ class CommandLineReport(object):
                 
             else:
                 print(_("Ignoring unknown option: %s") % opt )
-                print(_("   Valid options are:"), ", ".join(
-                                                   self.options_dict.keys()))
+                print(_("   Valid options are:"),
+                      ", ".join(list(self.options_dict.keys())))
                 print(_("   Use '%(donottranslate)s' to see description "
                          "and acceptable values") %
                        {'donottranslate' : "show=option"})
@@ -535,8 +533,7 @@ class CommandLineReport(object):
         if not self.doc_option_class:
             return # this docgen type has no options
         try:
-            if (issubclass(self.doc_option_class, object) or   # new class
-                isinstance(self.doc_option_class, ClassType)): # old class
+            if issubclass(self.doc_option_class, object):
                 self.doc_options = self.doc_option_class(self.raw_name,
                                                          self.database)
                 doc_options_dict = self.doc_options.options_dict
diff --git a/gramps/gen/plug/_options.py b/gramps/gen/plug/_options.py
index a9b8fadf8..c7c5f4667 100644
--- a/gramps/gen/plug/_options.py
+++ b/gramps/gen/plug/_options.py
@@ -225,12 +225,12 @@ class OptionListCollection(object):
                             f.write('    <listitem '
                                     'number="%d" value=%s/>\n' % (
                                         list_index,
-                                        quoteattr(cuni(list_data))) )
+                                        quoteattr(str(list_data))) )
                         f.write('  </option>\n')
                 else:
                      f.write('  <option name=%s value=%s/>\n' % (
                              quoteattr(option_name),
-                             quoteattr(cuni(option_data))) )
+                             quoteattr(str(option_data))) )
             for docgen_name in self.docgen_names:
                 if module_docgen_opts[docgen_name]:
                     for ix, data in enumerate(module_docgen_opts[docgen_name]):
@@ -238,7 +238,7 @@ class OptionListCollection(object):
                                 'name=%s value=%s/>\n' %
                                     (quoteattr(docgen_name),
                                      quoteattr(data[0]),
-                                     quoteattr(cuni(data[1])) ))
+                                     quoteattr(str(data[1])) ))
             self.write_module_common(f, option_list)
 
             f.write('</module>\n')