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.
........
This commit is contained in:
Georg Brandl 2010-08-01 19:07:28 +00:00
parent 44c58236d7
commit caa78fee03
5 changed files with 11 additions and 9 deletions

View file

@ -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: