Author: reinhard Date: 2009-12-20 11:24:50 -0600 (Sun, 20 Dec 2009) New Revision: 10139
Modified: trunk/gnue-reports/src/adapters/filters/Char/char/Writer.py trunk/gnue-reports/src/adapters/filters/Universal/postscript/Writer.py trunk/gnue-reports/src/adapters/filters/Universal/postscript/psutils/GenericDefinitions/MinimalistDriver.py trunk/gnue-reports/src/adapters/filters/Universal/postscript/psutils/GenericDefinitions/Postscript2Driver.py trunk/gnue-reports/src/server/GRServer.py trunk/gnue-reports/src/tools/ReportPostProcessor.py Log: Some fixes for epydoc. Modified: trunk/gnue-reports/src/adapters/filters/Char/char/Writer.py =================================================================== --- trunk/gnue-reports/src/adapters/filters/Char/char/Writer.py 2009-12-19 20:39:16 UTC (rev 10138) +++ trunk/gnue-reports/src/adapters/filters/Char/char/Writer.py 2009-12-20 17:24:50 UTC (rev 10139) @@ -77,7 +77,7 @@ prefix = prefix % cx outputLine += prefix + \ - self.printdef.escape(text).encode(_encoding,'replace') + \ + self.printdef.escape(text).encode(gConfig('textEncoding'),'replace') + \ postfix cx += len(text) @@ -167,4 +167,4 @@ 'none' : lambda obj, width: string.ljust(obj, width), } -_encoding = gConfig('textEncoding') + Modified: trunk/gnue-reports/src/adapters/filters/Universal/postscript/Writer.py =================================================================== --- trunk/gnue-reports/src/adapters/filters/Universal/postscript/Writer.py 2009-12-19 20:39:16 UTC (rev 10138) +++ trunk/gnue-reports/src/adapters/filters/Universal/postscript/Writer.py 2009-12-20 17:24:50 UTC (rev 10139) @@ -29,7 +29,6 @@ __all__ = ['Writer'] from gnue.common.utils.TextUtils import lineWrap -from psutils.PSOutputStream import PS2OutputStream import string, time from gnue.reports.adapters.filters.Universal.Base.Writers.AbsoluteWriter import * Modified: trunk/gnue-reports/src/adapters/filters/Universal/postscript/psutils/GenericDefinitions/MinimalistDriver.py =================================================================== --- trunk/gnue-reports/src/adapters/filters/Universal/postscript/psutils/GenericDefinitions/MinimalistDriver.py 2009-12-19 20:39:16 UTC (rev 10138) +++ trunk/gnue-reports/src/adapters/filters/Universal/postscript/psutils/GenericDefinitions/MinimalistDriver.py 2009-12-20 17:24:50 UTC (rev 10139) @@ -30,8 +30,8 @@ __all__ = ['MinimalistDriver'] -from gnue.reports.adapters.filters.Universal.Base.psutils.PrinterDefinition import * -from gnue.reports.adapters.filters.Universal.Base.psutils.PrinterDefinition import _Property +from gnue.reports.adapters.filters.Universal.postscript.psutils.PrinterDefinition import * +from gnue.reports.adapters.filters.Universal.postscript.psutils.PrinterDefinition import _Property class MinimalistDriver (PrinterDefinition): def __init__(self): Modified: trunk/gnue-reports/src/adapters/filters/Universal/postscript/psutils/GenericDefinitions/Postscript2Driver.py =================================================================== --- trunk/gnue-reports/src/adapters/filters/Universal/postscript/psutils/GenericDefinitions/Postscript2Driver.py 2009-12-19 20:39:16 UTC (rev 10138) +++ trunk/gnue-reports/src/adapters/filters/Universal/postscript/psutils/GenericDefinitions/Postscript2Driver.py 2009-12-20 17:24:50 UTC (rev 10139) @@ -30,7 +30,7 @@ __all__ = ['Postscript2Driver'] -from gnue.reports.adapters.filters.Universal.Base.psutils.PrinterDefinition import * +from gnue.reports.adapters.filters.Universal.postscript.psutils.PrinterDefinition import * class Postscript2Driver (PrinterDefinition): def __init__(self): Modified: trunk/gnue-reports/src/server/GRServer.py =================================================================== --- trunk/gnue-reports/src/server/GRServer.py 2009-12-19 20:39:16 UTC (rev 10138) +++ trunk/gnue-reports/src/server/GRServer.py 2009-12-20 17:24:50 UTC (rev 10139) @@ -32,6 +32,7 @@ import thread from gnue.common.apps import GDebug, GServerApp, GConfig +from gnue.common.apps.i18n import utranslate as u_ from gnue.common.rpc import server from gnue.reports.base.GRConfig import ConfigOptions from gnue.reports.server.GRRpcWrapper import GRRpcHandler @@ -50,17 +51,17 @@ USAGE = GServerApp.GServerApp.USAGE COMMAND_OPTIONS = [ [ 'rpctype',None,'rpc-type',1,'xmlrpc', 'type', - _('Set the GNURPC connection type. The currently supported values ')+ - _("for <type> are 'xmlrpc','xmlrpc.py_xmlrpc', 'xmlrpc.pw_xmlrpc'")+ - _("and 'pyro'. For more information on GNURPC connection types have ")+ - _('a look at common/doc/RPC-abstraction. ')], + u_('Set the GNURPC connection type. The currently supported values ')+ + u_("for <type> are 'xmlrpc','xmlrpc.py_xmlrpc', 'xmlrpc.pw_xmlrpc'")+ + u_("and 'pyro'. For more information on GNURPC connection types have ")+ + u_('a look at common/doc/RPC-abstraction. ')], [ 'rpcport',None,'rpc-port',1,8766, 'port', - _('Set the GNURPC port. For more information on ')+ - _('GNURPC have a look at common/doc/RPC-abstraction. ')], + u_('Set the GNURPC port. For more information on ')+ + u_('GNURPC have a look at common/doc/RPC-abstraction. ')], [ 'username',"u",'username',1,None, 'user', - _('Set the username for the used database.')], + u_('Set the username for the used database.')], [ 'password',"p",'password',1,None, 'password', - _('Set the password for the used database.')]] + u_('Set the password for the used database.')]] SUMMARY = \ "GNUe Reports is the primary reporting agent of the GNU Enterprise system." Modified: trunk/gnue-reports/src/tools/ReportPostProcessor.py =================================================================== --- trunk/gnue-reports/src/tools/ReportPostProcessor.py 2009-12-19 20:39:16 UTC (rev 10138) +++ trunk/gnue-reports/src/tools/ReportPostProcessor.py 2009-12-20 17:24:50 UTC (rev 10139) @@ -30,6 +30,7 @@ from gnue.reports import VERSION from gnue.common.apps.GClientApp import GClientApp +from gnue.common.apps.i18n import utranslate as u_ from gnue.common.utils.FileUtils import openResource, dyn_import from gnue.reports.base import GRFilters, GRExceptions from gnue.reports.base.GRConfig import ConfigOptions @@ -46,7 +47,7 @@ NAME = "GNUe Reports Post-Processor" USAGE = "%s file filter-name ..." % GClientApp.USAGE SUMMARY = \ - _("The GNUe Reports Post-Processor takes the XML output of gnue-reports and applies filters to generate formatted output.") + u_("The GNUe Reports Post-Processor takes the XML output of gnue-reports and applies filters to generate formatted output.") USE_DATABASE_OPTIONS = False USE_CONNECTIONS = False @@ -56,7 +57,7 @@ def __init__(self): self.addCommandOption ('destination', 'd', 'destination', argument = 'dest', default = '-', - help = _("Where should the report be output to? The value of this " + help = u_("Where should the report be output to? The value of this " "depends on the destination type (e.g., if sending to printer, " "then -d specifies the printer name; if sending via email, then " "-d specifies the email address.) If <dest> is \"-\", then output is " @@ -64,7 +65,7 @@ self.addCommandOption ('destination_type', 'D', 'destination-type', argument = 'type', default = 'file', - help = _("This specifies how the report should be output. The currently " + help = u_("This specifies how the report should be output. The currently " "supported values for <type> are file [default], printer, email, " "and fax. Note that printer, email, and fax are sent via the " "server\'s machine, not the client\'s machine. To " @@ -72,13 +73,13 @@ self.addCommandOption ('destination_options', None, 'destination-options', argument = 'opts', - help = _("Options to pass to the destination process. Available options are " + help = u_("Options to pass to the destination process. Available options are " "specific to the type of destination. " "Example: \'--destination-options \"-o nobanner\" \'")) self.addCommandOption ('filter_options', 'F', 'filter-options', argument = 'opts', - help = _("Options to pass to the filter process. Available options are " + help = u_("Options to pass to the filter process. Available options are " "specific to the filter. --list-filters will list available filters " "and their options. Example: \'--filter-options \"paper=letter margin=1,1,1,1\" \'")) @@ -157,7 +158,7 @@ if not namespace: fileHandle.close() - self.handleStartupError(_("The file does not appear to be output from gnue-reports or is in an unsupported document type. (Perhaps gnue-reports was run with the -X option?)")) + self.handleStartupError(u_("The file does not appear to be output from gnue-reports or is in an unsupported document type. (Perhaps gnue-reports was run with the -X option?)")) # Create a Filter Adapter _______________________________________________ commit-gnue mailing list commit-gnue@gnu.org http://lists.gnu.org/mailman/listinfo/commit-gnue