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

[johannes]

Author: johannes
Date: 2004-09-16 09:49:46 -0500 (Thu, 16 Sep 2004)
New Revision: 6304

Modified:
   trunk/gnue-appserver/src/__init__.py
   trunk/gnue-appserver/src/classrep/Base.py
   trunk/gnue-appserver/src/classrep/Definition.py
   trunk/gnue-appserver/src/classrep/Namespace.py
   trunk/gnue-appserver/src/classrep/SchemaSupport.py
   trunk/gnue-appserver/src/classrep/helpers.py
   trunk/gnue-appserver/src/geasAuthentication.py
   trunk/gnue-appserver/src/geasGsdGen.py
   trunk/gnue-appserver/src/geasInstance.py
   trunk/gnue-appserver/src/geasSession.py
   trunk/gnue-appserver/src/labels.py
   trunk/gnue-appserver/src/language/Object.py
Log:
changed group of some exceptions, make sure all exceptions get unicode args


Modified: trunk/gnue-appserver/src/__init__.py
===================================================================
--- trunk/gnue-appserver/src/__init__.py        2004-09-16 14:03:32 UTC (rev 
6303)
+++ trunk/gnue-appserver/src/__init__.py        2004-09-16 14:49:46 UTC (rev 
6304)
@@ -20,8 +20,9 @@
 #
 
 import gnue
+from gnue.common.apps import errors
 
-class Error (gException):
+class Error (errors.SystemError):
   pass
 
 #

Modified: trunk/gnue-appserver/src/classrep/Base.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Base.py   2004-09-16 14:03:32 UTC (rev 
6303)
+++ trunk/gnue-appserver/src/classrep/Base.py   2004-09-16 14:49:46 UTC (rev 
6304)
@@ -24,13 +24,14 @@
 import types
 import helpers
 from gnue import appserver
+from gnue.common.apps import errors
 from gnue.appserver.language.Object import Object
 
 # =============================================================================
 # Exceptions
 # =============================================================================
 
-class ClassRepositoryError (appserver.Error):
+class ClassRepositoryError (errors.ApplicationError):
   pass
 
 class ItemNotFoundError (ClassRepositoryError):
@@ -149,8 +150,8 @@
     Descendants override this method to specify a condition for fetching a
     single item given by @key.
     """
-    raise ClassRepositoryError ( \
-           u_("%s: _getSingleCondition() not implemented!") % self.table)
+    raise ClassRepositoryError, \
+        u_("%s: _getSingleCondition() not implemented!") % self.table
 
 
   # ---------------------------------------------------------------------------
@@ -162,8 +163,8 @@
     Descendants override this method to create an apropriate instance out of
     @obj, which is a language interface object.
     """
-    raise ClassRepositoryError ( \
-           u_("%s: _getNewItem() not implemented!") % self.table)
+    raise errors.SystemError, \
+        u_("%s: _getNewItem() not implemented!") % self.table
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-appserver/src/classrep/Definition.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Definition.py     2004-09-16 14:03:32 UTC 
(rev 6303)
+++ trunk/gnue-appserver/src/classrep/Definition.py     2004-09-16 14:49:46 UTC 
(rev 6304)
@@ -27,6 +27,7 @@
 
 from Base import ClassRepositoryError
 from Namespace import *
+from gnue.common.apps import errors
 
 # =============================================================================
 # Exceptions
@@ -51,7 +52,7 @@
   def __init__ (self, filename):
     self.filename = filename
     if not os.path.isfile (filename):
-      raise ClassRepositoryError, u_("Cannot find file '%s'") % filename
+      raise errors.AdminError, u_("Cannot find file '%s'") % filename
 
     self.parser   = ConfigParser.ConfigParser ()
     self.parser.read (self.filename)
@@ -94,16 +95,16 @@
     for klass in self._classes.keys ():
       (module, classname) = splitName (klass)
       if not self._modules.has_key (module):
-       raise InvalidDefinitionError (u_("Module '%s' not found") % module)
+       raise InvalidDefinitionError, u_("Module '%s' not found") % module
 
     for prop in self._properties.keys ():
       (klass, property) = string.split (prop, '.')
       if not self._classes.has_key (klass):
-       raise InvalidDefinitionError (u_("Class '%s' not found") % klass)
+       raise InvalidDefinitionError, u_("Class '%s' not found") % klass
 
       (module, item) = splitName (property)
       if not self._modules.has_key (module):
-       raise InvalidDefinitionError (u_("Module '%s' not found") % module)
+       raise InvalidDefinitionError, u_("Module '%s' not found") % module
 
   # ---------------------------------------------------------------------------
   # return a list of modules defined in the configuration file

Modified: trunk/gnue-appserver/src/classrep/Namespace.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Namespace.py      2004-09-16 14:03:32 UTC 
(rev 6303)
+++ trunk/gnue-appserver/src/classrep/Namespace.py      2004-09-16 14:49:46 UTC 
(rev 6304)
@@ -55,7 +55,7 @@
   elif len (parts) == 2:
     return (parts [0], parts [1])
 
-  raise InvalidNameError (name)
+  raise InvalidNameError, (name)
 
 # -----------------------------------------------------------------------------
 # Create a fully qualified name from a namespace and an identifier

Modified: trunk/gnue-appserver/src/classrep/SchemaSupport.py
===================================================================
--- trunk/gnue-appserver/src/classrep/SchemaSupport.py  2004-09-16 14:03:32 UTC 
(rev 6303)
+++ trunk/gnue-appserver/src/classrep/SchemaSupport.py  2004-09-16 14:49:46 UTC 
(rev 6304)
@@ -27,6 +27,7 @@
 from gnue import appserver
 from gnue.common.schema import Objects
 from gnue.common.definitions import GParserHelpers
+from gnue.common.apps import errors
 from gnue.appserver.classrep import Namespace
 
 # =============================================================================
@@ -44,10 +45,10 @@
 # Invalid export type
 # -----------------------------------------------------------------------------
 
-class ExportTypeError (SchemaSupportError):
+class ExportTypeError (errors.UserError):
   def __init__ (self, exportType):
     msg = u_("Invalid export type: '%s'") % exportType
-    SchemaSupportError.__init__ (self, msg)
+    errors.UserError.__init__ (self, msg)
 
 # -----------------------------------------------------------------------------
 # Invalid value for given type of 

Modified: trunk/gnue-appserver/src/classrep/helpers.py
===================================================================
--- trunk/gnue-appserver/src/classrep/helpers.py        2004-09-16 14:03:32 UTC 
(rev 6303)
+++ trunk/gnue-appserver/src/classrep/helpers.py        2004-09-16 14:49:46 UTC 
(rev 6304)
@@ -59,14 +59,14 @@
   is no valid base type a TypeNameError will be raised.
   """
   if typename is None:
-    raise TypeNameError, (repr (typename))
+    raise TypeNameError, repr (typename)
 
   if not typename in BASE_TYPES:
     raise TypeNameError, (typename)
 
   if typename == 'string':
     if scale is not None and scale:
-      raise TypeFormatError, _("string does not support 'scale'")
+      raise TypeFormatError, u_("string does not support 'scale'")
 
   if typename in ['id', 'date', 'time', 'datetime', 'boolean']:
     if length is not None and length:
@@ -77,7 +77,7 @@
   if typename == 'number':
     if scale is not None and scale:
       if length is None or not length:
-        raise TypeFormatError, _("number without 'length'")
+        raise TypeFormatError, u_("number without 'length'")
 
 
 # -----------------------------------------------------------------------------

Modified: trunk/gnue-appserver/src/geasAuthentication.py
===================================================================
--- trunk/gnue-appserver/src/geasAuthentication.py      2004-09-16 14:03:32 UTC 
(rev 6303)
+++ trunk/gnue-appserver/src/geasAuthentication.py      2004-09-16 14:49:46 UTC 
(rev 6304)
@@ -22,13 +22,14 @@
 # $Id$
 
 import string
-from gnue import appserver
 
+from gnue.common.apps import errors
+
 # =============================================================================
 # Exceptions
 # =============================================================================
 
-class AuthError (appserver.Error):
+class AuthError (errors.UserError):
   pass
 
 # =============================================================================

Modified: trunk/gnue-appserver/src/geasGsdGen.py
===================================================================
--- trunk/gnue-appserver/src/geasGsdGen.py      2004-09-16 14:03:32 UTC (rev 
6303)
+++ trunk/gnue-appserver/src/geasGsdGen.py      2004-09-16 14:49:46 UTC (rev 
6304)
@@ -95,7 +95,7 @@
 
   def run (self):
     if self.OPTIONS ['output'] is None:
-      raise StartupError, _("No output file specified.")
+      raise StartupError, u_("No output file specified.")
 
     self.__filename = self.OPTIONS ['output']
     args = [unicode (a, i18n.encoding) for a in self.ARGUMENTS]
@@ -311,7 +311,7 @@
         return native.date
 
       else:
-        raise ValueError (u_("%s is not a valid date object") % repr (native))
+        raise ValueError, u_("%s is not a valid date object") % repr (native)
 
 
     elif datatype == "time":
@@ -322,7 +322,7 @@
         return str (native)
 
       else:
-        raise ValueError (u_("%s is not a valid time object") % repr (native))
+        raise ValueError, u_("%s is not a valid time object") % repr (native)
 
 
     elif datatype == "datetime":
@@ -330,8 +330,7 @@
         return str (native)
 
       else:
-        raise ValueError (u_("%s is not a valid datetime object") % \
-                                    repr (native))
+        raise ValueError, u_("%s is not a valid datetime object") % repr 
(native)
 
     else:
       # must be reference property

Modified: trunk/gnue-appserver/src/geasInstance.py
===================================================================
--- trunk/gnue-appserver/src/geasInstance.py    2004-09-16 14:03:32 UTC (rev 
6303)
+++ trunk/gnue-appserver/src/geasInstance.py    2004-09-16 14:49:46 UTC (rev 
6304)
@@ -29,55 +29,56 @@
 from gnue.appserver.language import Object, Session
 from gnue.common.logic.language import getLanguageAdapter
 from gnue.appserver.classrep import Namespace
+from gnue.common.apps import errors
 
 # =============================================================================
 # Exceptions
 # =============================================================================
 
-class DbValueError (appserver.Error):
+class DbValueError (errors.AdminError):
   def __init__ (self, propertyName, value):
     message = u_("Database returned invalid value '%(value)s' for property "
                  "'%(property)s'") \
               % {"value"   : repr (value),
                  "property": propertyName}
-    appserver.Error.__init__ (self, message)
+    errors.AdminError.__init__ (self, message)
 
-class PropertyValueError (appserver.Error):
+class PropertyValueError (errors.AdminError):
   def __init__ (self, propertyName, value):
     message = u_("Invalid value '%(value)s' for property '%(property)s'") \
               % {"value": repr (value),
                  "property": propertyName}
-    appserver.Error.__init__ (self, message)
+    errors.AdminError.__init__ (self, message)
 
-class ParameterValueError (appserver.Error):
+class ParameterValueError (errors.AdminError):
   def __init__ (self, parameterName, value):
     message = u_("Invalid value '%(value)s' for parameter '%(parameter)s'") \
               % {"value"    : repr (value),
                  "parameter": parameterName}
-    appserver.Error.__init__ (self, message)
+    errors.AdminError.__init__ (self, message)
 
-class ResultTypeError (appserver.Error):
+class ResultTypeError (errors.ApplicationError):
   def __init__ (self, procedure, typename, result):
     msg = u_("Procedure '%(procedure)s' expected a result of type "
              "'%(type)s', but got type '%(resulttype)s'") \
              % {"procedure" : procedure,
                 "type"      : typename,
                 "resulttype": type (result).__name__}
-    appserver.Error.__init__ (self, msg)
+    errors.ApplicationError.__init__ (self, msg)
 
-class PropertyAccessError (appserver.Error):
+class PropertyAccessError (errors.ApplicationError):
   def __init__ (self, classname, propertyname):
     msg = u_("Calculated field '%(property)s' is a read-only field") \
           % {"property": "%s.%s" % (classname, propertyname)}
-    appserver.Error.__init__ (self, msg)
+    errors.ApplicationError.__init__ (self, msg)
 
-class ReferenceError (appserver.Error):
+class ReferenceError (errors.ApplicationError):
   def __init__ (self, name, part):
     msg = u_("Cannot resolve propertyname '%(name)s' because '%(part)s' is " 
              "not a reference property") \
           % {'name': name,
              'part': part}
-    appserver.Error.__init__ (self, msg)
+    errors.ApplicationError.__init__ (self, msg)
 
 # =============================================================================
 # Instance class
@@ -343,7 +344,7 @@
         if prop.gnue_nullable is not None and not prop.gnue_nullable:
           value = self.__record.getField (prop.column)
           if value is None:
-            raise PropertyValueError (prop.fullName, None)
+            raise PropertyValueError, (prop.fullName, None)
 
     ownValidate = None
     triggers    = []

Modified: trunk/gnue-appserver/src/geasSession.py
===================================================================
--- trunk/gnue-appserver/src/geasSession.py     2004-09-16 14:03:32 UTC (rev 
6303)
+++ trunk/gnue-appserver/src/geasSession.py     2004-09-16 14:49:46 UTC (rev 
6304)
@@ -512,7 +512,6 @@
     except:
       if opControl:
         self.__cancelOperation ()
-
       raise
 
     else:

Modified: trunk/gnue-appserver/src/labels.py
===================================================================
--- trunk/gnue-appserver/src/labels.py  2004-09-16 14:03:32 UTC (rev 6303)
+++ trunk/gnue-appserver/src/labels.py  2004-09-16 14:49:46 UTC (rev 6304)
@@ -713,10 +713,10 @@
 
     cont = []
     cont.extend (self._getXMLTag ('author',
-                 {'contents': ["GNU Enterprise Application Server"]}, "  "))
+                 {'contents': [u_("GNU Enterprise Application Server")]}, "  
"))
     cont.extend (self._getXMLTag ('version', {'contents': ['1.0']}, "  "))
     cont.extend (self._getXMLTag ('description',
-           {'contents': ['Generated form for class "%s"' % self.fullName]},
+           {'contents': [u_('Generated form for class "%s"') % self.fullName]},
            "  "))
 
     self.code.extend (self._getXMLTag ('options', {'contents': cont}, "  "))

Modified: trunk/gnue-appserver/src/language/Object.py
===================================================================
--- trunk/gnue-appserver/src/language/Object.py 2004-09-16 14:03:32 UTC (rev 
6303)
+++ trunk/gnue-appserver/src/language/Object.py 2004-09-16 14:49:46 UTC (rev 
6304)
@@ -25,17 +25,18 @@
 
 from Procedure import Procedure
 from gnue import appserver
+from gnue.common.apps import errors
 
 
 # ===========================================================================
 # Exceptions
 # ===========================================================================
 
-class MemberNotFoundError (appserver.Error):
+class MemberNotFoundError (errors.ApplicationError):
   def __init__ (self, classname, member):
     msg = u_("Class '%(classname)s' has no member '%(member)s'") % \
           {"classname": classname, "member": member}
-    appserver.Error.__init__ (self, msg)
+    errors.ApplicationError.__init__ (self, msg)
 
 
 # ===========================================================================
@@ -90,7 +91,7 @@
         return value
 
     else:
-      raise MemberNotFoundError (self.__class, name)
+      raise MemberNotFoundError, (self.__class, name)
 
 
   # -------------------------------------------------------------------------