r5641 - in trunk/gnue-common/src/logic: . adapters

[reinhard]

Author: reinhard
Date: 2004-04-05 11:03:35 -0500 (Mon, 05 Apr 2004)
New Revision: 5641

Modified:
   trunk/gnue-common/src/logic/GTrigger.py
   trunk/gnue-common/src/logic/adapters/python.py
Log:
Improved exception handling. Always pass AbortRequest exceptions through
unchanged.


Modified: trunk/gnue-common/src/logic/GTrigger.py
===================================================================
--- trunk/gnue-common/src/logic/GTrigger.py     2004-04-05 13:18:30 UTC (rev 
5640)
+++ trunk/gnue-common/src/logic/GTrigger.py     2004-04-05 16:03:35 UTC (rev 
5641)
@@ -293,9 +293,9 @@
           #   function.updateNamespace()
           try:
             function(self)
-          except AbortRequest, msg:
+          except AbortRequest:
             if not ignoreAbort:
-              raise AbortRequest(msg)
+              raise
           except RuntimeError, msg:
             # call my own exceptionHandler here.
             print "Runtime Error occured:\n %s" % msg

Modified: trunk/gnue-common/src/logic/adapters/python.py
===================================================================
--- trunk/gnue-common/src/logic/adapters/python.py      2004-04-05 13:18:30 UTC 
(rev 5640)
+++ trunk/gnue-common/src/logic/adapters/python.py      2004-04-05 16:03:35 UTC 
(rev 5641)
@@ -205,13 +205,14 @@
         return localNS ['__result']
       else:
         return None
-    except language.AbortRequest, t:
-      raise language.AbortRequest(t)
-    except language.AbortRequest :
+    except language.AbortRequest:
+      # Pass through AbortRequests unchanged
+      raise
+    except:
+      # All others raise a RuntimeError
       raise language.RuntimeError, self._traceback (2)
 
 
-
   # ---------------------------------------------------------------------------
   # Make sure we use proper identifiers
   # ---------------------------------------------------------------------------
@@ -238,5 +239,3 @@
       if safeId != key:
         namespace [safeId] = namespace [key]
         del namespace [key]
-
-