[Python-checkins] cpython (merge default -> default): merge heads
benjamin.peterson
python-checkins at python.org
Thu Dec 15 21:44:22 CET 2011
http://hg.python.org/cpython/rev/df5c28c01deb
changeset: 73989:df5c28c01deb
parent: 73988:4de895bb25f6
parent: 73986:a9ee21ac0879
user: Benjamin Peterson <benjamin at python.org>
date: Thu Dec 15 15:44:16 2011 -0500
summary:
merge heads
files:
Lib/platform.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Lib/platform.py b/Lib/platform.py
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -186,7 +186,7 @@
elif so:
if lib != 'glibc':
lib = 'libc'
- if soversion > version:
+ if soversion and soversion > version:
version = soversion
if threads and version[-len(threads):] != threads:
version = version + threads
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list