[pypy-commit] pypy issue1922-take2: add versions

[Wouter van Heyst]

Author: Wouter van Heyst
Branch: issue1922-take2
Changeset: r74596:eba70e4af6dd
Date: 2014-11-14 16:51 +0200
http://bitbucket.org/pypy/pypy/changeset/eba70e4af6dd/

Log:	add versions

diff --git a/lib-python/2.7/subprocess.py b/lib-python/2.7/subprocess.py
--- a/lib-python/2.7/subprocess.py
+++ b/lib-python/2.7/subprocess.py
@@ -658,9 +658,8 @@
         # --- PyPy hack, see _pypy_install_libs_after_virtualenv() ---
         # match arguments passed by different versions of virtualenv
         if args[1:] in (
-            ['-c', 'import sys; print sys.prefix'],          # 9c47597b
-            ['-c', 'import sys; print(sys.prefix)'],        # 10ba3f3c
-            ['-c', "\nimport sys\nprefix = sys.prefix\n"    # 0e9342ce
+            ['-c', 'import sys; print(sys.prefix)'],        # 1.6 10ba3f3c
+            ['-c', "\nimport sys\nprefix = sys.prefix\n"    # 1.7 0e9342ce
              "if sys.version_info[0] == 3:\n"
              "    prefix = prefix.encode('utf8')\n"
              "if hasattr(sys.stdout, 'detach'):\n"
@@ -668,7 +667,7 @@
              "elif hasattr(sys.stdout, 'buffer'):\n"
              "    sys.stdout = sys.stdout.buffer\nsys.stdout.write(prefix)\n"],
             ['-c', 'import sys;out=sys.stdout;getattr(out, "buffer"'
-             ', out).write(sys.prefix.encode("utf-8"))']):  # a9454bce
+             ', out).write(sys.prefix.encode("utf-8"))']):  # 1.7.2 a9454bce
             _pypy_install_libs_after_virtualenv(args[0])
 
         if not isinstance(bufsize, (int, long)):