tree 06d1d6be17495d5d5de343c16a87e4f203ec33ac
parent 44c58236d748b3301b0bc6057f8a93d8eeb2ab3c
author Georg Brandl <georg@python.org> 1280689648 +0000
committer Georg Brandl <georg@python.org> 1280689648 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/release31-maint%4083427

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.
........