Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert accidental 20685 regressions (and therefore 20699 corrections)

Browse Source 
svn: r20710
This commit is contained in:
Paul Franklin 2012-11-29 21:37:25 +00:00
parent d1bda1ec09
commit dbe7fbc248
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gramps/cli/plug/__init__.py
View File

@ -417,8 +417,8 @@ class CommandLineReport(object):
self.options_help[name].append(option.get_help()) self.options_help[name].append(option.get_help())
else: else:
print(_("Unknown option: %s") % option) print(_("Unknown option: %s") % option)
print(_(" Valid options are:"), ", ".join( print(_(" Valid options are:"),
list(self.options_dict.keys()))) ", ".join(list(self.options_dict.keys())))
print((_(" Use '%(donottranslate)s' to see description " print((_(" Use '%(donottranslate)s' to see description "
"and acceptable values") % "and acceptable values") %
{'donottranslate' : "show=option"})) {'donottranslate' : "show=option"}))
@ -437,8 +437,6 @@ class CommandLineReport(object):
if _format_str: if _format_str:
self.options_dict['off'] = _format_str self.options_dict['off'] = _format_str
self.option_class.handler.output = self.options_dict['of']
self.css_filename = None self.css_filename = None
_chosen_format = None _chosen_format = None
@ -472,7 +470,7 @@ class CommandLineReport(object):
_chosen_format = graphdoc.FORMATS[0]["ext"] _chosen_format = graphdoc.FORMATS[0]["ext"]
else: else:
self.format = None self.format = None
if _chosen_format and _format_str: if _chosen_format and _format_str:
print((_("Ignoring '%(notranslate1)s=%(notranslate2)s' " print((_("Ignoring '%(notranslate1)s=%(notranslate2)s' "
"and using '%(notranslate1)s=%(notranslate3)s'.") % "and using '%(notranslate1)s=%(notranslate3)s'.") %
{'notranslate1' : "off", {'notranslate1' : "off",
@ -498,8 +496,8 @@ class CommandLineReport(object):
else: else:
print(_("Ignoring unknown option: %s") % opt ) print(_("Ignoring unknown option: %s") % opt )
print(_(" Valid options are:"), ", ".join( print(_(" Valid options are:"),
self.options_dict.keys())) ", ".join(list(self.options_dict.keys())))
print(_(" Use '%(donottranslate)s' to see description " print(_(" Use '%(donottranslate)s' to see description "
"and acceptable values") % "and acceptable values") %
{'donottranslate' : "show=option"}) {'donottranslate' : "show=option"})
@ -535,8 +533,7 @@ class CommandLineReport(object):
if not self.doc_option_class: if not self.doc_option_class:
return # this docgen type has no options return # this docgen type has no options
try: try:
if (issubclass(self.doc_option_class, object) or # new class if issubclass(self.doc_option_class, object):
isinstance(self.doc_option_class, ClassType)): # old class
self.doc_options = self.doc_option_class(self.raw_name, self.doc_options = self.doc_option_class(self.raw_name,
self.database) self.database)
doc_options_dict = self.doc_options.options_dict doc_options_dict = self.doc_options.options_dict

6
gramps/gen/plug/_options.py
View File

@ -225,12 +225,12 @@ class OptionListCollection(object):
f.write(' <listitem ' f.write(' <listitem '
'number="%d" value=%s/>\n' % ( 'number="%d" value=%s/>\n' % (
list_index, list_index,
quoteattr(cuni(list_data))) ) quoteattr(str(list_data))) )
f.write(' </option>\n') f.write(' </option>\n')
else: else:
f.write(' <option name=%s value=%s/>\n' % ( f.write(' <option name=%s value=%s/>\n' % (
quoteattr(option_name), quoteattr(option_name),
quoteattr(cuni(option_data))) ) quoteattr(str(option_data))) )
for docgen_name in self.docgen_names: for docgen_name in self.docgen_names:
if module_docgen_opts[docgen_name]: if module_docgen_opts[docgen_name]:
for ix, data in enumerate(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' % 'name=%s value=%s/>\n' %
(quoteattr(docgen_name), (quoteattr(docgen_name),
quoteattr(data[0]), quoteattr(data[0]),
quoteattr(cuni(data[1])) )) quoteattr(str(data[1])) ))
self.write_module_common(f, option_list) self.write_module_common(f, option_list)
f.write('</module>\n') f.write('</module>\n')