traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-32155: Bugfixes found by flake8 F841 warnings (#4608) 

* distutils.config: Use the PyPIRCCommand.realm attribute if set
* turtledemo: wait until macOS osascript command completes to not
  create a zombie process
* Tools/scripts/treesync.py: declare 'default_answer' and
  'create_files' as globals to modify them with the command line
  arguments. Previously, -y, -n, -f and -a options had no effect.

flake8 warning: "F841 local variable 'p' is assigned to but never
used".
This commit is contained in:
Victor Stinner 2017-11-28 15:30:32 +01:00 committed by GitHub
parent 4271dfd781
commit 696b501cd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/distutils/config.py
View File

@ -77,7 +77,7 @@ class PyPIRCCommand(Command):
# optional params # optional params
for key, default in (('repository', for key, default in (('repository',
self.DEFAULT_REPOSITORY), self.DEFAULT_REPOSITORY),
('realm', self.DEFAULT_REALM), ('realm', realm),
('password', None)): ('password', None)):
if config.has_option(server, key): if config.has_option(server, key):
current[key] = config.get(server, key) current[key] = config.get(server, key)
@ -106,7 +106,7 @@ class PyPIRCCommand(Command):
'password': config.get(server, 'password'), 'password': config.get(server, 'password'),
'repository': repository, 'repository': repository,
'server': server, 'server': server,
'realm': self.DEFAULT_REALM} 'realm': realm}
return {} return {}

2
Lib/turtledemo/__main__.py
View File

@ -136,7 +136,7 @@ class DemoWindow(object):
import subprocess import subprocess
# Make sure we are the currently activated OS X application # Make sure we are the currently activated OS X application
# so that our menu bar appears. # so that our menu bar appears.
p = subprocess.Popen( subprocess.run(
[ [
'osascript', 'osascript',
'-e', 'tell application "System Events"', '-e', 'tell application "System Events"',

1
Misc/NEWS.d/next/Library/2017-11-28-15-06-07.bpo-32155.hWHGww.rst Normal file
View File

@ -0,0 +1 @@
Fix distutils.config: use the PyPIRCCommand.realm attribute if it is set.

2
Tools/scripts/treesync.py
View File

@ -33,7 +33,7 @@ write_slave = "ask"
write_master = "ask" write_master = "ask"
def main(): def main():
global always_no, always_yes global default_answer, always_no, always_yes, create_files
global create_directories, write_master, write_slave global create_directories, write_master, write_slave
opts, args = getopt.getopt(sys.argv[1:], "nym:s:d:f:a:") opts, args = getopt.getopt(sys.argv[1:], "nym:s:d:f:a:")
for o, a in opts: for o, a in opts: