[pypy-commit] pypy default: adapt to py2.7

pjenvey noreply at buildbot.pypy.org
Fri Jun 19 02:46:53 CEST 2015


Author: Philip Jenvey <pjenvey at underboss.org>
Branch: 
Changeset: r78199:74cadf90d4ec
Date: 2015-06-18 15:57 -0700
http://bitbucket.org/pypy/pypy/changeset/74cadf90d4ec/

Log:	adapt to py2.7

diff --git a/pypy/module/__pypy__/test/test_special.py b/pypy/module/__pypy__/test/test_special.py
--- a/pypy/module/__pypy__/test/test_special.py
+++ b/pypy/module/__pypy__/test/test_special.py
@@ -36,7 +36,7 @@
         try:
             sneak()
         except ZeroDivisionError as e:
-            tb = e.__traceback__
+            tb = sys.exc_info()[2]
             assert tb.tb_frame == sys._getframe()
             assert tb.tb_next.tb_frame.f_code.co_name == '<lambda>'
         else:
@@ -53,9 +53,6 @@
             try: e()
             except ZeroDivisionError as e:
                 assert sys.exc_info() == (None, None, None)
-                frame = e.__traceback__.tb_frame
-                assert frame != sys._getframe()
-                assert frame.f_code.co_name == 'e'
             else: assert False
             return 2
         assert test_hidden() == 2


More information about the pypy-commit mailing list