r6211 - in trunk/gnue-common/src: apps datasources/drivers/appserver/appserver logic logic/adapters rpc rpc/drivers/xmlrpc/pw_xmlrpc

[johannes]

Author: johannes
Date: 2004-08-26 05:11:21 -0500 (Thu, 26 Aug 2004)
New Revision: 6211

Added:
   trunk/gnue-common/src/apps/errors.py
Removed:
   trunk/gnue-common/src/apps/GExceptions.py
Modified:
   trunk/gnue-common/src/apps/__init__.py
   trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py
   trunk/gnue-common/src/logic/adapters/python.py
   trunk/gnue-common/src/logic/language.py
   trunk/gnue-common/src/rpc/client.py
   trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ClientAdapter.py
   trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py
   trunk/gnue-common/src/rpc/server.py
Log:
*) Moved GExceptions.py to errors.py
*) Renamed gException-members into group, name, message and detail
*) Renamed getType () into getGroup ()



Deleted: trunk/gnue-common/src/apps/GExceptions.py
===================================================================
--- trunk/gnue-common/src/apps/GExceptions.py   2004-08-26 09:45:14 UTC (rev 
6210)
+++ trunk/gnue-common/src/apps/GExceptions.py   2004-08-26 10:11:21 UTC (rev 
6211)
@@ -1,240 +0,0 @@
-# GNU Enterprise Common - Base exception classes
-#
-# Copyright 2001-2004 Free Software Foundation
-#
-# This file is part of GNU Enterprise
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# $Id$
-
-import sys
-import traceback
-import types
-import string
-import exceptions
-
-from gnue.common.apps import i18n
-
-# =============================================================================
-# New basic exception class. Python's standard exception class cannot handle
-# unicode messages.
-# =============================================================================
-
-class gException (Exception):
-  """
-  The same as the builtin python Exception, but can handle messages that are
-  unicode strings.  This exception is available as the builtin class
-  "gException".  All other user-defined exceptions should be derived from this
-  class.
-  """
-  def __init__ (self, message):
-    self.message  = message
-    self.exType   = "system"
-    self.exName   = None
-    self.exDetail = None
-    exceptions.Exception.__init__ (self, o(message))
-
-  # ---------------------------------------------------------------------------
-  # Get the type of the exception
-  # ---------------------------------------------------------------------------
-
-  def getType (self):
-    """
-    This function returns the type (i.e. 'gException', 'System', 'User', ...)
-    of the exception.
-    @return: type of the exception as string
-    """
-    return self.exType
-
-
-  # ---------------------------------------------------------------------------
-  # Return the name of the exception
-  # ---------------------------------------------------------------------------
-
-  def getName (self):
-    """
-    This function returns the name of the exception (i.e. 'FooBarError')
-    @return: name of the exception as unicode string
-    """
-    rep = self.exName is not None and self.exName or "%s" % sys.exc_info () [0]
-    return self._fmtUnicode (rep.split ('.') [-1])
-
-
-  # ---------------------------------------------------------------------------
-  # Get the detail of an exception
-  # ---------------------------------------------------------------------------
-
-  def getDetail (self):
-    """
-    This function returns the exception's detail which is a traceback for
-    gException instances.
-    @return: unicode string with the exception's traceback
-    """
-    if self.exDetail is not None:
-      return self._fmtUnicode (self.exDetail, i18n.encoding)
-
-    tStack = traceback.format_exception (*sys.exc_info ())
-    return self._fmtUnicode ("%s" % string.join (tStack), i18n.encoding)
-
-
-  # ---------------------------------------------------------------------------
-  # Get the message of an exception
-  # ---------------------------------------------------------------------------
-
-  def getMessage (self):
-    """
-    This function returns the message of an exception
-    @return: unicode string with the message of the exception
-    """
-    return self._fmtUnicode (self.message)
-
-
-  # ---------------------------------------------------------------------------
-  # Make sure a given text is a unicode string
-  # ---------------------------------------------------------------------------
-
-  def _fmtUnicode (self, text, encoding = None):
-    """
-    This function returns a given text as unicode string using an optional
-    encoding or the system's default encoding.
-    @param text: the string to be encoded. If this string is already unicode no
-        modification will take place.
-    @return: unicode representation of @text.
-    """
-    if isinstance (text, types.UnicodeType):
-      return text
-    else:
-      if encoding is not None:
-        return unicode (text, encoding, 'replace')
-      else:
-        return unicode (text, errors = 'replace')
-
-
-# =============================================================================
-# System Error
-# =============================================================================
-
-class SystemError (gException):
-  """
-  This exception class should be used for exceptions indicating a bug in GNUe.
-  Whenever such an exception is raised, one have found such a bug :)
-  """
-  def __init__ (self, message):
-    gException.__init__ (self, message)
-    self.exType = "system"
-
-
-# =============================================================================
-# Administrative Errors
-# =============================================================================
-
-class AdminError (gException):
-  """
-  This exception class should be used for exceptions indicating a
-  misconfiguration in a widest sense. This could be a missing module for a
-  dbdriver as well as an 'out of disk space' error.
-  """
-  def __init__ (self, message):
-    gException.__init__ (self, message)
-    self.exType = "admin"
-
-
-# =============================================================================
-# Application Errors
-# =============================================================================
-
-class ApplicationError (gException):
-  """
-  This class should be used for errors caused by applications like a corrupt
-  trigger code, or a misformed xml-file and so on.
-  """
-  def __init__ (self, message):
-    gException.__init__ (self, message)
-    self.exType = "application"
-
-
-# =============================================================================
-# User Errors
-# =============================================================================
-
-class UserError (gException):
-  """
-  This class should be used for exceptions where a user did something wrong, or
-  a situation has occured which isn't dramatic, but the user has to be informed
-  of. Example: wrong password or the user has entered non-numeric data into a
-  numeric field, and so on
-  """
-  def __init__ (self, message):
-    gException.__init__ (self, message)
-    self.exType = "user"
-
-
-# =============================================================================
-# Exceptions raised on a remote site/process
-# =============================================================================
-
-class RemoteError (gException):
-  """
-  This class is used for transporting an exception raised at a remote point.
-  Once it has been created it never changes it's contents. A remote error
-  usually contains System-, Admin- or User-Errors.
-  """
-  def __init__ (self, exType, exName, message, exDetail):
-    gException.__init__ (self, message)
-    self.exType   = exType
-    self.exName   = exName
-    self.exDetail = exDetail
-
-
-# -----------------------------------------------------------------------------
-# Get a tuple (type, name, message, detail) for the last exception raised
-# -----------------------------------------------------------------------------
-
-def getException (count = None):
-  """
-  This function creates a tuple (type, name, message, detail) for the last
-  exception raised. The optional parameter determines the number of lines
-  skipped from the detail traceback.
-  @param count: number of lines to skip in the traceback
-  @returns: tuple with type, name, message and detail of the last exception.
-  """
-  (aType, aValue, aTrace) = sys.exc_info ()
-
-  if isinstance (aValue, gException):
-    return (aValue.getType (), aValue.getName (), aValue.getMessage (),
-            aValue.getDetail ())
-  else:
-    # Exception was not a descendant of gException, so we construct the tuple
-    # from the exception information
-    lines = traceback.format_exception (aType, aValue, aTrace)
-    if count is not None:
-      del lines [1:count + 1]
-
-    exName    = unicode (aType)
-    exMessage = unicode (aValue)
-    exDetail  = string.join (lines)
-    if isinstance (exDetail, types.StringType):
-      exDetail = unicode (exDetail, i18n.encoding)
-    return ('system', exName, exMessage, exDetail)
-
-
-# =============================================================================
-# Code executed once per module load
-# =============================================================================
-
-import __builtin__
-__builtin__.__dict__['gException'] = gException

Modified: trunk/gnue-common/src/apps/__init__.py
===================================================================
--- trunk/gnue-common/src/apps/__init__.py      2004-08-26 09:45:14 UTC (rev 
6210)
+++ trunk/gnue-common/src/apps/__init__.py      2004-08-26 10:11:21 UTC (rev 
6211)
@@ -38,4 +38,4 @@
 import GDebug
 import i18n
 import checktype
-import GExceptions
+import errors

Copied: trunk/gnue-common/src/apps/errors.py (from rev 6208, 
trunk/gnue-common/src/apps/GExceptions.py)
===================================================================
--- trunk/gnue-common/src/apps/GExceptions.py   2004-08-25 16:49:04 UTC (rev 
6208)
+++ trunk/gnue-common/src/apps/errors.py        2004-08-26 10:11:21 UTC (rev 
6211)
@@ -0,0 +1,238 @@
+# GNU Enterprise Common - Base exception classes
+#
+# Copyright 2001-2004 Free Software Foundation
+#
+# This file is part of GNU Enterprise
+#
+# GNU Enterprise is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2, or (at your option) any later version.
+#
+# GNU Enterprise is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with program; see the file COPYING. If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place
+# - Suite 330, Boston, MA 02111-1307, USA.
+#
+# $Id$
+
+import sys
+import traceback
+import types
+import string
+import exceptions
+
+from gnue.common.apps import i18n
+
+# =============================================================================
+# New basic exception class. Python's standard exception class cannot handle
+# unicode messages.
+# =============================================================================
+
+class gException (Exception):
+  """
+  The same as the builtin python Exception, but can handle messages that are
+  unicode strings.  This exception is available as the builtin class
+  "gException".  All other user-defined exceptions should be derived from this
+  class.
+  """
+  def __init__ (self, message, group = 'system'):
+    self.message = message
+    self.group   = group
+    self.name    = None
+    self.detail  = None
+    exceptions.Exception.__init__ (self, o(message))
+
+  # ---------------------------------------------------------------------------
+  # Get the type of the exception
+  # ---------------------------------------------------------------------------
+
+  def getGroup (self):
+    """
+    This function returns the group of the exception.
+    @return: group of the exception as string
+    """
+    return self.group
+
+
+  # ---------------------------------------------------------------------------
+  # Return the name of the exception
+  # ---------------------------------------------------------------------------
+
+  def getName (self):
+    """
+    This function returns the name of the exception (i.e. 'FooBarError')
+    @return: name of the exception as unicode string
+    """
+    rep = self.name or "%s" % sys.exc_info () [0]
+    return self._fmtUnicode (rep.split ('.') [-1])
+
+
+  # ---------------------------------------------------------------------------
+  # Get the detail of an exception
+  # ---------------------------------------------------------------------------
+
+  def getDetail (self, count = None):
+    """
+    This function returns the exception's detail which is a traceback for
+    gException instances.
+    @param count: number of lines to skip in the traceback
+    @return: unicode string with the exception's traceback
+    """
+    if self.detail is not None:
+      return self._fmtUnicode (self.detail, i18n.encoding)
+
+    tStack = traceback.format_exception (*sys.exc_info ())
+    if count is not None:
+      del tStack [1:count + 1]
+    return self._fmtUnicode ("%s" % string.join (tStack), i18n.encoding)
+
+
+  # ---------------------------------------------------------------------------
+  # Get the message of an exception
+  # ---------------------------------------------------------------------------
+
+  def getMessage (self):
+    """
+    This function returns the message of an exception
+    @return: unicode string with the message of the exception
+    """
+    return self._fmtUnicode (self.message)
+
+
+  # ---------------------------------------------------------------------------
+  # Make sure a given text is a unicode string
+  # ---------------------------------------------------------------------------
+
+  def _fmtUnicode (self, text, encoding = None):
+    """
+    This function returns a given text as unicode string using an optional
+    encoding or the system's default encoding.
+    @param text: the string to be encoded. If this string is already unicode no
+        modification will take place.
+    @return: unicode representation of @text.
+    """
+    if isinstance (text, types.UnicodeType):
+      return text
+    else:
+      if encoding is not None:
+        return unicode (text, encoding, 'replace')
+      else:
+        return unicode (text, errors = 'replace')
+
+
+# =============================================================================
+# System Error
+# =============================================================================
+
+class SystemError (gException):
+  """
+  This exception class should be used for exceptions indicating a bug in GNUe.
+  Whenever such an exception is raised, one have found such a bug :)
+  """
+  def __init__ (self, message):
+    gException.__init__ (self, message, 'system')
+
+
+# =============================================================================
+# Administrative Errors
+# =============================================================================
+
+class AdminError (gException):
+  """
+  This exception class should be used for exceptions indicating a
+  misconfiguration in a widest sense. This could be a missing module for a
+  dbdriver as well as an 'out of disk space' error.
+  """
+  def __init__ (self, message):
+    gException.__init__ (self, message, 'admin')
+
+
+# =============================================================================
+# Application Errors
+# =============================================================================
+
+class ApplicationError (gException):
+  """
+  This class should be used for errors caused by applications like a corrupt
+  trigger code, or a misformed xml-file and so on.
+  """
+  def __init__ (self, message):
+    gException.__init__ (self, message, 'application')
+
+
+# =============================================================================
+# User Errors
+# =============================================================================
+
+class UserError (gException):
+  """
+  This class should be used for exceptions where a user did something wrong, or
+  a situation has occured which isn't dramatic, but the user has to be informed
+  of. Example: wrong password or the user has entered non-numeric data into a
+  numeric field, and so on
+  """
+  def __init__ (self, message):
+    gException.__init__ (self, message, 'user')
+
+
+# =============================================================================
+# Exceptions raised on a remote site/process
+# =============================================================================
+
+class RemoteError (gException):
+  """
+  This class is used for transporting an exception raised at a remote point.
+  Once it has been created it never changes it's contents. A remote error
+  usually contains System-, Admin- or User-Errors.
+  """
+  def __init__ (self, group, name, message, detail):
+    gException.__init__ (self, message)
+    self.group  = group
+    self.name   = name
+    self.detail = detail
+
+
+# -----------------------------------------------------------------------------
+# Get a tuple (type, name, message, detail) for the last exception raised
+# -----------------------------------------------------------------------------
+
+def getException (count = None):
+  """
+  This function creates a tuple (type, name, message, detail) for the last
+  exception raised. The optional parameter determines the number of lines
+  skipped from the detail traceback.
+  @param count: number of lines to skip in the traceback
+  @returns: tuple with type, name, message and detail of the last exception.
+  """
+  (aType, aValue, aTrace) = sys.exc_info ()
+
+  if isinstance (aValue, gException):
+    return (aValue.getGroup (), aValue.getName (), aValue.getMessage (),
+            aValue.getDetail (count))
+  else:
+    # Exception was not a descendant of gException, so we construct the tuple
+    # from the exception information
+    lines = traceback.format_exception (aType, aValue, aTrace)
+    if count is not None:
+      del lines [1:count + 1]
+
+    name    = unicode (aType)
+    message = unicode (aValue)
+    detail  = string.join (lines)
+    if isinstance (detail, types.StringType):
+      detail = unicode (detail, i18n.encoding)
+    return ('system', name, message, detail)
+
+
+# =============================================================================
+# Code executed once per module load
+# =============================================================================
+
+import __builtin__
+__builtin__.__dict__['gException'] = gException

Modified: 
trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py 
2004-08-26 09:45:14 UTC (rev 6210)
+++ trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py 
2004-08-26 10:11:21 UTC (rev 6211)
@@ -31,7 +31,7 @@
 from gnue.common.datasources import Exceptions
 from gnue.common.datasources.drivers import Base
 from gnue.common.rpc import client
-from gnue.common.apps import GExceptions
+from gnue.common.apps import errors
 
 import DataObject
 
@@ -80,7 +80,7 @@
     try:
       self._sess_id = self._sm.open ({'user': user, 'password': passwd})
 
-    except GExceptions.RemoteError, e:
+    except errors.RemoteError, e:
       if e.getName () == 'AuthError':
         raise Exceptions.LoginError, e.getMessage ()
       else:

Modified: trunk/gnue-common/src/logic/adapters/python.py
===================================================================
--- trunk/gnue-common/src/logic/adapters/python.py      2004-08-26 09:45:14 UTC 
(rev 6210)
+++ trunk/gnue-common/src/logic/adapters/python.py      2004-08-26 10:11:21 UTC 
(rev 6211)
@@ -25,7 +25,7 @@
 import re
 import copy
 
-from gnue.common.apps import GExceptions
+from gnue.common.apps import errors
 from gnue.common.logic import language
 from gnue.common.logic.adapters import Base
 
@@ -149,7 +149,7 @@
     try:
       tabPos = text.find ('\t')
       if tabPos > -1:
-        raise GExceptions.ApplicationError, \
+        raise errors.ApplicationError, \
            u_("Sourcecode contains tab character at position %d") % tabPos
 
 
@@ -180,7 +180,7 @@
       self._compiled = compile (revisedCode.encode ('utf-8'),
                      '<%s>' % self._context.shortname.encode ('utf-8'), 'exec')
     except:
-      (etype, name, message, detail) = GExceptions.getException (1)
+      (etype, name, message, detail) = errors.getException (1)
       raise language.CompileError, ('Application', name, message, detail)
 
 
@@ -216,7 +216,7 @@
 
     except:
       # All others raise a RuntimeError
-      (etype, name, message, detail) = GExceptions.getException (2)
+      (etype, name, message, detail) = errors.getException (2)
       raise language.RuntimeError, ('Application', name, message, detail)
 
 

Modified: trunk/gnue-common/src/logic/language.py
===================================================================
--- trunk/gnue-common/src/logic/language.py     2004-08-26 09:45:14 UTC (rev 
6210)
+++ trunk/gnue-common/src/logic/language.py     2004-08-26 10:11:21 UTC (rev 
6211)
@@ -22,7 +22,7 @@
 
 import string
 
-from gnue.common.apps import GExceptions
+from gnue.common.apps import errors
 from gnue.common.utils.FileUtils import dyn_import
 
 adapters = {}
@@ -42,20 +42,20 @@
 # Python module not available
 # -----------------------------------------------------------------------------
 
-class AdapterNotFoundError (GExceptions.AdminError):
+class AdapterNotFoundError (errors.AdminError):
   """
   The language adapter for the requested language cannot be imported.
   """
   def __init__ (self, language):
     msg = u_("No adapter available for language '%s'") % language
-    GExceptions.AdminError.__init__ (self, msg)
+    errors.AdminError.__init__ (self, msg)
 
 
 # -----------------------------------------------------------------------------
 # Abstract method not implemented
 # -----------------------------------------------------------------------------
 
-class ImplementationError (GExceptions.SystemError):
+class ImplementationError (errors.SystemError):
   """
   Exception raised if an abstract method isn't implemented by a descendant.
   """
@@ -63,27 +63,27 @@
     msg = u_("The class '%(class)s' has no implementation for '%(method)s'") \
            % {"class" : classname,
               "method": method}
-    GExceptions.SystemError.__init__ (self, msg)
+    errors.SystemError.__init__ (self, msg)
 
 # -----------------------------------------------------------------------------
 # Code failed on compilation
 # -----------------------------------------------------------------------------
 
-class CompileError (GExceptions.RemoteError):
+class CompileError (errors.RemoteError):
   pass
 
 # -----------------------------------------------------------------------------
 # Code failed on execution
 # -----------------------------------------------------------------------------
 
-class RuntimeError (GExceptions.RemoteError):
+class RuntimeError (errors.RemoteError):
   pass
 
 # -----------------------------------------------------------------------------
 # Abort the current execution
 # -----------------------------------------------------------------------------
 
-class AbortRequest (GExceptions.UserError):
+class AbortRequest (errors.UserError):
   pass
 
 # -----------------------------------------------------------------------------

Modified: trunk/gnue-common/src/rpc/client.py
===================================================================
--- trunk/gnue-common/src/rpc/client.py 2004-08-26 09:45:14 UTC (rev 6210)
+++ trunk/gnue-common/src/rpc/client.py 2004-08-26 10:11:21 UTC (rev 6211)
@@ -23,7 +23,7 @@
 
 import string
 
-from gnue.common.apps import GExceptions, plugin
+from gnue.common.apps import errors, plugin
 
 # =============================================================================
 # Public functions
@@ -52,7 +52,7 @@
 # Requested adapter does not exist
 # -----------------------------------------------------------------------------
 
-class InvalidAdapter (GExceptions.AdminError):
+class InvalidAdapter (errors.AdminError):
   pass
 
 # -----------------------------------------------------------------------------
@@ -60,7 +60,7 @@
 # supplied parameters do not point to a valid server, etc.
 # -----------------------------------------------------------------------------
 
-class AdapterInitializationError (GExceptions.AdminError):
+class AdapterInitializationError (errors.AdminError):
   pass
 
 # -----------------------------------------------------------------------------
@@ -76,7 +76,7 @@
 # Parent for all caller errors
 # -----------------------------------------------------------------------------
 
-class ProgrammingError (GExceptions.SystemError):
+class ProgrammingError (errors.SystemError):
   pass
 
 # -----------------------------------------------------------------------------
@@ -102,7 +102,7 @@
 if __name__ == '__main__':
 
   import traceback
-  from gnue.common.apps import GExceptions
+  from gnue.common.apps import errors
 
   connection = attach ('xmlrpc', {})
 
@@ -127,10 +127,10 @@
 
   except Exception, e:
     print "-" * 70
-    if isinstance (e, GExceptions.gException):
-      print "Exception Type:", e.getType ()
-      print "Exception Name:", e.getName ()
-      print "Message       :", e.getMessage ()
+    if isinstance (e, errors.gException):
+      print "Exception Group:", e.getGroup ()
+      print "Exception Name :", e.getName ()
+      print "Message        :", e.getMessage ()
     else:
       print "Exception:", e
 
@@ -138,7 +138,7 @@
     print "local traceback:"
     traceback.print_exc ()
 
-    if isinstance (e, GExceptions.gException):
+    if isinstance (e, errors.gException):
       print "-" * 70
       print "remote exception detail:", e.getDetail ()
       print "-" * 70

Modified: trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ClientAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ClientAdapter.py 
2004-08-26 09:45:14 UTC (rev 6210)
+++ trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ClientAdapter.py 
2004-08-26 10:11:21 UTC (rev 6211)
@@ -38,7 +38,7 @@
 import string
 import sys
 
-from gnue.common.apps import GExceptions
+from gnue.common.apps import errors
 from gnue.common.rpc import client
 from gnue.common.rpc.drivers import Base
 
@@ -96,7 +96,7 @@
     except xmlrpclib.Fault, e:
       (exType, exName, exMessage, exDetail) = string.split (e.faultString,
                                                             u'\x91')
-      raise GExceptions.RemoteError, (exType, exName, exMessage, exDetail)
+      raise errors.RemoteError, (exType, exName, exMessage, exDetail)
 
     # check, if an object handle is sent
     # TODO: make a better check

Modified: trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py 
2004-08-26 09:45:14 UTC (rev 6210)
+++ trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py 
2004-08-26 10:11:21 UTC (rev 6211)
@@ -34,7 +34,7 @@
 #
 
 from gnue.common.rpc import server
-from gnue.common.apps import GExceptions
+from gnue.common.apps import errors
 from gnue.common.rpc.drivers._helpers import ObjectLibrarian, DirectoryServer
 
 from BaseHTTPServer import BaseHTTPRequestHandler;
@@ -301,7 +301,7 @@
       try:
         result = server_method(*__params)
       except:
-        stack = string.join (GExceptions.getException (1), u'\x91')
+        stack = string.join (errors.getException (1), u'\x91')
         return xmlrpclib.Fault (1, stack)
 
       else:

Modified: trunk/gnue-common/src/rpc/server.py
===================================================================
--- trunk/gnue-common/src/rpc/server.py 2004-08-26 09:45:14 UTC (rev 6210)
+++ trunk/gnue-common/src/rpc/server.py 2004-08-26 10:11:21 UTC (rev 6211)
@@ -25,7 +25,7 @@
 
 import string
 
-from gnue.common.apps import GExceptions, plugin
+from gnue.common.apps import errors, plugin
 from gnue.common.utils.FileUtils import openResource
 
 # =============================================================================
@@ -114,7 +114,7 @@
 # The requested adapter does not exist...
 # -----------------------------------------------------------------------------
 
-class InvalidAdapter (GExceptions.AdminError):
+class InvalidAdapter (errors.AdminError):
   pass
 
 # -----------------------------------------------------------------------------
@@ -122,7 +122,7 @@
 # supplied parameters do not point to a valid server, etc.
 # -----------------------------------------------------------------------------
 
-class AdapterInitializationError (GExceptions.AdminError):
+class AdapterInitializationError (errors.AdminError):
   pass
 
 # -----------------------------------------------------------------------------
@@ -138,7 +138,7 @@
 # Parent for all caller errors
 # -----------------------------------------------------------------------------
 
-class ProgrammingError (GExceptions.SystemError):
+class ProgrammingError (errors.SystemError):
   pass
 
 # -----------------------------------------------------------------------------