From cbb331ea63305207c070c77a7c7403d23b049f9d Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Sun, 12 Oct 2003 14:01:45 +0000 Subject: Python 1.5.2 portability in the previous script fix. --- src/script/scons.py | 8 +++++--- src/script/sconsign.py | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/script/scons.py b/src/script/scons.py index a90e1ba..11a24cb 100644 --- a/src/script/scons.py +++ b/src/script/scons.py @@ -122,9 +122,11 @@ else: prefs.append(sys.prefix) temp = map(lambda x: os.path.join(x, 'lib'), prefs) - temp.extend(map(lambda x: os.path.join(x, 'lib', 'python%d.%d' % (sys.version_info[0], - sys.version_info[1]), - 'site-packages'), prefs)) + temp.extend(map(lambda x: os.path.join(x, + 'lib', + 'python' + sys.version[:3], + 'site-packages'), + prefs)) prefs = temp # Look first for 'scons-__version__' in all of our preference libs, diff --git a/src/script/sconsign.py b/src/script/sconsign.py index 520d0fa..cc9e58d 100644 --- a/src/script/sconsign.py +++ b/src/script/sconsign.py @@ -123,9 +123,11 @@ else: prefs.append(sys.prefix) temp = map(lambda x: os.path.join(x, 'lib'), prefs) - temp.extend(map(lambda x: os.path.join(x, 'lib', 'python%d.%d' % (sys.version_info[0], - sys.version_info[1]), - 'site-packages'), prefs)) + temp.extend(map(lambda x: os.path.join(x, + 'lib', + 'python' + sys.version[:3], + 'site-packages'), + prefs)) prefs = temp # Look first for 'scons-__version__' in all of our preference libs, -- cgit v0.12