[pypy-commit] pypy py3k: 2to3

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r64930:10bf1805e3e8
Date: 2013-06-17 15:34 -0700
http://bitbucket.org/pypy/pypy/changeset/10bf1805e3e8/

Log:	2to3

diff --git a/pypy/module/imp/test/test_import.py b/pypy/module/imp/test/test_import.py
--- a/pypy/module/imp/test/test_import.py
+++ b/pypy/module/imp/test/test_import.py
@@ -626,9 +626,10 @@
         assert 'settrace' in dir(sys)
 
     def test_reload_builtin_doesnt_clear(self):
+        import imp
         import sys
         sys.foobar = "baz"
-        reload(sys)
+        imp.reload(sys)
         assert sys.foobar == "baz"
 
     def test_reimport_builtin_simple_case_1(self):
@@ -648,7 +649,7 @@
 
     def test_reimport_builtin(self):
         skip("fix me")
-        import sys, time
+        import imp, sys, time
         oldpath = sys.path
         time.tzset = "<test_reimport_builtin removed this>"
 
@@ -658,7 +659,7 @@
 
         assert time.tzset == "<test_reimport_builtin removed this>"
 
-        reload(time1)   # don't leave a broken time.tzset behind
+        imp.reload(time1)   # don't leave a broken time.tzset behind
         import time
         assert time.tzset != "<test_reimport_builtin removed this>"