diff options
| author | Andrew M. Kuchling <amk@amk.ca> | 2002-11-13 17:03:05 (GMT) |
|---|---|---|
| committer | Andrew M. Kuchling <amk@amk.ca> | 2002-11-13 17:03:05 (GMT) |
| commit | 33635aaf931cdb180a8558f64d27552317fb4aa4 (patch) | |
| tree | b561aa468a3dba58b2c16f24fa5807bfe88e471a /Lib/distutils | |
| parent | fda0674f09fb3e9dcf85c3e7b9070066c5aa5829 (diff) | |
| download | cpython-33635aaf931cdb180a8558f64d27552317fb4aa4.zip cpython-33635aaf931cdb180a8558f64d27552317fb4aa4.tar.gz cpython-33635aaf931cdb180a8558f64d27552317fb4aa4.tar.bz2 | |
Back out part of rev. 1.53, restoring the use of the string module.
The two long lines have been reflowed differently; hopefully someone on
BeOS can test them. Rev. 1.53 also converted string.atoi() to int(); I've
left that alone.
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/sysconfig.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index 222648a..3d369b0 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -14,6 +14,7 @@ __revision__ = "$Id$" import os import re +import string import sys from errors import DistutilsPlatformError @@ -250,7 +251,7 @@ def parse_makefile(fn, g=None): m = _variable_rx.match(line) if m: n, v = m.group(1, 2) - v = v.strip() + v = string.strip(v) if "$" in v: notdone[n] = v else: @@ -273,7 +274,7 @@ def parse_makefile(fn, g=None): else: try: value = int(value) except ValueError: - done[name] = value.strip() + done[name] = string.strip(value) else: done[name] = value del notdone[name] @@ -289,7 +290,7 @@ def parse_makefile(fn, g=None): else: try: value = int(value) except ValueError: - done[name] = value.strip() + done[name] = string.strip(value) else: done[name] = value del notdone[name] @@ -368,7 +369,8 @@ def _init_posix(): # relative to the srcdir, which after installation no longer makes # sense. python_lib = get_python_lib(standard_lib=1) - linkerscript_name = os.path.basename(g['LDSHARED'].split()[0]) + linkerscript_path = string.split(g['LDSHARED'])[0] + linkerscript_name = os.path.basename(linkerscript_path) linkerscript = os.path.join(python_lib, 'config', linkerscript_name) |