r5640 - trunk/gnue-common/src/datasources/drivers/appserver/appserver

[reinhard]

Author: reinhard
Date: 2004-04-05 08:18:30 -0500 (Mon, 05 Apr 2004)
New Revision: 5640

Modified:
   trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py
Log:
Always raise the correct type of exception.


Modified: 
trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py 
2004-04-05 13:03:09 UTC (rev 5639)
+++ trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py 
2004-04-05 13:18:30 UTC (rev 5640)
@@ -26,6 +26,9 @@
 #### ATTRIBUTES, PLEASE UPDATE info.py ####
 ####                                   ####
 
+import sys
+
+from gnue.common.datasources import Exceptions
 from gnue.common.datasources.drivers import Base
 from gnue.common.rpc import client
 
@@ -72,8 +75,19 @@
       self._server.setTimeout (float (connectData ['timeout']))
 
     self._sm = self._server.request ('Session')
-    self._sess_id = self._sm.open ({'user': user, 'password': passwd})
 
+    try:
+      self._sess_id = self._sm.open ({'user': user, 'password': passwd})
+    except client.DistantError, e:
+      if e.type == 'AuthError':
+        raise Exceptions.LoginError, e.message
+      else:
+        raise Exceptions.ConnectionError, e.message
+    except gException, e:
+      raise Exceptions.ConnectError, e.message  # handle unicode message
+    except:
+      raise Exceptions.ConnectError, str (sys.exc_info () [1])
+
     # Can be removed after the call to _dataConnection.cursor() is removed from
     # the Base driver
     self.native = self