[pypy-svn] r55218 - pypy/dist/pypy/interpreter

[fijal at codespeak.net]

Author: fijal
Date: Sun May 25 22:31:42 2008
New Revision: 55218

Modified:
   pypy/dist/pypy/interpreter/gateway.py
Log:
These functions should not catch RuntimeError as well


Modified: pypy/dist/pypy/interpreter/gateway.py
==============================================================================
--- pypy/dist/pypy/interpreter/gateway.py	(original)
+++ pypy/dist/pypy/interpreter/gateway.py	Sun May 25 22:31:42 2008
@@ -486,7 +486,9 @@
             raise OperationError(space.w_KeyboardInterrupt,
                                  space.w_None) 
         except MemoryError: 
-            raise OperationError(space.w_MemoryError, space.w_None) 
+            raise OperationError(space.w_MemoryError, space.w_None)
+        except NotImplementedError, e:
+            raise
         except RuntimeError, e: 
             raise OperationError(space.w_RuntimeError, 
                                  space.wrap("internal error: " + str(e)))
@@ -510,7 +512,9 @@
         except KeyboardInterrupt: 
             raise OperationError(space.w_KeyboardInterrupt, space.w_None) 
         except MemoryError: 
-            raise OperationError(space.w_MemoryError, space.w_None) 
+            raise OperationError(space.w_MemoryError, space.w_None)
+        except NotImplementedError, e:
+            raise
         except RuntimeError, e: 
             raise OperationError(space.w_RuntimeError, 
                                  space.wrap("internal error: " + str(e))) 
@@ -537,7 +541,9 @@
             except KeyboardInterrupt: 
                 raise OperationError(space.w_KeyboardInterrupt, space.w_None) 
             except MemoryError: 
-                raise OperationError(space.w_MemoryError, space.w_None) 
+                raise OperationError(space.w_MemoryError, space.w_None)
+            except NotImplementedError, e:
+                raise
             except RuntimeError, e: 
                 raise OperationError(space.w_RuntimeError, 
                                      space.wrap("internal error: " + str(e))) 
@@ -574,7 +580,9 @@
         except KeyboardInterrupt: 
             raise OperationError(space.w_KeyboardInterrupt, space.w_None) 
         except MemoryError: 
-            raise OperationError(space.w_MemoryError, space.w_None) 
+            raise OperationError(space.w_MemoryError, space.w_None)
+        except NotImplementedError, e:
+            raise
         except RuntimeError, e: 
             raise OperationError(space.w_RuntimeError, 
                                  space.wrap("internal error: " + str(e)))
@@ -595,7 +603,9 @@
         except KeyboardInterrupt: 
             raise OperationError(space.w_KeyboardInterrupt, space.w_None) 
         except MemoryError: 
-            raise OperationError(space.w_MemoryError, space.w_None) 
+            raise OperationError(space.w_MemoryError, space.w_None)
+        except NotImplementedError, e:
+            raise
         except RuntimeError, e: 
             raise OperationError(space.w_RuntimeError, 
                                  space.wrap("internal error: " + str(e))) 
@@ -616,7 +626,9 @@
         except KeyboardInterrupt: 
             raise OperationError(space.w_KeyboardInterrupt, space.w_None) 
         except MemoryError: 
-            raise OperationError(space.w_MemoryError, space.w_None) 
+            raise OperationError(space.w_MemoryError, space.w_None)
+        except NotImplementedError, e:
+            raise
         except RuntimeError, e: 
             raise OperationError(space.w_RuntimeError, 
                                  space.wrap("internal error: " + str(e)))
@@ -637,7 +649,9 @@
         except KeyboardInterrupt: 
             raise OperationError(space.w_KeyboardInterrupt, space.w_None) 
         except MemoryError: 
-            raise OperationError(space.w_MemoryError, space.w_None) 
+            raise OperationError(space.w_MemoryError, space.w_None)
+        except NotImplementedError, e:
+            raise
         except RuntimeError, e: 
             raise OperationError(space.w_RuntimeError, 
                                  space.wrap("internal error: " + str(e)))