r5276 - in trunk/gnue-appserver/src: . classrep language

[johannes]

Author: johannes
Date: 2004-03-09 03:22:42 -0600 (Tue, 09 Mar 2004)
New Revision: 5276

Modified:
   trunk/gnue-appserver/src/classrep/Namespace.py
   trunk/gnue-appserver/src/classrep/SchemaSupport.py
   trunk/gnue-appserver/src/geasAuthentication.py
   trunk/gnue-appserver/src/geasGsdGen.py
   trunk/gnue-appserver/src/geasInstance.py
   trunk/gnue-appserver/src/geasRpcServer.py
   trunk/gnue-appserver/src/language/Exceptions.py
Log:
Use '%(varname)s' notation for multi-variable-fromatstrings.


Modified: trunk/gnue-appserver/src/classrep/Namespace.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Namespace.py      2004-03-09 07:55:58 UTC 
(rev 5275)
+++ trunk/gnue-appserver/src/classrep/Namespace.py      2004-03-09 09:22:42 UTC 
(rev 5276)
@@ -48,7 +48,8 @@
 # =============================================================================
 class EBadReference (EClassRepository):
   def __init__ (self, item, reference):
-    msg = _("Reference %s of object %s is invalid.") % (reference, item)
+    msg = _("Reference %(reference)s of object %(item)s is invalid.") % \
+           { "reference": reference, "item": item}
     EClassRepository.__init__ (self, msg)
 
 # =============================================================================
@@ -72,7 +73,8 @@
 # =============================================================================
 class EPropertyNotFound (EClassRepository):
   def __init__ (self, classname, property):
-    msg = _("Class '%s' has no property '%s'.") % (classname, property)
+    msg = _("Class '%(classname)s' has no property '%(property)s'.") % \
+            { "classname": classname, "property": property }
     EClassRepository.__init__ (self, msg)
 
 # =============================================================================
@@ -80,7 +82,8 @@
 # =============================================================================
 class EProcedureNotFound (EClassRepository):
   def __init__ (self, classname, procedure):
-    msg = _("Class '%s' has no procedure '%s'.") % (classname, procedure)
+    msg = _("Class '%(classname)s' has no procedure '%(procedure)s'.") % \
+           { "classname": classname, "procedure": procedure }
     EClassRepository.__init__ (self, msg)
 
 # =============================================================================

Modified: trunk/gnue-appserver/src/classrep/SchemaSupport.py
===================================================================
--- trunk/gnue-appserver/src/classrep/SchemaSupport.py  2004-03-09 07:55:58 UTC 
(rev 5275)
+++ trunk/gnue-appserver/src/classrep/SchemaSupport.py  2004-03-09 09:22:42 UTC 
(rev 5276)
@@ -53,8 +53,8 @@
   """
   EInvalidValue is raised if a value doesn't match it's datatype.
   """
-  def __init__ (self, native, text):
-    ESchemaSupport.__init__ (self, text % repr (native))
+  def __init__ (self, text):
+    ESchemaSupport.__init__ (self, text)
 
 
 # =============================================================================
@@ -322,15 +322,16 @@
 
         vmatch = re.compile ('^([+-]{0,1})(\d+)[\.]{0,1}(\d*)$').match (res)
         if vmatch is None:
-          raise EInvalidValue (res, _("%s is not a valid number."))
+          raise EInvalidValue (_("%s is not a valid number.") % repr (res))
 
           sign = vmatch.groups () [0]
           pre  = vmatch.groups () [1]
           frac = vmatch.groups () [2]
 
           if len (pre) > (flength-fscale) or len (frac) > fscale:
-            raise EInvalidValue (res, _("%%s exceeds precision (%d.%d)") % \
-                                       (flength, fscale))
+            raise EInvalidValue (_(
+"""%(value)s exceeds precision (%(length)d.%(scale)d)""") % \
+                  { "value": repr (res), "length": flength, "scale": fscale})
 
       return res
 
@@ -347,7 +348,7 @@
         return native.date
 
       else:
-        raise EInvalidValue (native, _("%s is not a valid date object"))
+        raise EInvalidValue (_("%s is not a valid date object") % repr 
(native))
 
 
     elif datatype == "time":
@@ -358,7 +359,7 @@
         return str (native)
 
       else:
-        raise EInvalidValue (native, _("%s is not a valid time object"))
+        raise EInvalidValue (_("%s is not a valid time object") % repr 
(native))
 
 
     elif datatype == "datetime":
@@ -366,7 +367,8 @@
         return str (native)
 
       else:
-        raise EInvalidValue (native, _("%s is not a valid datetime object"))
+        raise EInvalidValue (_("%s is not a valid datetime object") % \
+                             repr (native))
 
     else:
       # must be reference property

Modified: trunk/gnue-appserver/src/geasAuthentication.py
===================================================================
--- trunk/gnue-appserver/src/geasAuthentication.py      2004-03-09 07:55:58 UTC 
(rev 5275)
+++ trunk/gnue-appserver/src/geasAuthentication.py      2004-03-09 09:22:42 UTC 
(rev 5276)
@@ -96,12 +96,15 @@
 
     if len (authData) > 1:
       # log something
-      GDebug.printMesg (1, _("Internal Error: More than one (%s) record for 
user '%s'.") % (len (authData), user))
+      GDebug.printMesg (1, _(
+"""Internal Error: More than one (%(numrec)s) record 
+for user '%(username)s'.""") % {"numrec"  : len (authData),
+                                "username": user})
 
     if authData[0][2] != auth['password']:
       # log something
-      GDebug.printMesg (1, _("User '%s' didn't provide correct authentication 
information"+
-              " (password).") % user)
+      GDebug.printMesg (1, _("""User '%s' didn't provide correct 
+authentication information (password).""") % user)
 
       return 0 # = no access
 
@@ -123,7 +126,9 @@
     if hasattr (session, "tablelist") and ('all' in tables or classname in 
tables):
       return 1
     else:
-      GDebug.printMesg (1, _("User '%s' has no access to class %s.") % (user, 
classname))
+      GDebug.printMesg (1, _("""User '%(username)s' has no access to 
+class %(classname)s.""") % {"username" : user,
+                            "classname": classname})
       return 0
 
 # =============================================================================

Modified: trunk/gnue-appserver/src/geasGsdGen.py
===================================================================
--- trunk/gnue-appserver/src/geasGsdGen.py      2004-03-09 07:55:58 UTC (rev 
5275)
+++ trunk/gnue-appserver/src/geasGsdGen.py      2004-03-09 09:22:42 UTC (rev 
5276)
@@ -36,8 +36,9 @@
   NAME    = "geasGsdGen"
   VERSION = "0.0.1"
   COMMAND = "gnue-gsdgen"
-  SUMMARY = _("A tool to create GNUe Schema Definition (gsd) files from " + \
-              "the appservers class repository.")
+  SUMMARY = _(
+"""A tool to create GNUe Schema Definition (gsd) files from 
+the appservers class repository.""")
   USAGE   = "%s %s" % (GClientApp.USAGE, " [classname] [classname] [...]")
   COMMAND_OPTIONS = [
     ['output', 'o', 'output-file', True, None, "file",

Modified: trunk/gnue-appserver/src/geasInstance.py
===================================================================
--- trunk/gnue-appserver/src/geasInstance.py    2004-03-09 07:55:58 UTC (rev 
5275)
+++ trunk/gnue-appserver/src/geasInstance.py    2004-03-09 09:22:42 UTC (rev 
5276)
@@ -34,15 +34,17 @@
 
 class EInvalidDBValue (Exception):
   def __init__ (self, value, propertyName):
-    self._text = _("Database returned invalid value '%s' for property '%s'") % 
\
-                   (repr (value), propertyName)
+    self._text = _(
+"""Database returned invalid value '%(value)s' for 
+property '%(property)s'""") % { "value"   : repr (value),
+                                "property": propertyName}
     Exception.__init__ (self, self._text)
 
 
 class EInvalidValue (Exception):
   def __init__ (self, value, propertyName):
-    self._text = _("Invalid value '%s' for property '%s'") % \
-                  (repr (value), propertyName)
+    self._text = _("Invalid value '%(value)s' for property '%(property)s'") % \
+                  {"value": repr (value), "property": propertyName}
     Exception.__init__ (self, self._text)
 
 

Modified: trunk/gnue-appserver/src/geasRpcServer.py
===================================================================
--- trunk/gnue-appserver/src/geasRpcServer.py   2004-03-09 07:55:58 UTC (rev 
5275)
+++ trunk/gnue-appserver/src/geasRpcServer.py   2004-03-09 09:22:42 UTC (rev 
5276)
@@ -124,7 +124,8 @@
 
     if rpctype in ('xmlrpc','xmlrpc.pw_xmlrpc','xmlrpc.py_xmlrpc'):
       port = gConfig ("rpcport")
-      print _("Exporting our services via %s (port %s) ...") % (rpctype,port)
+      print _("Exporting our services via %(rpctype)s (port %(port)s) ...") % \
+               {"rpctype": rpctype, "port": port}
       params = {'port': int (port),
                 'allowed_hosts': gConfig ('allowed_hosts')}
 
@@ -236,10 +237,10 @@
 
     print _("""
 These are the values of the first instance:
-  Name  : %s
-  Street: %s
-  City  : %s
-""") % (rset[0][1], rset[0][2], rset[0][3])
+  Name  : %(name)s
+  Street: %(street)s
+  City  : %(city)s
+""") % { "name": rset[0][1], "street": rset[0][2], "city": rset[0][3] }
 
     print _('Selftest passed!')
 

Modified: trunk/gnue-appserver/src/language/Exceptions.py
===================================================================
--- trunk/gnue-appserver/src/language/Exceptions.py     2004-03-09 07:55:58 UTC 
(rev 5275)
+++ trunk/gnue-appserver/src/language/Exceptions.py     2004-03-09 09:22:42 UTC 
(rev 5276)
@@ -57,5 +57,6 @@
 # ---------------------------------------------------------------------------
 class EMemberNotFound (ELanguageInterface):
   def __init__ (self, aClass, aMember):
-    ELanguageInterface.__init__ (self, _("Class '%s' has no member '%s'") % 
-                                 (aClass, aMember))
+    ELanguageInterface.__init__ (self, 
+       _("Class '%(classname)s' has no member '%(member)s'") % 
+        {"classname": aClass, "member": aMember})