aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Jenvey <pjenvey@underboss.org>2015-12-21 23:16:37 -0800
committerPhilip Jenvey <pjenvey@underboss.org>2015-12-21 23:16:37 -0800
commit563ee2cadf38eab9b94e2c15339c72e2a4f59968 (patch)
tree9e9a8346b90ced987f08e787c2165747c0596b74 /lib-python/2.7/distutils
parentUpgrade 2.7 stdlib to 2.7.10 (diff)
downloadpypy-563ee2cadf38eab9b94e2c15339c72e2a4f59968.tar.gz
pypy-563ee2cadf38eab9b94e2c15339c72e2a4f59968.tar.bz2
pypy-563ee2cadf38eab9b94e2c15339c72e2a4f59968.zip
update the 2.7 stdlib to 2.7.11
Diffstat (limited to 'lib-python/2.7/distutils')
-rw-r--r--lib-python/2.7/distutils/__init__.py10
-rw-r--r--lib-python/2.7/distutils/ccompiler.py2
-rw-r--r--lib-python/2.7/distutils/command/build_ext.py10
-rw-r--r--lib-python/2.7/distutils/msvc9compiler.py2
-rw-r--r--lib-python/2.7/distutils/tests/test_core.py2
-rw-r--r--lib-python/2.7/distutils/tests/test_dist.py2
6 files changed, 14 insertions, 14 deletions
diff --git a/lib-python/2.7/distutils/__init__.py b/lib-python/2.7/distutils/__init__.py
index 037089633f..d823d040a1 100644
--- a/lib-python/2.7/distutils/__init__.py
+++ b/lib-python/2.7/distutils/__init__.py
@@ -8,12 +8,6 @@ used from a setup script as
setup (...)
"""
-__revision__ = "$Id$"
+import sys
-# Distutils version
-#
-# Updated automatically by the Python release process.
-#
-#--start constants--
-__version__ = "2.7.10"
-#--end constants--
+__version__ = sys.version[:sys.version.index(' ')]
diff --git a/lib-python/2.7/distutils/ccompiler.py b/lib-python/2.7/distutils/ccompiler.py
index 4907a0aa5a..c0c446f220 100644
--- a/lib-python/2.7/distutils/ccompiler.py
+++ b/lib-python/2.7/distutils/ccompiler.py
@@ -718,7 +718,7 @@ class CCompiler:
raise NotImplementedError
def library_option(self, lib):
- """Return the compiler option to add 'dir' to the list of libraries
+ """Return the compiler option to add 'lib' to the list of libraries
linked into the shared library or executable.
"""
raise NotImplementedError
diff --git a/lib-python/2.7/distutils/command/build_ext.py b/lib-python/2.7/distutils/command/build_ext.py
index 2ab73aad0c..3a49454a4a 100644
--- a/lib-python/2.7/distutils/command/build_ext.py
+++ b/lib-python/2.7/distutils/command/build_ext.py
@@ -199,10 +199,12 @@ class build_ext (Command):
else:
# win-amd64 or win-ia64
suffix = self.plat_name[4:]
- new_lib = os.path.join(sys.exec_prefix, 'PCbuild')
- if suffix:
- new_lib = os.path.join(new_lib, suffix)
- self.library_dirs.append(new_lib)
+ # We could have been built in one of two places; add both
+ for d in ('PCbuild',), ('PC', 'VS9.0'):
+ new_lib = os.path.join(sys.exec_prefix, *d)
+ if suffix:
+ new_lib = os.path.join(new_lib, suffix)
+ self.library_dirs.append(new_lib)
elif MSVC_VERSION == 8:
self.library_dirs.append(os.path.join(sys.exec_prefix,
diff --git a/lib-python/2.7/distutils/msvc9compiler.py b/lib-python/2.7/distutils/msvc9compiler.py
index 7ec9b92a5d..22de4baecd 100644
--- a/lib-python/2.7/distutils/msvc9compiler.py
+++ b/lib-python/2.7/distutils/msvc9compiler.py
@@ -426,7 +426,7 @@ class MSVCCompiler(CCompiler) :
self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO']
if self.__version >= 7:
self.ldflags_shared_debug = [
- '/DLL', '/nologo', '/INCREMENTAL:no', '/DEBUG', '/pdb:None'
+ '/DLL', '/nologo', '/INCREMENTAL:no', '/DEBUG'
]
self.ldflags_static = [ '/nologo']
diff --git a/lib-python/2.7/distutils/tests/test_core.py b/lib-python/2.7/distutils/tests/test_core.py
index 0d979bcde9..e6d4c9b360 100644
--- a/lib-python/2.7/distutils/tests/test_core.py
+++ b/lib-python/2.7/distutils/tests/test_core.py
@@ -9,6 +9,7 @@ import test.test_support
from test.test_support import captured_stdout, run_unittest
import unittest
from distutils.tests import support
+from distutils import log
# setup script that uses __file__
setup_using___file__ = """\
@@ -36,6 +37,7 @@ class CoreTestCase(support.EnvironGuard, unittest.TestCase):
self.old_stdout = sys.stdout
self.cleanup_testfn()
self.old_argv = sys.argv, sys.argv[:]
+ self.addCleanup(log.set_threshold, log._global_log.threshold)
def tearDown(self):
sys.stdout = self.old_stdout
diff --git a/lib-python/2.7/distutils/tests/test_dist.py b/lib-python/2.7/distutils/tests/test_dist.py
index eb9b0ef262..378fe432b4 100644
--- a/lib-python/2.7/distutils/tests/test_dist.py
+++ b/lib-python/2.7/distutils/tests/test_dist.py
@@ -13,6 +13,7 @@ from distutils.cmd import Command
import distutils.dist
from test.test_support import TESTFN, captured_stdout, run_unittest, unlink
from distutils.tests import support
+from distutils import log
class test_dist(Command):
@@ -397,6 +398,7 @@ class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
def test_show_help(self):
# smoke test, just makes sure some help is displayed
+ self.addCleanup(log.set_threshold, log._global_log.threshold)
dist = Distribution()
sys.argv = []
dist.help = 1