[pypy-commit] pypy vendor-rename: more fixes for lib-python version rename

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: vendor-rename
Changeset: r61970:7e7a539355b6
Date: 2013-03-03 15:03 -0500
http://bitbucket.org/pypy/pypy/changeset/7e7a539355b6/

Log:	more fixes for lib-python version rename

diff --git a/pypy/interpreter/test2/test_app_main.py b/pypy/interpreter/test2/test_app_main.py
--- a/pypy/interpreter/test2/test_app_main.py
+++ b/pypy/interpreter/test2/test_app_main.py
@@ -889,7 +889,7 @@
         # setup code for test_setup_bootstrap_path
         # ----------------------------------------
         from pypy.module.sys.version import CPYTHON_VERSION, PYPY_VERSION
-        cpy_ver = '%d.%d' % CPYTHON_VERSION[:2]
+        cpy_ver = '%d' % CPYTHON_VERSION[0]
 
         goal_dir = os.path.dirname(app_main)
         # build a directory hierarchy like which contains both bin/pypy-c and
diff --git a/pypy/module/sys/test/test_initpath.py b/pypy/module/sys/test/test_initpath.py
--- a/pypy/module/sys/test/test_initpath.py
+++ b/pypy/module/sys/test/test_initpath.py
@@ -5,7 +5,7 @@
 from pypy.module.sys.version import PYPY_VERSION, CPYTHON_VERSION
 
 def build_hierarchy(prefix):
-    dirname = '%d.%d' % CPYTHON_VERSION[:2]
+    dirname = '%d' % CPYTHON_VERSION[0]
     a = prefix.join('lib_pypy').ensure(dir=1)
     b = prefix.join('lib-python', dirname).ensure(dir=1)
     return a, b
diff --git a/pypy/sandbox/test/test_pypy_interact.py b/pypy/sandbox/test/test_pypy_interact.py
--- a/pypy/sandbox/test/test_pypy_interact.py
+++ b/pypy/sandbox/test/test_pypy_interact.py
@@ -5,7 +5,7 @@
 from pypy.module.sys.version import CPYTHON_VERSION
 from pypy.tool.lib_pypy import LIB_PYTHON
 
-VERSION = '%d.%d' % CPYTHON_VERSION[:2]
+VERSION = '%d' % CPYTHON_VERSION[0]
 SITE_PY_CONTENT = LIB_PYTHON.join('site.py').read()
 ERROR_TEXT = os.strerror(errno.ENOENT)
 
diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -22,7 +22,7 @@
 
 USE_ZIPFILE_MODULE = sys.platform == 'win32'
 
-STDLIB_VER = "2.7"
+STDLIB_VER = "2"
 
 def ignore_patterns(*patterns):
     """Function that can be used as copytree() ignore parameter.
diff --git a/pypy/tool/release/test/test_package.py b/pypy/tool/release/test/test_package.py
--- a/pypy/tool/release/test/test_package.py
+++ b/pypy/tool/release/test/test_package.py
@@ -26,7 +26,7 @@
         builddir = package.package(py.path.local(pypydir).dirpath(), test,
                                    rename_pypy_c)
         prefix = builddir.join(test)
-        cpyver = '%d.%d' % CPYTHON_VERSION[:2]
+        cpyver = '%d' % CPYTHON_VERSION[0]
         assert prefix.join('lib-python', cpyver, 'test').check()
         assert prefix.join(exe_name_in_archive).check()
         assert prefix.join('lib_pypy', 'syslog.py').check()
diff --git a/pypy/tool/test/test_package.py b/pypy/tool/test/test_package.py
--- a/pypy/tool/test/test_package.py
+++ b/pypy/tool/test/test_package.py
@@ -2,5 +2,4 @@
 from pypy.module.sys import version
 
 def test_version():
-    assert package.STDLIB_VER == '%d.%d' % (version.CPYTHON_VERSION[0],
-                                            version.CPYTHON_VERSION[1])
+    assert package.STDLIB_VER == '%d' % version.CPYTHON_VERSION[0]