[Python-checkins] cpython (merge 3.2 -> default): MERGE: And yet another emergency fix for #13803 bootstrap issue: Under Solaris,

Wed Jan 18 05:05:49 CET 2012

http://hg.python.org/cpython/rev/582274636446
changeset: 74492:582274636446
parent: 74490:afdce2e2f98d
parent: 74491:147ad02875fa
user: Jesus Cea <jcea at jcea.es>
date: Wed Jan 18 05:05:41 2012 +0100
summary:
 MERGE: And yet another emergency fix for #13803 bootstrap issue: Under Solaris, distutils doesn't include bitness in the directory name
files:
 Lib/distutils/util.py | 2 +-
 Lib/sysconfig.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
--- a/Lib/distutils/util.py
+++ b/Lib/distutils/util.py
@@ -81,7 +81,7 @@
 # bootstrap problem. We use a dict to get an error
 # if some suspicious happens.
 bitness = {2147483647:"32bit", 9223372036854775807:"64bit"}
- machine += ".%s" % bitness[sys.maxint]
+ machine += ".%s" % bitness[sys.maxsize]
 # fall through to standard osname-release-machine representation
 elif osname[:4] == "irix": # could be "irix64"!
 return "%s-%s" % (osname, release)
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -656,7 +656,7 @@
 # bootstrap problem. We use a dict to get an error
 # if some suspicious happens.
 bitness = {2147483647:"32bit", 9223372036854775807:"64bit"}
- machine += ".%s" % bitness[sys.maxint]
+ machine += ".%s" % bitness[sys.maxsize]
 # fall through to standard osname-release-machine representation
 elif osname[:4] == "irix": # could be "irix64"!
 return "%s-%s" % (osname, release)
-- 
Repository URL: http://hg.python.org/cpython
