[pypy-commit] pypy pythoninspect-fix: fix merge, typos

[squeaky]

Author: Pawe&#322; Piotr Przeradowski <przeradow...@gmail.com>
Branch: pythoninspect-fix
Changeset: r65671:7d2d7703eb8b
Date: 2013-07-25 22:20 +0200
http://bitbucket.org/pypy/pypy/changeset/7d2d7703eb8b/

Log:    fix merge, typos

diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -32,13 +32,12 @@
 
 .. branch: ssl_moving_write_buffer
 
-<<<<<<< local
 .. branch: pythoninspect-fix
 Make PyPy respect PYTHONINSPECT variable set via os.putenv in the same process
 to start interactive prompt when the script execution finishes. This adds
 new __pypy__.os.real_getenv call that bypasses Python cache and looksup env
 in the underlying OS. Translatorshell now works on PyPy.
-=======
+
 .. branch: add-statvfs
 Added os.statvfs and os.fstatvfs
 
diff --git a/pypy/interpreter/test/test_app_main.py 
b/pypy/interpreter/test/test_app_main.py
--- a/pypy/interpreter/test/test_app_main.py
+++ b/pypy/interpreter/test/test_app_main.py
@@ -710,7 +710,7 @@
         try:
             import __pypy__
         except ImportError:
-            py.test.skip("This can be only tested on PyPy with get_realenv")
+            py.test.skip("This can be only tested on PyPy with real_getenv")
 
         # should be noninteractive when piped in
         data = 'import os\nos.putenv("PYTHONINSPECT", "1")\n'
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit