[pypy-svn] r79008 - pypy/trunk/pypy/translator/goal/test2

[agaynor at codespeak.net]

Author: agaynor
Date: Thu Nov 11 18:03:21 2010
New Revision: 79008

Modified:
   pypy/trunk/pypy/translator/goal/test2/test_app_main.py
Log:
Allow running the app_main tests with no $PYTHONPATH.


Modified: pypy/trunk/pypy/translator/goal/test2/test_app_main.py
==============================================================================
--- pypy/trunk/pypy/translator/goal/test2/test_app_main.py	(original)
+++ pypy/trunk/pypy/translator/goal/test2/test_app_main.py	Thu Nov 11 18:03:21 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"')