mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup in sysconfig. 

Also remove outdated and unhelpful docstrings in test_sysconfig.
This commit is contained in:
Éric Araujo 2011-05-25 18:21:43 +02:00
parent 9bcfacd4fc
commit 559b5f1ca0
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/sysconfig.py
View File

@ -656,11 +656,10 @@ def get_platform():
# to. This makes the compatibility story a bit more sane because the # to. This makes the compatibility story a bit more sane because the
# machine is going to compile and link as if it were # machine is going to compile and link as if it were
# MACOSX_DEPLOYMENT_TARGET. # MACOSX_DEPLOYMENT_TARGET.
#
cfgvars = get_config_vars() cfgvars = get_config_vars()
macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET') macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
if 1: if True:
# Always calculate the release of the running machine, # Always calculate the release of the running machine,
# needed to determine if we can build fat binaries or not. # needed to determine if we can build fat binaries or not.
@ -755,7 +754,7 @@ def _main():
print('Platform: "%s"' % get_platform()) print('Platform: "%s"' % get_platform())
print('Python version: "%s"' % get_python_version()) print('Python version: "%s"' % get_python_version())
print('Current installation scheme: "%s"' % _get_default_scheme()) print('Current installation scheme: "%s"' % _get_default_scheme())
print('') print()
_print_dict('Paths', get_paths()) _print_dict('Paths', get_paths())
print() print()
_print_dict('Variables', get_config_vars()) _print_dict('Variables', get_config_vars())

15
Lib/test/test_sysconfig.py
View File

@ -1,9 +1,3 @@
"""Tests for 'site'.
Tests assume the initial paths in sys.path once the interpreter has begun
executing have not been removed.
"""
import unittest import unittest
import sys import sys
import os import os
@ -23,7 +17,6 @@
class TestSysConfig(unittest.TestCase): class TestSysConfig(unittest.TestCase):
def setUp(self): def setUp(self):
"""Make a copy of sys.path"""
super(TestSysConfig, self).setUp() super(TestSysConfig, self).setUp()
self.sys_path = sys.path[:] self.sys_path = sys.path[:]
self.makefile = None self.makefile = None
@ -53,7 +46,6 @@ def setUp(self):
self._added_envvars.append(var) self._added_envvars.append(var)
def tearDown(self): def tearDown(self):
"""Restore sys.path"""
sys.path[:] = self.sys_path sys.path[:] = self.sys_path
if self.makefile is not None: if self.makefile is not None:
os.unlink(self.makefile) os.unlink(self.makefile)
@ -145,8 +137,6 @@ def test_get_platform(self):
('Darwin Kernel Version 8.11.1: ' ('Darwin Kernel Version 8.11.1: '
'Wed Oct 10 18:23:28 PDT 2007; ' 'Wed Oct 10 18:23:28 PDT 2007; '
'root:xnu-792.25.20~1/RELEASE_I386'), 'PowerPC')) 'root:xnu-792.25.20~1/RELEASE_I386'), 'PowerPC'))
get_config_vars()['MACOSX_DEPLOYMENT_TARGET'] = '10.3' get_config_vars()['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g ' get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
@ -161,7 +151,6 @@ def test_get_platform(self):
finally: finally:
sys.maxsize = maxint sys.maxsize = maxint
self._set_uname(('Darwin', 'macziade', '8.11.1', self._set_uname(('Darwin', 'macziade', '8.11.1',
('Darwin Kernel Version 8.11.1: ' ('Darwin Kernel Version 8.11.1: '
'Wed Oct 10 18:23:28 PDT 2007; ' 'Wed Oct 10 18:23:28 PDT 2007; '
@ -295,7 +284,6 @@ def test_ldshared_value(self):
self.assertIn(ldflags, ldshared) self.assertIn(ldflags, ldshared)
@unittest.skipUnless(sys.platform == "darwin", "test only relevant on MacOSX") @unittest.skipUnless(sys.platform == "darwin", "test only relevant on MacOSX")
def test_platform_in_subprocess(self): def test_platform_in_subprocess(self):
my_platform = sysconfig.get_platform() my_platform = sysconfig.get_platform()
@ -321,7 +309,6 @@ def test_platform_in_subprocess(self):
self.assertEqual(status, 0) self.assertEqual(status, 0)
self.assertEqual(my_platform, test_platform) self.assertEqual(my_platform, test_platform)
# Test with MACOSX_DEPLOYMENT_TARGET in the environment, and # Test with MACOSX_DEPLOYMENT_TARGET in the environment, and
# using a value that is unlikely to be the default one. # using a value that is unlikely to be the default one.
env = os.environ.copy() env = os.environ.copy()
@ -342,8 +329,6 @@ def test_platform_in_subprocess(self):
self.assertEqual(my_platform, test_platform) self.assertEqual(my_platform, test_platform)
def test_main(): def test_main():
run_unittest(TestSysConfig) run_unittest(TestSysConfig)