[pypy-commit] pypy py3k: re-raise the operror if it's not of the expected type; s/next/__next__

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: py3k
Changeset: r52708:29787b8bfeab
Date: 2012-02-21 00:09 +0100
http://bitbucket.org/pypy/pypy/changeset/29787b8bfeab/

Log:	re-raise the operror if it's not of the expected type;
	s/next/__next__

diff --git a/pypy/interpreter/test/test_objspace.py b/pypy/interpreter/test/test_objspace.py
--- a/pypy/interpreter/test/test_objspace.py
+++ b/pypy/interpreter/test/test_objspace.py
@@ -78,7 +78,7 @@
         class A(object):
             def __iter__(self):
                 return self
-            def next(self):
+            def __next__(self):
                 raise StopIteration
             def __len__(self):
                 1/0
@@ -88,7 +88,7 @@
             space.unpackiterable(w_a)
         except OperationError, o:
             if not o.match(space, space.w_ZeroDivisionError):
-                raise Exception("DID NOT RAISE")
+                raise
         else:
             raise Exception("DID NOT RAISE")