diff options
| -rw-r--r-- | Lib/distutils/config.py | 4 | ||||
| -rw-r--r-- | Lib/turtledemo/__main__.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2017-11-28-15-06-07.bpo-32155.hWHGww.rst | 1 | ||||
| -rwxr-xr-x | Tools/scripts/treesync.py | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Lib/distutils/config.py b/Lib/distutils/config.py index bf8d8dd..e66d103 100644 --- a/Lib/distutils/config.py +++ b/Lib/distutils/config.py @@ -77,7 +77,7 @@ class PyPIRCCommand(Command): # 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 @@ class PyPIRCCommand(Command): '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 0a58332..6daf694 100644 --- a/Lib/turtledemo/__main__.py +++ b/Lib/turtledemo/__main__.py @@ -136,7 +136,7 @@ class DemoWindow(object): 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 0000000..a9509b5 --- /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 652d394..215e2bd 100755 --- a/Tools/scripts/treesync.py +++ b/Tools/scripts/treesync.py @@ -33,7 +33,7 @@ write_slave = "ask" 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: |