[pypy-svn] r72585 - in pypy/trunk/pypy/translator/goal: . test2

[arigo at codespeak.net]

Author: arigo
Date: Mon Mar 22 19:36:15 2010
New Revision: 72585

Modified:
   pypy/trunk/pypy/translator/goal/app_main.py
   pypy/trunk/pypy/translator/goal/test2/test_app_main.py
Log:
Fix a test on Python 2.6, by using 'PYTHONINSPECT_' instead of
'PYTHONINSPECT'.


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	Mon Mar 22 19:36:15 2010
@@ -459,8 +459,6 @@
     # obscure! try removing the following line, see how it crashes, and
     # guess why...
     ImStillAroundDontForgetMe = sys.modules['__main__']
-    sys.ps1 = '>>>> '
-    sys.ps2 = '.... '
 
     # debugging only
     def pypy_initial_path(s):
@@ -474,10 +472,20 @@
     # finds its own extension modules :-/
     import os
     os.environ['PYTHONPATH'] = ':'.join(sys.path)
+    reset = []
+    if 'PYTHONINSPECT_' in os.environ:
+        reset.append(('PYTHONINSPECT', os.environ.get('PYTHONINSPECT', '')))
+        os.environ['PYTHONINSPECT'] = os.environ['PYTHONINSPECT_']
 
     from pypy.module.sys.version import PYPY_VERSION
     sys.pypy_version_info = PYPY_VERSION
     sys.pypy_initial_path = pypy_initial_path
     os = nanos.os_module_for_testing
-    sys.exit(entry_point(sys.argv[0], sys.argv[1:], os))
-    #sys.exit(entry_point('app_main.py', sys.argv[1:]))
+    sys.ps1 = '>>>> '
+    sys.ps2 = '.... '
+    try:
+        sys.exit(int(entry_point(sys.argv[0], sys.argv[1:], os)))
+    finally:
+        sys.ps1 = '>>> '     # restore the normal ones, in case
+        sys.ps2 = '... '     # we are dropping to CPython's prompt
+        import os; os.environ.update(reset)

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	Mon Mar 22 19:36:15 2010
@@ -277,9 +277,8 @@
         child.expect('>>> ')
 
     def test_pythoninspect(self):
-        old = os.environ.get('PYTHONINSPECT', '')
+        os.environ['PYTHONINSPECT_'] = '1'
         try:
-            os.environ['PYTHONINSPECT'] = '1'
             path = getscript("""
                 print 6*7
                 """)
@@ -287,7 +286,7 @@
             child.expect('42')
             child.expect('>>> ')
         finally:
-            os.environ['PYTHONINSPECT'] = old
+            del os.environ['PYTHONINSPECT_']
 
     def test_set_pythoninspect(self):
         path = getscript("""
@@ -422,13 +421,12 @@
         assert ('Argv: ' + repr([p, 'extra'])) in data
 
     def test_pythoninspect_doesnt_override_isatty(self):
-        old = os.environ.get('PYTHONINSPECT', '')
+        os.environ['PYTHONINSPECT_'] = '1'
         try:
-            os.environ['PYTHONINSPECT'] = '1'
             data = self.run('', senddata='6*7\nprint 2+3\n')
             assert data == '5\n'
         finally:
-            os.environ['PYTHONINSPECT'] = old
+            del os.environ['PYTHONINSPECT_']
 
     def test_i_flag_overrides_isatty(self):
         data = self.run('-i', senddata='6*7\nraise SystemExit\n',