[pypy-commit] pypy translation-cleanup: Move flowspace-specific exceptions to flowcontext.py

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: translation-cleanup
Changeset: r57426:547fe076ad34
Date: 2012-09-15 19:39 +0100
http://bitbucket.org/pypy/pypy/changeset/547fe076ad34/

Log:	Move flowspace-specific exceptions to flowcontext.py

diff --git a/pypy/objspace/flow/flowcontext.py b/pypy/objspace/flow/flowcontext.py
--- a/pypy/objspace/flow/flowcontext.py
+++ b/pypy/objspace/flow/flowcontext.py
@@ -10,8 +10,6 @@
 from pypy.interpreter.pyopcode import (Return, Yield, SuspendedUnroller,
         SReturnValue, SApplicationException, BytecodeCorruption, Reraise,
         RaiseWithExplicitTraceback)
-from pypy.objspace.flow.operation import (ImplicitOperationError,
-        OperationThatShouldNotBePropagatedError)
 from pypy.objspace.flow.model import *
 from pypy.objspace.flow.framestate import (FrameState, recursively_unflatten,
         recursively_flatten)
@@ -20,6 +18,12 @@
 class StopFlowing(Exception):
     pass
 
+class OperationThatShouldNotBePropagatedError(OperationError):
+    pass
+
+class ImplicitOperationError(OperationError):
+    pass
+
 class SpamBlock(Block):
     # make slots optional, for debugging
     if hasattr(Block, '__slots__'):
diff --git a/pypy/objspace/flow/objspace.py b/pypy/objspace/flow/objspace.py
--- a/pypy/objspace/flow/objspace.py
+++ b/pypy/objspace/flow/objspace.py
@@ -9,7 +9,8 @@
 from pypy.interpreter import pyframe, argument
 from pypy.objspace.flow.model import *
 from pypy.objspace.flow import operation
-from pypy.objspace.flow.flowcontext import FlowSpaceFrame, fixeggblocks
+from pypy.objspace.flow.flowcontext import (FlowSpaceFrame, fixeggblocks,
+    OperationThatShouldNotBePropagatedError)
 from pypy.objspace.flow.specialcase import SPECIAL_CASES
 from pypy.rlib.unroll import unrolling_iterable, _unroller
 from pypy.rlib import rstackovf, rarithmetic
@@ -346,7 +347,7 @@
                 etype = e.__class__
                 msg = "generated by a constant operation:\n\t%s%r" % (
                     'getattr', (obj, name))
-                raise operation.OperationThatShouldNotBePropagatedError(
+                raise OperationThatShouldNotBePropagatedError(
                     self.wrap(etype), self.wrap(msg))
             try:
                 return self.wrap(result)
@@ -499,7 +500,7 @@
                     etype = e.__class__
                     msg = "generated by a constant operation:\n\t%s%r" % (
                         name, tuple(args))
-                    raise operation.OperationThatShouldNotBePropagatedError(
+                    raise OperationThatShouldNotBePropagatedError(
                         self.wrap(etype), self.wrap(msg))
                 else:
                     # don't try to constant-fold operations giving a 'long'
diff --git a/pypy/objspace/flow/operation.py b/pypy/objspace/flow/operation.py
--- a/pypy/objspace/flow/operation.py
+++ b/pypy/objspace/flow/operation.py
@@ -15,13 +15,6 @@
 from pypy.objspace.flow import model
 
 
-class OperationThatShouldNotBePropagatedError(OperationError):
-    pass
-
-class ImplicitOperationError(OperationError):
-    pass
-
-
 FunctionByName = {}   # dict {"operation_name": <built-in function>}
 OperationName  = {}   # dict {<built-in function>: "operation_name"}
 Arity          = {}   # dict {"operation name": number of arguments}