summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-05-25 16:21:43 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-05-25 16:21:43 (GMT)
commit559b5f1ca0a5dec9d485f01895b61e3d7da5075c (patch)
tree38a5b204b085405cf8862c9750cb672a6c6cf166
parent9bcfacd4fcf64ee7f6e0d05b5d0894c10cd43fc0 (diff)
downloadcpython-559b5f1ca0a5dec9d485f01895b61e3d7da5075c.zip
cpython-559b5f1ca0a5dec9d485f01895b61e3d7da5075c.tar.gz
cpython-559b5f1ca0a5dec9d485f01895b61e3d7da5075c.tar.bz2
Minor cleanup in sysconfig.
Also remove outdated and unhelpful docstrings in test_sysconfig.
-rw-r--r--Lib/sysconfig.py5
-rw-r--r--Lib/test/test_sysconfig.py15
2 files changed, 2 insertions, 18 deletions
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index 4c1fd1b..59073f4 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -656,11 +656,10 @@ def get_platform():
# to. This makes the compatibility story a bit more sane because the
# machine is going to compile and link as if it were
# MACOSX_DEPLOYMENT_TARGET.
- #
cfgvars = get_config_vars()
macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
- if 1:
+ if True:
# Always calculate the release of the running machine,
# needed to determine if we can build fat binaries or not.
@@ -755,7 +754,7 @@ def _main():
print('Platform: "%s"' % get_platform())
print('Python version: "%s"' % get_python_version())
print('Current installation scheme: "%s"' % _get_default_scheme())
- print('')
+ print()
_print_dict('Paths', get_paths())
print()
_print_dict('Variables', get_config_vars())
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index 214fc70..77c2364 100644
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -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 sys
import os
@@ -23,7 +17,6 @@ from sysconfig import (get_paths, get_platform, get_config_vars,
class TestSysConfig(unittest.TestCase):
def setUp(self):
- """Make a copy of sys.path"""
super(TestSysConfig, self).setUp()
self.sys_path = sys.path[:]
self.makefile = None
@@ -53,7 +46,6 @@ class TestSysConfig(unittest.TestCase):
self._added_envvars.append(var)
def tearDown(self):
- """Restore sys.path"""
sys.path[:] = self.sys_path
if self.makefile is not None:
os.unlink(self.makefile)
@@ -145,8 +137,6 @@ class TestSysConfig(unittest.TestCase):
('Darwin Kernel Version 8.11.1: '
'Wed Oct 10 18:23:28 PDT 2007; '
'root:xnu-792.25.20~1/RELEASE_I386'), 'PowerPC'))
-
-
get_config_vars()['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
@@ -161,7 +151,6 @@ class TestSysConfig(unittest.TestCase):
finally:
sys.maxsize = maxint
-
self._set_uname(('Darwin', 'macziade', '8.11.1',
('Darwin Kernel Version 8.11.1: '
'Wed Oct 10 18:23:28 PDT 2007; '
@@ -295,7 +284,6 @@ class TestSysConfig(unittest.TestCase):
self.assertIn(ldflags, ldshared)
-
@unittest.skipUnless(sys.platform == "darwin", "test only relevant on MacOSX")
def test_platform_in_subprocess(self):
my_platform = sysconfig.get_platform()
@@ -321,7 +309,6 @@ class TestSysConfig(unittest.TestCase):
self.assertEqual(status, 0)
self.assertEqual(my_platform, test_platform)
-
# Test with MACOSX_DEPLOYMENT_TARGET in the environment, and
# using a value that is unlikely to be the default one.
env = os.environ.copy()
@@ -342,8 +329,6 @@ class TestSysConfig(unittest.TestCase):
self.assertEqual(my_platform, test_platform)
-
-
def test_main():
run_unittest(TestSysConfig)