[Python-checkins] bpo-32155: Bugfixes found by flake8 F841 warnings (#4608)

Tue Nov 28 09:30:35 EST 2017

https://github.com/python/cpython/commit/696b501cd11dc429a0f661adeb598bfaf89e4112
commit: 696b501cd11dc429a0f661adeb598bfaf89e4112
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017年11月28日T15:30:32+01:00
summary:
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".
files:
A Misc/NEWS.d/next/Library/2017-11-28-15-06-07.bpo-32155.hWHGww.rst
M Lib/distutils/config.py
M Lib/turtledemo/__main__.py
M Tools/scripts/treesync.py

diff --git a/Lib/distutils/config.py b/Lib/distutils/config.py
index bf8d8dd2f5a..e66d103f7d1 100644
--- a/Lib/distutils/config.py
+++ b/Lib/distutils/config.py
@@ -77,7 +77,7 @@ def _read_pypirc(self):
 # optional params
 for key, default in (('repository',
 self.DEFAULT_REPOSITORY),
- ('realm', self.DEFAULT_REALM),
+ ('realm', realm),
 ('password', None)):
 if config.has_option(server, key):
 current[key] = config.get(server, key)
@@ -106,7 +106,7 @@ def _read_pypirc(self):
 'password': config.get(server, 'password'),
 'repository': repository,
 'server': server,
- 'realm': self.DEFAULT_REALM}
+ 'realm': realm}
 
 return {}
 
diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py
index 0a58332a666..6daf694427d 100644
--- a/Lib/turtledemo/__main__.py
+++ b/Lib/turtledemo/__main__.py
@@ -136,7 +136,7 @@ def __init__(self, filename=None):
 import subprocess
 # Make sure we are the currently activated OS X application
 # so that our menu bar appears.
- p = subprocess.Popen(
+ subprocess.run(
 [
 'osascript',
 '-e', 'tell application "System Events"',
diff --git a/Misc/NEWS.d/next/Library/2017-11-28-15-06-07.bpo-32155.hWHGww.rst b/Misc/NEWS.d/next/Library/2017-11-28-15-06-07.bpo-32155.hWHGww.rst
new file mode 100644
index 00000000000..a9509b546aa
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-11-28-15-06-07.bpo-32155.hWHGww.rst
@@ -0,0 +1 @@
+Fix distutils.config: use the PyPIRCCommand.realm attribute if it is set.
diff --git a/Tools/scripts/treesync.py b/Tools/scripts/treesync.py
index 652d3940a49..215e2bd4e54 100755
--- a/Tools/scripts/treesync.py
+++ b/Tools/scripts/treesync.py
@@ -33,7 +33,7 @@
 write_master = "ask"
 
 def main():
- global always_no, always_yes
+ global default_answer, always_no, always_yes, create_files
 global create_directories, write_master, write_slave
 opts, args = getopt.getopt(sys.argv[1:], "nym:s:d:f:a:")
 for o, a in opts:
