mirror of
https://github.com/python/cpython.git
synced 2024-11-28 20:33:54 +08:00
#8292: Fix three instances of truth tests on return values of filter() (which is always true in Python 3).
This commit is contained in:
parent
78aa396415
commit
62e2ca2193
@ -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
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user