summaryrefslogtreecommitdiffstats
path: root/Lib/platform.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-08-01 19:07:28 (GMT)
committerGeorg Brandl <georg@python.org>2010-08-01 19:07:28 (GMT)
commitcaa78fee030f5a832141570ff2b56367059a3ce9 (patch)
tree06d1d6be17495d5d5de343c16a87e4f203ec33ac /Lib/platform.py
parent44c58236d748b3301b0bc6057f8a93d8eeb2ab3c (diff)
downloadcpython-caa78fee030f5a832141570ff2b56367059a3ce9.zip
cpython-caa78fee030f5a832141570ff2b56367059a3ce9.tar.gz
cpython-caa78fee030f5a832141570ff2b56367059a3ce9.tar.bz2
Merged revisions 83371,83390 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r83371 | georg.brandl | 2010-07-31 23:54:24 +0200 (Sa, 31 Jul 2010) | 1 line #8292: Fix three instances of truth tests on return values of filter() (which is always true in Python 3). ........ r83390 | georg.brandl | 2010-08-01 10:07:49 +0200 (So, 01 Aug 2010) | 1 line #8230: make Lib/test/sortperf.py run on Python 3. ........
Diffstat (limited to 'Lib/platform.py')
-rwxr-xr-xLib/platform.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index 64025a3..4e53f42 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -1109,7 +1109,7 @@ def uname():
except AttributeError:
no_os_uname = 1
- if no_os_uname or not filter(None, (system, node, release, version, machine)):
+ if no_os_uname or not list(filter(None, (system, node, release, version, machine))):
# Hmm, no there is either no uname or uname has returned
#'unknowns'... we'll have to poke around the system then.
if no_os_uname: