From 62e2ca219311a111873892910ad441659faeaefa Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 31 Jul 2010 21:54:24 +0000 Subject: #8292: Fix three instances of truth tests on return values of filter() (which is always true in Python 3). --- Lib/distutils/command/sdist.py | 3 +-- Lib/http/server.py | 5 +++-- Lib/platform.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/distutils/command/sdist.py b/Lib/distutils/command/sdist.py index bb21061..f51d72f 100644 --- a/Lib/distutils/command/sdist.py +++ b/Lib/distutils/command/sdist.py @@ -240,8 +240,7 @@ class sdist(Command): optional = ['test/test*.py', 'setup.cfg'] for pattern in optional: files = filter(os.path.isfile, glob(pattern)) - if files: - self.filelist.extend(files) + self.filelist.extend(files) # build_py is used to get: # - python modules diff --git a/Lib/http/server.py b/Lib/http/server.py index d2a685f..098ad25 100644 --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -1023,8 +1023,9 @@ class CGIHTTPRequestHandler(SimpleHTTPRequestHandler): if ua: env['HTTP_USER_AGENT'] = ua co = filter(None, self.headers.get_all('cookie', [])) - if co: - env['HTTP_COOKIE'] = ', '.join(co) + cookie_str = ', '.join(co) + if cookie_str: + env['HTTP_COOKIE'] = cookie_str # XXX Other HTTP_* headers # Since we're setting the env in the parent, provide empty # values to override previously set values diff --git a/Lib/platform.py b/Lib/platform.py index 75f92af..f856a43 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -1137,7 +1137,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: -- cgit v0.12