[pypy-commit] pypy py3k: convert to python 3 syntax

gutworth noreply at buildbot.pypy.org
Mon Mar 12 17:03:13 CET 2012


Author: Benjamin Peterson <benjamin at python.org>
Branch: py3k
Changeset: r53315:1ae2f6ea8b59
Date: 2012-03-11 23:10 -0700
http://bitbucket.org/pypy/pypy/changeset/1ae2f6ea8b59/

Log:	convert to python 3 syntax

diff --git a/pypy/objspace/std/test/test_dictmultiobject.py b/pypy/objspace/std/test/test_dictmultiobject.py
--- a/pypy/objspace/std/test/test_dictmultiobject.py
+++ b/pypy/objspace/std/test/test_dictmultiobject.py
@@ -487,7 +487,7 @@
         for v1 in ['Q', (1,)]:
             try:
                 d[v1]
-            except KeyError, e:
+            except KeyError as e:
                 v2 = e.args[0]
                 assert v1 == v2
             else:
@@ -498,7 +498,7 @@
         for v1 in ['Q', (1,)]:
             try:
                 del d[v1]
-            except KeyError, e:
+            except KeyError as e:
                 v2 = e.args[0]
                 assert v1 == v2
             else:
@@ -509,7 +509,7 @@
         for v1 in ['Q', (1,)]:
             try:
                 d.pop(v1)
-            except KeyError, e:
+            except KeyError as e:
                 v2 = e.args[0]
                 assert v1 == v2
             else:
@@ -756,7 +756,6 @@
         d = {}
         d[1] = "hi"
         assert "IntDictStrategy" in self.get_strategy(d)
-        assert d[1L] == "hi"
 
 
 class FakeString(str):


More information about the pypy-commit mailing list