[pypy-commit] pypy py3k: make autopath and our pytest.py compatible with python3: this is needed to run -A tests with the compiled pypy-c

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: py3k
Changeset: r55593:1d8feb0a8242
Date: 2012-06-11 17:37 +0200
http://bitbucket.org/pypy/pypy/changeset/1d8feb0a8242/

Log:	make autopath and our pytest.py compatible with python3: this is
	needed to run -A tests with the compiled pypy-c

diff --git a/pypy/annotation/test/autopath.py b/pypy/annotation/test/autopath.py
--- a/pypy/annotation/test/autopath.py
+++ b/pypy/annotation/test/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/bin/autopath.py b/pypy/bin/autopath.py
--- a/pypy/bin/autopath.py
+++ b/pypy/bin/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/config/autopath.py b/pypy/config/autopath.py
--- a/pypy/config/autopath.py
+++ b/pypy/config/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/doc/config/autopath.py b/pypy/doc/config/autopath.py
--- a/pypy/doc/config/autopath.py
+++ b/pypy/doc/config/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/interpreter/pyparser/autopath.py b/pypy/interpreter/pyparser/autopath.py
--- a/pypy/interpreter/pyparser/autopath.py
+++ b/pypy/interpreter/pyparser/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/jit/backend/autopath.py b/pypy/jit/backend/autopath.py
--- a/pypy/jit/backend/autopath.py
+++ b/pypy/jit/backend/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/jit/backend/x86/autopath.py b/pypy/jit/backend/x86/autopath.py
--- a/pypy/jit/backend/x86/autopath.py
+++ b/pypy/jit/backend/x86/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/jit/backend/x86/tool/autopath.py b/pypy/jit/backend/x86/tool/autopath.py
--- a/pypy/jit/backend/x86/tool/autopath.py
+++ b/pypy/jit/backend/x86/tool/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/jit/tl/autopath.py b/pypy/jit/tl/autopath.py
--- a/pypy/jit/tl/autopath.py
+++ b/pypy/jit/tl/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/jit/tl/spli/autopath.py b/pypy/jit/tl/spli/autopath.py
--- a/pypy/jit/tl/spli/autopath.py
+++ b/pypy/jit/tl/spli/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/jit/tool/autopath.py b/pypy/jit/tool/autopath.py
--- a/pypy/jit/tool/autopath.py
+++ b/pypy/jit/tool/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/module/__builtin__/test/autopath.py b/pypy/module/__builtin__/test/autopath.py
--- a/pypy/module/__builtin__/test/autopath.py
+++ b/pypy/module/__builtin__/test/autopath.py
@@ -66,7 +66,7 @@
     sys.path.insert(0, head)
 
     munged = {}
-    for name, mod in list(sys.modules.items()):
+    for name, mod in sys.modules.items():
         if '.' in name:
             continue
         fn = getattr(mod, '__file__', None)
diff --git a/pypy/module/_codecs/test/autopath.py b/pypy/module/_codecs/test/autopath.py
--- a/pypy/module/_codecs/test/autopath.py
+++ b/pypy/module/_codecs/test/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/module/_sre/test/autopath.py b/pypy/module/_sre/test/autopath.py
--- a/pypy/module/_sre/test/autopath.py
+++ b/pypy/module/_sre/test/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/module/sys/test/autopath.py b/pypy/module/sys/test/autopath.py
--- a/pypy/module/sys/test/autopath.py
+++ b/pypy/module/sys/test/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/rlib/parsing/test/autopath.py b/pypy/rlib/parsing/test/autopath.py
--- a/pypy/rlib/parsing/test/autopath.py
+++ b/pypy/rlib/parsing/test/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/rlib/test/autopath.py b/pypy/rlib/test/autopath.py
--- a/pypy/rlib/test/autopath.py
+++ b/pypy/rlib/test/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/rpython/microbench/autopath.py b/pypy/rpython/microbench/autopath.py
--- a/pypy/rpython/microbench/autopath.py
+++ b/pypy/rpython/microbench/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/tool/algo/test/autopath.py b/pypy/tool/algo/test/autopath.py
--- a/pypy/tool/algo/test/autopath.py
+++ b/pypy/tool/algo/test/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/tool/autopath.py b/pypy/tool/autopath.py
--- a/pypy/tool/autopath.py
+++ b/pypy/tool/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/tool/pytest/autopath.py b/pypy/tool/pytest/autopath.py
--- a/pypy/tool/pytest/autopath.py
+++ b/pypy/tool/pytest/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/tool/release/autopath.py b/pypy/tool/release/autopath.py
--- a/pypy/tool/release/autopath.py
+++ b/pypy/tool/release/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/tool/test/autopath.py b/pypy/tool/test/autopath.py
--- a/pypy/tool/test/autopath.py
+++ b/pypy/tool/test/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/translator/autopath.py b/pypy/translator/autopath.py
--- a/pypy/translator/autopath.py
+++ b/pypy/translator/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/translator/c/autopath.py b/pypy/translator/c/autopath.py
--- a/pypy/translator/c/autopath.py
+++ b/pypy/translator/c/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/translator/c/gcc/autopath.py b/pypy/translator/c/gcc/autopath.py
--- a/pypy/translator/c/gcc/autopath.py
+++ b/pypy/translator/c/gcc/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/translator/c/test/autopath.py b/pypy/translator/c/test/autopath.py
--- a/pypy/translator/c/test/autopath.py
+++ b/pypy/translator/c/test/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/translator/cli/test/autopath.py b/pypy/translator/cli/test/autopath.py
--- a/pypy/translator/cli/test/autopath.py
+++ b/pypy/translator/cli/test/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/translator/goal/autopath.py b/pypy/translator/goal/autopath.py
--- a/pypy/translator/goal/autopath.py
+++ b/pypy/translator/goal/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/translator/goal/test2/autopath.py b/pypy/translator/goal/test2/autopath.py
--- a/pypy/translator/goal/test2/autopath.py
+++ b/pypy/translator/goal/test2/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/translator/microbench/pybench/autopath.py b/pypy/translator/microbench/pybench/autopath.py
--- a/pypy/translator/microbench/pybench/autopath.py
+++ b/pypy/translator/microbench/pybench/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/translator/sandbox/autopath.py b/pypy/translator/sandbox/autopath.py
--- a/pypy/translator/sandbox/autopath.py
+++ b/pypy/translator/sandbox/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/translator/sandbox/test/autopath.py b/pypy/translator/sandbox/test/autopath.py
--- a/pypy/translator/sandbox/test/autopath.py
+++ b/pypy/translator/sandbox/test/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/translator/test/autopath.py b/pypy/translator/test/autopath.py
--- a/pypy/translator/test/autopath.py
+++ b/pypy/translator/test/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pypy/translator/tool/autopath.py b/pypy/translator/tool/autopath.py
--- a/pypy/translator/tool/autopath.py
+++ b/pypy/translator/tool/autopath.py
@@ -84,7 +84,7 @@
             if modpath not in sys.modules:
                 munged[modpath] = mod
 
-    for name, mod in munged.iteritems():
+    for name, mod in munged.items():
         if name not in sys.modules:
             sys.modules[name] = mod
         if '.' in name:
@@ -111,9 +111,9 @@
             f = open(fn, 'rwb+')
             try:
                 if f.read() == arg:
-                    print "checkok", fn
+                    print("checkok", fn)
                 else:
-                    print "syncing", fn
+                    print("syncing", fn)
                     f = open(fn, 'w')
                     f.write(arg)
             finally:
diff --git a/pytest.py b/pytest.py
--- a/pytest.py
+++ b/pytest.py
@@ -23,7 +23,7 @@
 # When all tests work, this branch will be merged
 # and the branch stage 2 is started, where we remove this patch.
 import sys
-if hasattr(sys, "maxsize"):
+if hasattr(sys, "maxint") and hasattr(sys, "maxsize"):
     if sys.maxint != sys.maxsize:
         sys.maxint = sys.maxsize
         import warnings