[pypy-svn] r79127 - in pypy/release/1.4.x: . pypy pypy/jit/metainterp/optimizeopt pypy/module/array/benchmark pypy/module/array/test pypy/rlib pypy/rlib/test pypy/translator/goal/test2

[fijal at codespeak.net]

Author: fijal
Date: Mon Nov 15 20:10:30 2010
New Revision: 79127

Modified:
   pypy/release/1.4.x/   (props changed)
   pypy/release/1.4.x/pypy/   (props changed)
   pypy/release/1.4.x/pypy/jit/metainterp/optimizeopt/optimizer.py   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/Makefile   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/intimg.c   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/intimgtst.c   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/intimgtst.py   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/loop.c   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/sum.c   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/sumtst.c   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/sumtst.py   (props changed)
   pypy/release/1.4.x/pypy/module/array/test/test_array_old.py   (props changed)
   pypy/release/1.4.x/pypy/rlib/rerased.py   (props changed)
   pypy/release/1.4.x/pypy/rlib/test/test_rerased.py   (props changed)
   pypy/release/1.4.x/pypy/translator/goal/test2/test_app_main.py
Log:
merge 79008 from trunk

Modified: pypy/release/1.4.x/pypy/translator/goal/test2/test_app_main.py
==============================================================================
--- pypy/release/1.4.x/pypy/translator/goal/test2/test_app_main.py	(original)
+++ pypy/release/1.4.x/pypy/translator/goal/test2/test_app_main.py	Mon Nov 15 20:10:30 2010
@@ -463,8 +463,10 @@
                 yield
             finally:
                 old_cwd.chdir()
-                os.putenv('PYTHONPATH', old_pythonpath)
-        
+                # Can't call putenv with a None argument.
+                if old_pythonpath is not None:
+                    os.putenv('PYTHONPATH', old_pythonpath)
+
         tmpdir.join('site.py').write('print "SHOULD NOT RUN"')
         runme_py = tmpdir.join('runme.py')
         runme_py.write('print "some text"')