[gnue] r6958 - in trunk/gnue-appserver/src: . classrep language

[johannes]

Author: johannes
Date: 2005-02-04 04:14:03 -0600 (Fri, 04 Feb 2005)
New Revision: 6958

Modified:
   trunk/gnue-appserver/src/__init__.py
   trunk/gnue-appserver/src/classrep/SchemaSupport.py
   trunk/gnue-appserver/src/classrep/__init__.py
   trunk/gnue-appserver/src/classrep/helpers.py
   trunk/gnue-appserver/src/geasSession.py
   trunk/gnue-appserver/src/geasSessionManager.py
   trunk/gnue-appserver/src/language/Session.py
Log:
Fixed appserver's __init__ by removing appserver.Error and additionally 
updating all depending exceptions


Modified: trunk/gnue-appserver/src/__init__.py
===================================================================
--- trunk/gnue-appserver/src/__init__.py        2005-02-04 09:56:53 UTC (rev 
6957)
+++ trunk/gnue-appserver/src/__init__.py        2005-02-04 10:14:03 UTC (rev 
6958)
@@ -19,12 +19,6 @@
 # Copyright 2001-2005 Free Software Foundation
 #
 
-import gnue
-from gnue.common.apps import errors
-
-class Error (errors.SystemError):
-  pass
-
 #
 # CREATING A RELEASE:
 #   1. Change _version to be the current version number

Modified: trunk/gnue-appserver/src/classrep/SchemaSupport.py
===================================================================
--- trunk/gnue-appserver/src/classrep/SchemaSupport.py  2005-02-04 09:56:53 UTC 
(rev 6957)
+++ trunk/gnue-appserver/src/classrep/SchemaSupport.py  2005-02-04 10:14:03 UTC 
(rev 6958)
@@ -24,7 +24,6 @@
 import types
 import mx.DateTime.ISO
 
-from gnue import appserver
 from gnue.common.schema import Objects
 from gnue.common.definitions import GParserHelpers
 from gnue.common.apps import errors
@@ -34,27 +33,12 @@
 # Exceptions
 # =============================================================================
 
-# -----------------------------------------------------------------------------
-# Base exception
-# -----------------------------------------------------------------------------
-
-class SchemaSupportError (appserver.Error):
-  pass
-
-# -----------------------------------------------------------------------------
-# Invalid export type
-# -----------------------------------------------------------------------------
-
 class ExportTypeError (errors.UserError):
   def __init__ (self, exportType):
     msg = u_("Invalid export type: '%s'") % exportType
     errors.UserError.__init__ (self, msg)
 
-# -----------------------------------------------------------------------------
-# Invalid value for given type of 
-# -----------------------------------------------------------------------------
-
-class ValueError (SchemaSupportError):
+class ValueError (errors.SystemError):
   pass
 
 

Modified: trunk/gnue-appserver/src/classrep/__init__.py
===================================================================
--- trunk/gnue-appserver/src/classrep/__init__.py       2005-02-04 09:56:53 UTC 
(rev 6957)
+++ trunk/gnue-appserver/src/classrep/__init__.py       2005-02-04 10:14:03 UTC 
(rev 6958)
@@ -28,12 +28,9 @@
 from Namespace import *
 from Definition import *
 from gnue import paths
-from gnue import appserver
 from gnue.appserver.language import Session
-from gnue.common.apps import i18n
+from gnue.common.apps import errors, i18n
 
-class Error (appserver.Error):
-  pass
 
 # -----------------------------------------------------------------------------
 # Global module and class list

Modified: trunk/gnue-appserver/src/classrep/helpers.py
===================================================================
--- trunk/gnue-appserver/src/classrep/helpers.py        2005-02-04 09:56:53 UTC 
(rev 6957)
+++ trunk/gnue-appserver/src/classrep/helpers.py        2005-02-04 10:14:03 UTC 
(rev 6958)
@@ -20,7 +20,7 @@
 #
 # $Id: $
 
-from gnue import appserver
+from gnue.common.apps import errors
 
 BASE_TYPES = ['boolean', 'date', 'datetime', 'id', 'number', 'string', 'time']
 
@@ -29,7 +29,7 @@
 # Exceptions
 # =============================================================================
 
-class ValidationError (appserver.Error):
+class ValidationError (errors.ApplicationError):
   pass
 
 class TypeNameError (ValidationError):

Modified: trunk/gnue-appserver/src/geasSession.py
===================================================================
--- trunk/gnue-appserver/src/geasSession.py     2005-02-04 09:56:53 UTC (rev 
6957)
+++ trunk/gnue-appserver/src/geasSession.py     2005-02-04 10:14:03 UTC (rev 
6958)
@@ -29,7 +29,6 @@
 from gnue.common.apps import errors, i18n
 from gnue.common.datasources import GConditions
 
-from gnue import appserver
 from gnue.appserver import data, geasList, geasInstance
 from gnue.appserver.geasAuthentication import AuthError
 
@@ -38,22 +37,22 @@
 # Exceptions
 # =============================================================================
 
-class InstanceNotFoundError (appserver.Error):
+class InstanceNotFoundError (errors.SystemError):
   def __init__ (self, classname, objectId):
     msg = u_("Instance '%(objectId)s' of class '%(classname)s' not found") \
           % {'objectId' : objectId,
              'classname': classname }
-    appserver.Error.__init__ (self, msg)
+    errors.SystemError.__init__ (self, msg)
 
 class AccessDeniedError (AuthError):
   def __init__ (self, classname):
     msg = u_("Access to class '%s' denied") % classname
     AuthError.__init__ (self, msg)
 
-class ListNotFoundError (appserver.Error):
+class ListNotFoundError (errors.SystemError):
   def __init__ (self, listId):
     msg = u_ ("Cannot find a list with ID '%s'") % listId
-    appserver.Error.__init__ (self, msg)
+    errors.SystemError.__init__ (self, msg)
 
 class ConditionDataTypeError (errors.ApplicationError):
   def __init__ (self, condition):

Modified: trunk/gnue-appserver/src/geasSessionManager.py
===================================================================
--- trunk/gnue-appserver/src/geasSessionManager.py      2005-02-04 09:56:53 UTC 
(rev 6957)
+++ trunk/gnue-appserver/src/geasSessionManager.py      2005-02-04 10:14:03 UTC 
(rev 6958)
@@ -31,7 +31,7 @@
 import fnmatch
 import time
 
-from gnue import appserver, paths
+from gnue import paths
 from gnue.common.datasources import GConnections
 from gnue.common.apps import i18n, GConfig, errors
 from gnue.appserver.gcd import readgcd
@@ -41,10 +41,10 @@
 # Exceptions
 # =============================================================================
 
-class SessionNotFoundError (appserver.Error):
+class SessionNotFoundError (errors.SystemError):
   def __init__ (self, sessionId):
     msg = u_("Cannot find a session with ID '%s'") % sessionId
-    appserver.Error.__init__ (self, msg)
+    errors.SystemError.__init__ (self, msg)
 
 # =============================================================================
 # Session Manager class

Modified: trunk/gnue-appserver/src/language/Session.py
===================================================================
--- trunk/gnue-appserver/src/language/Session.py        2005-02-04 09:56:53 UTC 
(rev 6957)
+++ trunk/gnue-appserver/src/language/Session.py        2005-02-04 10:14:03 UTC 
(rev 6958)
@@ -25,7 +25,6 @@
 
 from ObjectList import ObjectList
 from Object import Object
-from gnue import appserver
 from gnue.common.apps import i18n, errors
 
 
@@ -33,10 +32,10 @@
 # Exceptions
 # ===========================================================================
 
-class NoContextError (appserver.Error):
+class NoContextError (errors.ApplicationError):
   def __init__ (self, name):
     msg = u_("Cannot qualifiy name '%s', no context specified") % name
-    appserver.Error.__init__ (self, msg)
+    errors.ApplicationError.__init__ (self, msg)
 
 class MessageNotFoundError (errors.ApplicationError):
   def __init__ (self, message):