[pypy-svn] r7641 - pypy/trunk/src/pypy/annotation

[arigo at codespeak.net]

Author: arigo
Date: Tue Nov 23 18:57:57 2004
New Revision: 7641

Modified:
   pypy/trunk/src/pypy/annotation/binaryop.py
Log:
don't raise BlockedInference from a union() method.

Modified: pypy/trunk/src/pypy/annotation/binaryop.py
==============================================================================
--- pypy/trunk/src/pypy/annotation/binaryop.py	(original)
+++ pypy/trunk/src/pypy/annotation/binaryop.py	Tue Nov 23 18:57:57 2004
@@ -304,7 +304,7 @@
 
 class __extend__(pairtype(SomeInstance, SomePBC)):
     def union((ins, pbc)):
-        classdef = ins.currentdef().superdef_containing(pbc.knowntype)
+        classdef = ins.classdef.superdef_containing(pbc.knowntype)
         if classdef is None:
             # print warning?
             return SomeObject()