[pypy-svn] r50917 - pypy/dist/pypy/annotation

[arigo at codespeak.net]

Author: arigo
Date: Wed Jan 23 15:15:18 2008
New Revision: 50917

Modified:
   pypy/dist/pypy/annotation/binaryop.py
Log:
Fix for pypy.tool.test.test_error.


Modified: pypy/dist/pypy/annotation/binaryop.py
==============================================================================
--- pypy/dist/pypy/annotation/binaryop.py	(original)
+++ pypy/dist/pypy/annotation/binaryop.py	Wed Jan 23 15:15:18 2008
@@ -33,10 +33,11 @@
 
 def unioncheck(*somevalues):
     s_value = unionof(*somevalues)
-    if isdegenerated(s_value) and not TLS.no_side_effects_in_union:
-        bookkeeper = getbookkeeper()
-        if bookkeeper is not None:
-            bookkeeper.ondegenerated('union', s_value)
+    if isdegenerated(s_value):
+        if not getattr(TLS, 'no_side_effects_in_union', 0):
+            bookkeeper = getbookkeeper()
+            if bookkeeper is not None:
+                bookkeeper.ondegenerated('union', s_value)
     return s_value
 
 # XXX unify this with ObjSpace.MethodTable