[pypy-svn] r49740 - in pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__: . test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Thu Dec 13 21:11:58 2007
New Revision: 49740

Modified:
   pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/interp_classobj.py
   pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/test/test_classobj.py
Log:
fix a bug found by the flow object space


Modified: pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/interp_classobj.py
==============================================================================
--- pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/interp_classobj.py	(original)
+++ pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/interp_classobj.py	Thu Dec 13 21:11:58 2007
@@ -522,6 +522,7 @@
             except OperationError, e:
                 if e.match(space, space.w_StopIteration):
                     return space.w_False
+                raise
             if space.eq_w(w_x, w_obj):
                 return space.w_True
 

Modified: pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/test/test_classobj.py
==============================================================================
--- pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/test/test_classobj.py	(original)
+++ pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/test/test_classobj.py	Thu Dec 13 21:11:58 2007
@@ -603,3 +603,9 @@
         del a[1:4]
         assert a.last == (1, 4, None)
 
+    def test_contains_bug(self):
+        class A:
+            __metaclass__ = nclassobj
+            def __iter__(self):
+                return self
+        raises(TypeError, "1 in A()")