[pypy-svn] r70350 - in pypy/trunk/pypy: module/imp/test translator/goal

[afa at codespeak.net]

Author: afa
Date: Wed Dec 30 12:03:33 2009
New Revision: 70350

Modified:
   pypy/trunk/pypy/module/imp/test/test_import.py
   pypy/trunk/pypy/translator/goal/app_main.py
Log:
Finally found where sys.path is replaced instead of modified in-place.
Fixes reload(sys)


Modified: pypy/trunk/pypy/module/imp/test/test_import.py
==============================================================================
--- pypy/trunk/pypy/module/imp/test/test_import.py	(original)
+++ pypy/trunk/pypy/module/imp/test/test_import.py	Wed Dec 30 12:03:33 2009
@@ -433,13 +433,16 @@
         reload(pkg.a)
 
     def test_reload_builtin(self):
-        skip("XXX fixme")
         import sys
+        oldpath = sys.path
         try:
             del sys.setdefaultencoding
         except AttributeError:
             pass
+
         reload(sys)
+
+        assert sys.path is oldpath
         assert 'setdefaultencoding' in dir(sys)
 
     def test_reload_infinite(self):

Modified: pypy/trunk/pypy/translator/goal/app_main.py
==============================================================================
--- pypy/trunk/pypy/translator/goal/app_main.py	(original)
+++ pypy/trunk/pypy/translator/goal/app_main.py	Wed Dec 30 12:03:33 2009
@@ -228,7 +228,7 @@
     newpath.insert(0, '')
     # remove duplicates
     _seen = {}
-    sys.path = []
+    del sys.path[:]
     for dir in newpath:
         if dir not in _seen:
             sys.path.append(dir)