From webhook-mailer at python.org  Tue Aug  1 00:24:20 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Tue, 01 Aug 2017 04:24:20 -0000
Subject: [Python-checkins] bpo-31083: IDLE: Describe the Page classes in
 configdialog (#2965)
Message-ID: <mailman.11.1501561461.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/6f446bee4f6ac0c61bb2c3386a0149fd36855793
commit: 6f446bee4f6ac0c61bb2c3386a0149fd36855793
branch: master
author: csabella <cheryl.sabella at gmail.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-08-01T00:24:07-04:00
summary:

bpo-31083: IDLE: Describe the Page classes in configdialog (#2965)

Add template as comment. Update existing classes to match outline.
Initial patch by Cheryl Sabella.

files:
A Misc/NEWS.d/next/IDLE/2017-07-31-23-20-51.bpo-31083.991FXm.rst
M Lib/idlelib/configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 28070a51709..6d8a03b1c00 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -1382,11 +1382,27 @@ def save_all_changed_extensions(self):
             self.ext_userCfg.Save()
 
 
+# class TabPage(Frame):  # A template for Page classes.
+#     def __init__(self, master):
+#         super().__init__(master)
+#         self.create_page_tab()
+#         self.load_tab_cfg()
+#     def create_page_tab(self):
+#         # Define tk vars and register var and callback with tracers.
+#         # Create subframes and widgets.
+#         # Pack widgets.
+#     def load_tab_cfg(self):
+#         # Initialize widgets with data from idleConf.
+#     def var_changed_var_name():
+#         # For each tk var that needs other than default callback.
+#     def other_methods():
+#         # Define tab-specific behavior.
+
+
 class FontPage(Frame):
 
-    def __init__(self, parent, highpage):
-        super().__init__(parent)
-        self.parent = parent
+    def __init__(self, master, highpage):
+        super().__init__(master)
         self.highlight_sample = highpage.highlight_sample
         self.create_page_font_tab()
         self.load_font_cfg()
@@ -1439,19 +1455,17 @@ def create_page_font_tab(self):
                         indent_title: Label
                         (*)indent_scale: Scale - space_num
         """
-        parent = self.parent
-        self.font_name = tracers.add(StringVar(parent), self.var_changed_font)
-        self.font_size = tracers.add(StringVar(parent), self.var_changed_font)
-        self.font_bold = tracers.add(BooleanVar(parent), self.var_changed_font)
+        self.font_name = tracers.add(StringVar(self), self.var_changed_font)
+        self.font_size = tracers.add(StringVar(self), self.var_changed_font)
+        self.font_bold = tracers.add(BooleanVar(self), self.var_changed_font)
         self.space_num = tracers.add(IntVar(self), ('main', 'Indent', 'num-spaces'))
 
         # Create widgets:
         # body and body section frames.
-        frame = self
         frame_font = LabelFrame(
-                frame, borderwidth=2, relief=GROOVE, text=' Base Editor Font ')
+                self, borderwidth=2, relief=GROOVE, text=' Base Editor Font ')
         frame_indent = LabelFrame(
-                frame, borderwidth=2, relief=GROOVE, text=' Indentation Width ')
+                self, borderwidth=2, relief=GROOVE, text=' Indentation Width ')
         # frame_font.
         frame_font_name = Frame(frame_font)
         frame_font_param = Frame(frame_font)
@@ -1471,7 +1485,7 @@ def create_page_font_tab(self):
                 frame_font_param, variable=self.font_bold,
                 onvalue=1, offvalue=0, text='Bold')
         frame_font_sample = Frame(frame_font, relief=SOLID, borderwidth=1)
-        temp_font = tkFont.Font(parent, ('courier', 10, 'normal'))
+        temp_font = tkFont.Font(self, ('courier', 10, 'normal'))
         self.font_sample = Label(
                 frame_font_sample, justify=LEFT, font=temp_font,
                 text='AaBbCcDdEe\nFfGgHhIiJj\n1234567890\n#:+=(){}[]')
@@ -1503,8 +1517,6 @@ def create_page_font_tab(self):
         indent_title.pack(side=TOP, anchor=W, padx=5)
         self.indent_scale.pack(side=TOP, padx=5, fill=X)
 
-        return frame
-
     def load_font_cfg(self):
         """Load current configuration settings for the font options.
 
@@ -1597,8 +1609,8 @@ def var_changed_space_num(self, *params):
 
 class GenPage(Frame):
 
-    def __init__(self, parent):
-        super().__init__(parent)
+    def __init__(self, master):
+        super().__init__(master)
         self.create_page_general()
         self.load_general_cfg()
 
diff --git a/Misc/NEWS.d/next/IDLE/2017-07-31-23-20-51.bpo-31083.991FXm.rst b/Misc/NEWS.d/next/IDLE/2017-07-31-23-20-51.bpo-31083.991FXm.rst
new file mode 100644
index 00000000000..3bb337562de
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-07-31-23-20-51.bpo-31083.991FXm.rst
@@ -0,0 +1,3 @@
+IDLE - Add an outline of a TabPage class in configdialog.
+Update existing classes to match outline.
+Initial patch by Cheryl Sabella.


From webhook-mailer at python.org  Tue Aug  1 00:34:39 2017
From: webhook-mailer at python.org (Mariatta)
Date: Tue, 01 Aug 2017 04:34:39 -0000
Subject: [Python-checkins] Remove .mention-bot (GH-2923) (GH-2970)
Message-ID: <mailman.12.1501562080.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/f9463b8cc9e2906d3f457d59286665bee08f626f
commit: f9463b8cc9e2906d3f457d59286665bee08f626f
branch: 3.6
author: Mariatta <Mariatta at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-07-31T21:34:36-07:00
summary:

Remove .mention-bot (GH-2923) (GH-2970)

(cherry picked from commit e1e60bd95c376f9b18cbaf9481364281c6cc1bc7)

files:
D .mention-bot

diff --git a/.mention-bot b/.mention-bot
deleted file mode 100644
index cb53b993fb1..00000000000
--- a/.mention-bot
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-   "findPotentialReviewers": false
-}


From webhook-mailer at python.org  Tue Aug  1 00:34:50 2017
From: webhook-mailer at python.org (Mariatta)
Date: Tue, 01 Aug 2017 04:34:50 -0000
Subject: [Python-checkins] Remove .mention-bot (GH-2923) (GH-2971)
Message-ID: <mailman.13.1501562091.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/27ea3c782f0cc67805a3486336ce71f3ae08ba8a
commit: 27ea3c782f0cc67805a3486336ce71f3ae08ba8a
branch: 3.5
author: Mariatta <Mariatta at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-07-31T21:34:47-07:00
summary:

Remove .mention-bot (GH-2923) (GH-2971)

(cherry picked from commit e1e60bd95c376f9b18cbaf9481364281c6cc1bc7)

files:
D .mention-bot

diff --git a/.mention-bot b/.mention-bot
deleted file mode 100644
index cb53b993fb1..00000000000
--- a/.mention-bot
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-   "findPotentialReviewers": false
-}


From webhook-mailer at python.org  Tue Aug  1 00:35:01 2017
From: webhook-mailer at python.org (Mariatta)
Date: Tue, 01 Aug 2017 04:35:01 -0000
Subject: [Python-checkins] Remove .mention-bot (GH-2923) (GH-2972)
Message-ID: <mailman.14.1501562101.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/956902e5bc4b41fda79c6c1018c97355639cb245
commit: 956902e5bc4b41fda79c6c1018c97355639cb245
branch: 2.7
author: Mariatta <Mariatta at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-07-31T21:34:58-07:00
summary:

Remove .mention-bot (GH-2923) (GH-2972)

(cherry picked from commit e1e60bd95c376f9b18cbaf9481364281c6cc1bc7)

files:
D .mention-bot

diff --git a/.mention-bot b/.mention-bot
deleted file mode 100644
index cb53b993fb1..00000000000
--- a/.mention-bot
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-   "findPotentialReviewers": false
-}


From webhook-mailer at python.org  Tue Aug  1 01:00:38 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Tue, 01 Aug 2017 05:00:38 -0000
Subject: [Python-checkins] [3.6] bpo-31083: IDLE: Describe the Page classes
 in configdialog (GH-2965) (#2973)
Message-ID: <mailman.15.1501563640.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/48fcc72c83e1b47b200dd39f9dcc9f62fa0d4d17
commit: 48fcc72c83e1b47b200dd39f9dcc9f62fa0d4d17
branch: 3.6
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-01T01:00:33-04:00
summary:

[3.6] bpo-31083: IDLE: Describe the Page classes in configdialog (GH-2965) (#2973)

Add template as comment. Update existing classes to match outline.
Initial patch by Cheryl Sabella.
(cherry picked from commit 6f446be)

files:
A Misc/NEWS.d/next/IDLE/2017-07-31-23-20-51.bpo-31083.991FXm.rst
M Lib/idlelib/configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 28070a51709..6d8a03b1c00 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -1382,11 +1382,27 @@ def save_all_changed_extensions(self):
             self.ext_userCfg.Save()
 
 
+# class TabPage(Frame):  # A template for Page classes.
+#     def __init__(self, master):
+#         super().__init__(master)
+#         self.create_page_tab()
+#         self.load_tab_cfg()
+#     def create_page_tab(self):
+#         # Define tk vars and register var and callback with tracers.
+#         # Create subframes and widgets.
+#         # Pack widgets.
+#     def load_tab_cfg(self):
+#         # Initialize widgets with data from idleConf.
+#     def var_changed_var_name():
+#         # For each tk var that needs other than default callback.
+#     def other_methods():
+#         # Define tab-specific behavior.
+
+
 class FontPage(Frame):
 
-    def __init__(self, parent, highpage):
-        super().__init__(parent)
-        self.parent = parent
+    def __init__(self, master, highpage):
+        super().__init__(master)
         self.highlight_sample = highpage.highlight_sample
         self.create_page_font_tab()
         self.load_font_cfg()
@@ -1439,19 +1455,17 @@ def create_page_font_tab(self):
                         indent_title: Label
                         (*)indent_scale: Scale - space_num
         """
-        parent = self.parent
-        self.font_name = tracers.add(StringVar(parent), self.var_changed_font)
-        self.font_size = tracers.add(StringVar(parent), self.var_changed_font)
-        self.font_bold = tracers.add(BooleanVar(parent), self.var_changed_font)
+        self.font_name = tracers.add(StringVar(self), self.var_changed_font)
+        self.font_size = tracers.add(StringVar(self), self.var_changed_font)
+        self.font_bold = tracers.add(BooleanVar(self), self.var_changed_font)
         self.space_num = tracers.add(IntVar(self), ('main', 'Indent', 'num-spaces'))
 
         # Create widgets:
         # body and body section frames.
-        frame = self
         frame_font = LabelFrame(
-                frame, borderwidth=2, relief=GROOVE, text=' Base Editor Font ')
+                self, borderwidth=2, relief=GROOVE, text=' Base Editor Font ')
         frame_indent = LabelFrame(
-                frame, borderwidth=2, relief=GROOVE, text=' Indentation Width ')
+                self, borderwidth=2, relief=GROOVE, text=' Indentation Width ')
         # frame_font.
         frame_font_name = Frame(frame_font)
         frame_font_param = Frame(frame_font)
@@ -1471,7 +1485,7 @@ def create_page_font_tab(self):
                 frame_font_param, variable=self.font_bold,
                 onvalue=1, offvalue=0, text='Bold')
         frame_font_sample = Frame(frame_font, relief=SOLID, borderwidth=1)
-        temp_font = tkFont.Font(parent, ('courier', 10, 'normal'))
+        temp_font = tkFont.Font(self, ('courier', 10, 'normal'))
         self.font_sample = Label(
                 frame_font_sample, justify=LEFT, font=temp_font,
                 text='AaBbCcDdEe\nFfGgHhIiJj\n1234567890\n#:+=(){}[]')
@@ -1503,8 +1517,6 @@ def create_page_font_tab(self):
         indent_title.pack(side=TOP, anchor=W, padx=5)
         self.indent_scale.pack(side=TOP, padx=5, fill=X)
 
-        return frame
-
     def load_font_cfg(self):
         """Load current configuration settings for the font options.
 
@@ -1597,8 +1609,8 @@ def var_changed_space_num(self, *params):
 
 class GenPage(Frame):
 
-    def __init__(self, parent):
-        super().__init__(parent)
+    def __init__(self, master):
+        super().__init__(master)
         self.create_page_general()
         self.load_general_cfg()
 
diff --git a/Misc/NEWS.d/next/IDLE/2017-07-31-23-20-51.bpo-31083.991FXm.rst b/Misc/NEWS.d/next/IDLE/2017-07-31-23-20-51.bpo-31083.991FXm.rst
new file mode 100644
index 00000000000..3bb337562de
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-07-31-23-20-51.bpo-31083.991FXm.rst
@@ -0,0 +1,3 @@
+IDLE - Add an outline of a TabPage class in configdialog.
+Update existing classes to match outline.
+Initial patch by Cheryl Sabella.


From solipsis at pitrou.net  Tue Aug  1 05:10:09 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 01 Aug 2017 09:10:09 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=5
Message-ID: <20170801091009.15106.8A4A6A68C6EDBFD2@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [7, -7, 1] memory blocks, sum=1
test_functools leaked [0, 3, 1] memory blocks, sum=4


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogapBbQ7', '--timeout', '7200']

From webhook-mailer at python.org  Tue Aug  1 14:12:30 2017
From: webhook-mailer at python.org (Vinay Sajip)
Date: Tue, 01 Aug 2017 18:12:30 -0000
Subject: [Python-checkins] bpo-31084: QueueHandler now formats messages
 correctly. (GH-2954)
Message-ID: <mailman.16.1501611152.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/adfe3440f65dfd6cf4463db6cd02cdc78e77ce17
commit: adfe3440f65dfd6cf4463db6cd02cdc78e77ce17
branch: master
author: favll <favll at users.noreply.github.com>
committer: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: 2017-08-01T19:12:26+01:00
summary:

bpo-31084: QueueHandler now formats messages correctly. (GH-2954)

files:
M Lib/logging/handlers.py
M Lib/test/test_logging.py

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 2f934b33071..b5fdfbc6839 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -1372,13 +1372,14 @@ def prepare(self, record):
         of the record while leaving the original intact.
         """
         # The format operation gets traceback text into record.exc_text
-        # (if there's exception data), and also puts the message into
-        # record.message. We can then use this to replace the original
+        # (if there's exception data), and also returns the formatted
+        # message. We can then use this to replace the original
         # msg + args, as these might be unpickleable. We also zap the
         # exc_info attribute, as it's no longer needed and, if not None,
         # will typically not be pickleable.
-        self.format(record)
-        record.msg = record.message
+        msg = self.format(record)
+        record.message = msg
+        record.msg = msg
         record.args = None
         record.exc_info = None
         return record
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 6d0b23441ba..36ea0725153 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -3126,6 +3126,7 @@ def setUp(self):
         BaseTest.setUp(self)
         self.queue = queue.Queue(-1)
         self.que_hdlr = logging.handlers.QueueHandler(self.queue)
+        self.name = 'que'
         self.que_logger = logging.getLogger('que')
         self.que_logger.propagate = False
         self.que_logger.setLevel(logging.WARNING)
@@ -3147,6 +3148,19 @@ def test_queue_handler(self):
         self.assertEqual(data.name, self.que_logger.name)
         self.assertEqual((data.msg, data.args), (msg, None))
 
+    def test_formatting(self):
+        msg = self.next_message()
+        levelname = logging.getLevelName(logging.WARNING)
+        log_format_str = '{name} -> {levelname}: {message}'
+        formatted_msg = log_format_str.format(name=self.name,
+                                              levelname=levelname, message=msg)
+        formatter = logging.Formatter(self.log_format)
+        self.que_hdlr.setFormatter(formatter)
+        self.que_logger.warning(msg)
+        log_record = self.queue.get_nowait()
+        self.assertEqual(formatted_msg, log_record.msg)
+        self.assertEqual(formatted_msg, log_record.message)
+
     @unittest.skipUnless(hasattr(logging.handlers, 'QueueListener'),
                          'logging.handlers.QueueListener required for this test')
     def test_queue_listener(self):


From webhook-mailer at python.org  Tue Aug  1 17:51:20 2017
From: webhook-mailer at python.org (Brett Cannon)
Date: Tue, 01 Aug 2017 21:51:20 -0000
Subject: [Python-checkins] List myself as interested in all import-related
 pull requests (GH-2976)
Message-ID: <mailman.17.1501624281.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/9eef9e805e950eb6bc9ded8c99c5d6abf1d681de
commit: 9eef9e805e950eb6bc9ded8c99c5d6abf1d681de
branch: master
author: Brett Cannon <brettcannon at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-08-01T14:51:17-07:00
summary:

List myself as interested in all import-related pull requests (GH-2976)

files:
M .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d1ebf2c2bac..1dc79f7dec6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,5 +8,8 @@
 **/*hashlib*                  @tiran
 **/*pyhash*                   @tiran
 
+# Import (including importlib)
+**/*import*                   @brettcannon
+
 # SSL
 **/*ssl*                      @tiran


From webhook-mailer at python.org  Tue Aug  1 18:35:50 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Tue, 01 Aug 2017 22:35:50 -0000
Subject: [Python-checkins] bpo-30897: Add is_mount() to pathlib.Path (#2669)
Message-ID: <mailman.18.1501626951.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/173ff4a58a6b337fe8a0eb44f211f33f278d3d5f
commit: 173ff4a58a6b337fe8a0eb44f211f33f278d3d5f
branch: master
author: Cooper Lees <me at cooperlees.com>
committer: ?ukasz Langa <lukasz at langa.pl>
date: 2017-08-01T15:35:45-07:00
summary:

bpo-30897: Add is_mount() to pathlib.Path (#2669)

* Add in is_mount() call to pathlib.Path similiar to os.path.ismount(path)
* Add tests for is_mount()

files:
M Lib/pathlib.py
M Lib/test/test_pathlib.py

diff --git a/Lib/pathlib.py b/Lib/pathlib.py
index 0e65c61f654..c14ddd03356 100644
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@@ -1329,6 +1329,27 @@ def is_file(self):
             # (see https://bitbucket.org/pitrou/pathlib/issue/12/)
             return False
 
+    def is_mount(self):
+        """
+        Check if this path is a POSIX mount point
+        """
+        # Need to exist and be a dir
+        if not self.exists() or not self.is_dir():
+            return False
+
+        parent = Path(self.parent)
+        try:
+            parent_dev = parent.stat().st_dev
+        except OSError:
+            return False
+
+        dev = self.stat().st_dev
+        if dev != parent_dev:
+            return True
+        ino = self.stat().st_ino
+        parent_ino = parent.stat().st_ino
+        return ino == parent_ino
+
     def is_symlink(self):
         """
         Whether this path is a symbolic link.
@@ -1416,3 +1437,6 @@ def owner(self):
 
     def group(self):
         raise NotImplementedError("Path.group() is unsupported on this system")
+
+    def is_mount(self):
+        raise NotImplementedError("Path.is_mount() is unsupported on this system")
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index 16bfee0a47d..962adde38da 100644
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -1880,6 +1880,18 @@ def test_is_file(self):
             self.assertFalse((P / 'linkB').is_file())
             self.assertFalse((P/ 'brokenLink').is_file())
 
+    @only_posix
+    def test_is_mount(self):
+        P = self.cls(BASE)
+        R = self.cls('/')  # TODO: Work out windows
+        self.assertFalse((P / 'fileA').is_mount())
+        self.assertFalse((P / 'dirA').is_mount())
+        self.assertFalse((P / 'non-existing').is_mount())
+        self.assertFalse((P / 'fileA' / 'bah').is_mount())
+        self.assertTrue(R.is_mount())
+        if support.can_symlink():
+            self.assertFalse((P / 'linkA').is_mount())
+
     def test_is_symlink(self):
         P = self.cls(BASE)
         self.assertFalse((P / 'fileA').is_symlink())


From webhook-mailer at python.org  Tue Aug  1 18:41:36 2017
From: webhook-mailer at python.org (Yury Selivanov)
Date: Tue, 01 Aug 2017 22:41:36 -0000
Subject: [Python-checkins] Add @1st1 as co-owner of asyncio and genobject
 (#2978)
Message-ID: <mailman.19.1501627297.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/9d8e6ec8d2f7d6abd6c526adabacc13fd1ab4ee1
commit: 9d8e6ec8d2f7d6abd6c526adabacc13fd1ab4ee1
branch: master
author: Yury Selivanov <yury at magic.io>
committer: GitHub <noreply at github.com>
date: 2017-08-01T18:41:33-04:00
summary:

Add @1st1 as co-owner of asyncio and genobject (#2978)

files:
M .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1dc79f7dec6..137681b9a95 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,6 +4,12 @@
 # It uses the same pattern rule for gitignore file
 # https://git-scm.com/docs/gitignore#_pattern_format
 
+# asyncio
+**/*asyncio*                  @1st1
+
+# Core
+**/*genobject*                @1st1
+
 # Hashing
 **/*hashlib*                  @tiran
 **/*pyhash*                   @tiran


From lp_benchmark_robot at intel.com  Tue Aug  1 19:21:04 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Tue, 1 Aug 2017 16:21:04 -0700
Subject: [Python-checkins] [1 down,
 64 flat] Results for Python (master branch) 2017-08-01
Message-ID: <095d4974-8b89-452b-b2f1-01eec80f90a6@orsmsx156.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-01 03:03:25-07:00.
  - commit:		6f446be
  - previous commit:	a568e52
  - revision date:	2017-08-01 00:24:07-04:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.102% |  -0.663%   |  +4.356%   |  +7.855%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.883% |  -2.439%   |  +22.147%  |  +9.120%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 1.997% |  -2.839%   |  +23.160%  |  +8.017%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 1.081% |  -0.587%   |  +21.774%  |  +6.320%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 3.036% |  +2.591%   |  +8.144%   |  +10.918%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 2.302% |  +0.357%   |  +11.561%  |  +10.721%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 2.144% |  -1.357%   |  +7.379%   |  +8.951%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.664% |  -1.137%   |  +4.392%   |  +3.863%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.072% |  +1.188%   |  +7.983%   |  +17.597%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.307% |  +0.592%   |  +10.048%  |  +11.798%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.267% |  -0.534%   |  +3.380%   |  +5.536%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 1.302% |  -0.361%   |  +4.718%   |  +5.264%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.903% |  +0.893%   |  +4.499%   |  +5.124%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.168% |  +0.639%   |  +9.764%   |  +10.269%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.918% |  -1.592%   |  +5.921%   |  +10.397%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.967% |  -1.787%   |  +5.962%   |  +11.358%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.701% |  +0.059%   |  +10.409%  |  +10.061%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.372% |  -1.231%   |  +8.054%   |  +11.049%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.784% |  +0.553%   |  +4.039%   |  +8.733%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 1.161% |  +2.224%   |  +3.954%   |  +10.760%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.454% |  -0.762%   |  +9.830%   |  +9.416%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.795% |  +0.679%   |  +47.507%  |  +11.760%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.578% |  -0.977%   |  +10.383%  |  +10.800%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.546% |  +0.214%   |  +18.643%  |  +13.019%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 8.174% |  -2.667%   |  +2.936%   |  +15.796%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 3.071% |  +0.090%   |  +4.589%   |  +4.351%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.657% |  -0.837%   |  -4.217%   |  +4.053%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 3.607% |  -0.676%   |  +1.882%   |  +6.802%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.148% |  -2.646%   |  +0.117%   |  +13.638%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 2.430% |  -0.840%   |  +2.238%   |  +20.933%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.367% |  +1.668%   |  +3.930%   |  +13.956%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.829% |  -1.867%   |  +3.959%   |  +17.561%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.734% |  -0.060%   |  +12.357%  |  +10.358%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.153% |  -0.162%   |  +0.229%   |  +10.357%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.126% |  -0.198%   |  +9.653%   |  +3.968%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.091% |  -0.290%   |  +1.358%   |  +4.012%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 0.718% |  +0.408%   |  +11.345%  |  +10.289%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.599% |  +0.214%   |  -8.040%   |  +11.676%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( |               regex_dna| 0.699% |  -4.113%   |  -1.857%   |  +12.731%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.059% |  +2.228%   |  +0.250%   |  +4.444%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.893% |  -1.133%   |  +10.599%  |  +5.526%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.835% |  -0.968%   |  +8.355%   |  +13.122%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.713% |  +0.396%   |  +1.579%   |  -0.376%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.982% |  +0.645%   |  +27.345%  |  +7.278%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.851% |  +0.586%   |  +5.807%   |  +3.741%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.552% |  +0.178%   |  +16.177%  |  +4.747%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 0.697% |  +2.788%   |  +3.584%   |  -5.444%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.818% |  -0.009%   |  +6.376%   |  +0.455%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.111% |  -1.119%   |  +5.363%   |  +8.402%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.944% |  +0.606%   |  +5.353%   |  +4.868%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.460% |  +0.794%   |  +3.047%   |  +8.044%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.311% |  +0.107%   |  +12.880%  |  +8.102%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.861% |  +0.218%   |  +10.905%  |  +6.262%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.465% |  +0.754%   |  +13.005%  |  +8.428%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.751% |  +0.378%   |  +13.737%  |  +9.884%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 2.872% |  +1.919%   |  +22.791%  |  +10.657%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 0.974% |  -0.510%   |  +6.505%   |  +5.732%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.620% |  -2.400%   |  -0.376%   |  +2.126%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 8.963% |  -0.522%   |  +7.906%   |  +21.512%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.442% |  -1.379%   |  -2.825%   |  +21.487%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 3.579% |  -0.660%   |  +6.429%   |  +8.318%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 0.832% |  -0.298%   |  +5.205%   |  +8.841%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.938% |  +0.892%   |  +2.375%   |  +6.136%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 3.421% |  +0.224%   |  -5.238%   |  +10.799%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.034% |  -0.367%   |  +6.192%   |  +8.925%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/1-down-64-flat-results-for-python-master-branch-2017-08-01

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Tue Aug  1 19:47:53 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Tue, 01 Aug 2017 23:47:53 -0000
Subject: [Python-checkins] Document Path.is_mount(),
 update Misc/ACKS and Misc/NEWS (#2980)
Message-ID: <mailman.20.1501631274.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/47320a652e872003f3dd3a9db4243067b09dd316
commit: 47320a652e872003f3dd3a9db4243067b09dd316
branch: master
author: ?ukasz Langa <lukasz at langa.pl>
committer: GitHub <noreply at github.com>
date: 2017-08-01T16:47:50-07:00
summary:

Document Path.is_mount(), update Misc/ACKS and Misc/NEWS (#2980)

files:
A Misc/NEWS.d/next/Library/2017-08-01-15-56-50.bpo-30897.OuT1-Y.rst
M Doc/library/pathlib.rst
M Misc/ACKS

diff --git a/Doc/library/pathlib.rst b/Doc/library/pathlib.rst
index 0c9bd0d940a..3d28a1bea30 100644
--- a/Doc/library/pathlib.rst
+++ b/Doc/library/pathlib.rst
@@ -761,6 +761,18 @@ call fails (for example because the path doesn't exist):
    other errors (such as permission errors) are propagated.
 
 
+.. method:: Path.is_mount()
+
+   Return ``True`` if the path is a :dfn:`mount point`: a point in a
+   file system where a different file system has been mounted.  On POSIX, the
+   function checks whether *path*'s parent, :file:`path/..`, is on a different
+   device than *path*, or whether :file:`path/..` and *path* point to the same
+   i-node on the same device --- this should detect mount points for all Unix
+   and POSIX variants.  Not implemented on Windows.
+
+   .. versionadded:: 3.7
+
+
 .. method:: Path.is_symlink()
 
    Return ``True`` if the path points to a symbolic link, ``False`` otherwise.
diff --git a/Misc/ACKS b/Misc/ACKS
index e0640c114ff..f1f6c147f49 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -886,6 +886,7 @@ Inyeol Lee
 James Lee
 John J. Lee
 Thomas Lee
+Cooper Ry Lees
 Tennessee Leeuwenburg
 Luc Lefebvre
 Pierre Paul Lefebvre
diff --git a/Misc/NEWS.d/next/Library/2017-08-01-15-56-50.bpo-30897.OuT1-Y.rst b/Misc/NEWS.d/next/Library/2017-08-01-15-56-50.bpo-30897.OuT1-Y.rst
new file mode 100644
index 00000000000..41a75b805ae
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-01-15-56-50.bpo-30897.OuT1-Y.rst
@@ -0,0 +1,3 @@
+``pathlib.Path`` objects now include an ``is_mount()`` method (only
+implemented on POSIX).  This is similar to ``os.path.ismount(p)``. Patch by
+Cooper Ry Lees.


From webhook-mailer at python.org  Wed Aug  2 02:31:10 2017
From: webhook-mailer at python.org (INADA Naoki)
Date: Wed, 02 Aug 2017 06:31:10 -0000
Subject: [Python-checkins] bpo-31061: fix crash in asyncio speedup module
 (GH-2966)
Message-ID: <mailman.21.1501655471.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/de34cbe9cdaaf7b85fed86f99c2fd071e1a7b1d2
commit: de34cbe9cdaaf7b85fed86f99c2fd071e1a7b1d2
branch: master
author: Alexander Mohr <thehesiod at users.noreply.github.com>
committer: INADA Naoki <methane at users.noreply.github.com>
date: 2017-08-02T15:31:07+09:00
summary:

bpo-31061: fix crash in asyncio speedup module (GH-2966)

files:
A Misc/NEWS.d/next/Library/2017-08-01-09-32-58.bpo-31061.husAYX.rst
M Lib/test/test_asyncio/test_futures.py
M Lib/test/test_asyncio/test_tasks.py
M Modules/_asynciomodule.c

diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py
index ce657fc1b6a..ebedfec7fa3 100644
--- a/Lib/test/test_asyncio/test_futures.py
+++ b/Lib/test/test_asyncio/test_futures.py
@@ -1,6 +1,7 @@
 """Tests for futures.py."""
 
 import concurrent.futures
+import gc
 import re
 import sys
 import threading
@@ -19,9 +20,11 @@
 def _fakefunc(f):
     return f
 
+
 def first_cb():
     pass
 
+
 def last_cb():
     pass
 
@@ -483,6 +486,15 @@ def test_future_iter_throw(self):
                           Exception("elephant"), Exception("elephant"))
         self.assertRaises(TypeError, fi.throw, list)
 
+    def test_future_del_collect(self):
+        class Evil:
+            def __del__(self):
+                gc.collect()
+
+        for i in range(100):
+            fut = self._new_future(loop=self.loop)
+            fut.set_result(Evil())
+
 
 @unittest.skipUnless(hasattr(futures, '_CFuture'),
                      'requires the C _asyncio module')
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 686387f4f21..36082ec7c6a 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -3,6 +3,7 @@
 import collections
 import contextlib
 import functools
+import gc
 import io
 import os
 import re
@@ -91,6 +92,20 @@ def setUp(self):
         self.loop.set_task_factory(self.new_task)
         self.loop.create_future = lambda: self.new_future(self.loop)
 
+    def test_task_del_collect(self):
+        class Evil:
+            def __del__(self):
+                gc.collect()
+
+        @asyncio.coroutine
+        def run():
+            return Evil()
+
+        self.loop.run_until_complete(
+            asyncio.gather(*[
+                self.new_task(self.loop, run()) for _ in range(100)
+            ], loop=self.loop))
+
     def test_other_loop_future(self):
         other_loop = asyncio.new_event_loop()
         fut = self.new_future(other_loop)
diff --git a/Misc/NEWS.d/next/Library/2017-08-01-09-32-58.bpo-31061.husAYX.rst b/Misc/NEWS.d/next/Library/2017-08-01-09-32-58.bpo-31061.husAYX.rst
new file mode 100644
index 00000000000..650e5f95f94
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-01-09-32-58.bpo-31061.husAYX.rst
@@ -0,0 +1 @@
+Fixed a crash when using asyncio and threads.
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index b998a04e623..d4b313480e9 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -972,6 +972,8 @@ FutureObj_dealloc(PyObject *self)
         }
     }
 
+    PyObject_GC_UnTrack(self);
+
     if (fut->fut_weakreflist != NULL) {
         PyObject_ClearWeakRefs(self);
     }
@@ -1846,6 +1848,8 @@ TaskObj_dealloc(PyObject *self)
         }
     }
 
+    PyObject_GC_UnTrack(self);
+
     if (task->task_weakreflist != NULL) {
         PyObject_ClearWeakRefs(self);
     }


From webhook-mailer at python.org  Wed Aug  2 03:50:44 2017
From: webhook-mailer at python.org (INADA Naoki)
Date: Wed, 02 Aug 2017 07:50:44 -0000
Subject: [Python-checkins] bpo-31061: fix crash in asyncio speedup module
 (GH-2984)
Message-ID: <mailman.22.1501660245.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/f142e85d22ba135d5205280240f3a2fe1df2649f
commit: f142e85d22ba135d5205280240f3a2fe1df2649f
branch: 3.6
author: INADA Naoki <methane at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-08-02T16:50:39+09:00
summary:

bpo-31061: fix crash in asyncio speedup module (GH-2984)

(cherry picked from commit de34cbe9cdaaf7b85fed86f99c2fd071e1a7b1d2)

files:
A Misc/NEWS.d/next/Library/2017-08-01-09-32-58.bpo-31061.husAYX.rst
M Lib/test/test_asyncio/test_futures.py
M Lib/test/test_asyncio/test_tasks.py
M Modules/_asynciomodule.c

diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py
index ce657fc1b6a..ebedfec7fa3 100644
--- a/Lib/test/test_asyncio/test_futures.py
+++ b/Lib/test/test_asyncio/test_futures.py
@@ -1,6 +1,7 @@
 """Tests for futures.py."""
 
 import concurrent.futures
+import gc
 import re
 import sys
 import threading
@@ -19,9 +20,11 @@
 def _fakefunc(f):
     return f
 
+
 def first_cb():
     pass
 
+
 def last_cb():
     pass
 
@@ -483,6 +486,15 @@ def test_future_iter_throw(self):
                           Exception("elephant"), Exception("elephant"))
         self.assertRaises(TypeError, fi.throw, list)
 
+    def test_future_del_collect(self):
+        class Evil:
+            def __del__(self):
+                gc.collect()
+
+        for i in range(100):
+            fut = self._new_future(loop=self.loop)
+            fut.set_result(Evil())
+
 
 @unittest.skipUnless(hasattr(futures, '_CFuture'),
                      'requires the C _asyncio module')
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 195a1ed4077..243faf6b049 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -3,6 +3,7 @@
 import collections
 import contextlib
 import functools
+import gc
 import io
 import os
 import re
@@ -92,6 +93,20 @@ def setUp(self):
         self.loop.set_task_factory(self.new_task)
         self.loop.create_future = lambda: self.new_future(self.loop)
 
+    def test_task_del_collect(self):
+        class Evil:
+            def __del__(self):
+                gc.collect()
+
+        @asyncio.coroutine
+        def run():
+            return Evil()
+
+        self.loop.run_until_complete(
+            asyncio.gather(*[
+                self.new_task(self.loop, run()) for _ in range(100)
+            ], loop=self.loop))
+
     def test_other_loop_future(self):
         other_loop = asyncio.new_event_loop()
         fut = self.new_future(other_loop)
diff --git a/Misc/NEWS.d/next/Library/2017-08-01-09-32-58.bpo-31061.husAYX.rst b/Misc/NEWS.d/next/Library/2017-08-01-09-32-58.bpo-31061.husAYX.rst
new file mode 100644
index 00000000000..650e5f95f94
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-01-09-32-58.bpo-31061.husAYX.rst
@@ -0,0 +1 @@
+Fixed a crash when using asyncio and threads.
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index 8fbd565dd9c..c48cbbc263d 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -971,6 +971,8 @@ FutureObj_dealloc(PyObject *self)
         }
     }
 
+    PyObject_GC_UnTrack(self);
+
     if (fut->fut_weakreflist != NULL) {
         PyObject_ClearWeakRefs(self);
     }
@@ -1845,6 +1847,8 @@ TaskObj_dealloc(PyObject *self)
         }
     }
 
+    PyObject_GC_UnTrack(self);
+
     if (task->task_weakreflist != NULL) {
         PyObject_ClearWeakRefs(self);
     }


From webhook-mailer at python.org  Wed Aug  2 04:33:36 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 02 Aug 2017 08:33:36 -0000
Subject: [Python-checkins] bpo-29902: Emit a Py3k deprecation warning when
 pickling or copying (#2823)
Message-ID: <mailman.23.1501662817.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/3dd1ccbb0950b2b83713a495958c35d60b453fa9
commit: 3dd1ccbb0950b2b83713a495958c35d60b453fa9
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-02T11:33:33+03:00
summary:

bpo-29902: Emit a Py3k deprecation warning when pickling or copying (#2823)

some builtin and extension objects that don't support pickling
explicitly and are pickled incorrectly by default (like memoryview or
staticmethod).

files:
A Misc/NEWS.d/next/Library/2017-07-23-13-47-22.bpo-29902.CiuFdn.rst
M Lib/test/test_buffer.py
M Lib/test/test_descr.py
M Lib/test/test_memoryview.py
M Objects/typeobject.c

diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py
index de80d4469d7..c7114cde8b9 100644
--- a/Lib/test/test_buffer.py
+++ b/Lib/test/test_buffer.py
@@ -8,6 +8,7 @@
 import pickle
 import sys
 import unittest
+import warnings
 from test import test_support
 
 class BufferTests(unittest.TestCase):
@@ -39,15 +40,19 @@ def test_large_buffer_size_and_offset(self):
 
     def test_copy(self):
         buf = buffer(b'abc')
-        with self.assertRaises(TypeError):
+        with self.assertRaises(TypeError), warnings.catch_warnings():
+            warnings.filterwarnings('ignore', ".*buffer", DeprecationWarning)
             copy.copy(buf)
 
-    # See issue #22995
-    ## def test_pickle(self):
-    ##     buf = buffer(b'abc')
-    ##     for proto in range(pickle.HIGHEST_PROTOCOL + 1):
-    ##         with self.assertRaises(TypeError):
-    ##             pickle.dumps(buf, proto)
+    @test_support.cpython_only
+    def test_pickle(self):
+        buf = buffer(b'abc')
+        for proto in range(2):
+            with self.assertRaises(TypeError):
+                pickle.dumps(buf, proto)
+        with test_support.check_py3k_warnings(
+                (".*buffer", DeprecationWarning)):
+            pickle.dumps(buf, 2)
 
 
 def test_main():
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 1e63761f6d0..bbc52aa6791 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -1,5 +1,7 @@
 import __builtin__
+import copy
 import gc
+import pickle
 import sys
 import types
 import unittest
@@ -10,6 +12,10 @@
 from test import test_support
 
 
+def func(*args):
+    return args
+
+
 class OperatorsTest(unittest.TestCase):
 
     def __init__(self, *args, **kwargs):
@@ -1415,6 +1421,21 @@ def f(cls, arg): return (cls, arg)
         else:
             self.fail("classmethod shouldn't accept keyword args")
 
+    @test_support.cpython_only
+    def test_classmethod_copy_pickle(self):
+        cm = classmethod(func)
+        with test_support.check_py3k_warnings(
+                (".*classmethod", DeprecationWarning)):
+            copy.copy(cm)
+        with test_support.check_py3k_warnings(
+                (".*classmethod", DeprecationWarning)):
+            copy.deepcopy(cm)
+        for proto in range(2):
+            self.assertRaises(TypeError, pickle.dumps, cm, proto)
+        with test_support.check_py3k_warnings(
+                (".*classmethod", DeprecationWarning)):
+            pickle.dumps(cm, 2)
+
     @test_support.impl_detail("the module 'xxsubtype' is internal")
     def test_classmethods_in_c(self):
         # Testing C-based class methods...
@@ -1463,6 +1484,21 @@ class D(C):
         self.assertEqual(d.foo(1), (d, 1))
         self.assertEqual(D.foo(d, 1), (d, 1))
 
+    @test_support.cpython_only
+    def test_staticmethod_copy_pickle(self):
+        sm = staticmethod(func)
+        with test_support.check_py3k_warnings(
+                (".*staticmethod", DeprecationWarning)):
+            copy.copy(sm)
+        with test_support.check_py3k_warnings(
+                (".*staticmethod", DeprecationWarning)):
+            copy.deepcopy(sm)
+        for proto in range(2):
+            self.assertRaises(TypeError, pickle.dumps, sm, proto)
+        with test_support.check_py3k_warnings(
+                (".*staticmethod", DeprecationWarning)):
+            pickle.dumps(sm, 2)
+
     @test_support.impl_detail("the module 'xxsubtype' is internal")
     def test_staticmethods_in_c(self):
         # Testing C-based static methods...
@@ -2158,6 +2194,21 @@ class D(object):
         else:
             self.fail("expected ZeroDivisionError from bad property")
 
+    @test_support.cpython_only
+    def test_property_copy_pickle(self):
+        p = property(func)
+        with test_support.check_py3k_warnings(
+                (".*property", DeprecationWarning)):
+            copy.copy(p)
+        with test_support.check_py3k_warnings(
+                (".*property", DeprecationWarning)):
+            copy.deepcopy(p)
+        for proto in range(2):
+            self.assertRaises(TypeError, pickle.dumps, p, proto)
+        with test_support.check_py3k_warnings(
+                (".*property", DeprecationWarning)):
+            pickle.dumps(p, 2)
+
     @unittest.skipIf(sys.flags.optimize >= 2,
                      "Docstrings are omitted with -O2 and above")
     def test_properties_doc_attrib(self):
diff --git a/Lib/test/test_memoryview.py b/Lib/test/test_memoryview.py
index 4407af82642..42698583f9f 100644
--- a/Lib/test/test_memoryview.py
+++ b/Lib/test/test_memoryview.py
@@ -12,6 +12,7 @@
 import io
 import copy
 import pickle
+import warnings
 
 
 class AbstractMemoryTests:
@@ -359,15 +360,20 @@ class BytesMemorySliceSliceTest(unittest.TestCase,
 class OtherTest(unittest.TestCase):
     def test_copy(self):
         m = memoryview(b'abc')
-        with self.assertRaises(TypeError):
+        with self.assertRaises(TypeError), warnings.catch_warnings():
+            warnings.filterwarnings('ignore', ".*memoryview", DeprecationWarning)
             copy.copy(m)
 
-    # See issue #22995
-    ## def test_pickle(self):
-    ##     m = memoryview(b'abc')
-    ##     for proto in range(pickle.HIGHEST_PROTOCOL + 1):
-    ##         with self.assertRaises(TypeError):
-    ##             pickle.dumps(m, proto)
+    @test_support.cpython_only
+    def test_pickle(self):
+        m = memoryview(b'abc')
+        for proto in range(2):
+            with self.assertRaises(TypeError):
+                pickle.dumps(m, proto)
+        with test_support.check_py3k_warnings(
+                (".*memoryview", DeprecationWarning)):
+            pickle.dumps(m, 2)
+
 
 
 def test_main():
diff --git a/Misc/NEWS.d/next/Library/2017-07-23-13-47-22.bpo-29902.CiuFdn.rst b/Misc/NEWS.d/next/Library/2017-07-23-13-47-22.bpo-29902.CiuFdn.rst
new file mode 100644
index 00000000000..6aa6605be3e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-07-23-13-47-22.bpo-29902.CiuFdn.rst
@@ -0,0 +1,4 @@
+Py3k deprecation warning now is emitted when pickling or copying some builtin
+and extension objects that don't support pickling explicitly and are pickled
+incorrectly by default (like memoryview or staticmethod).  This is a
+TypeError in Python 3.6.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index eb5f5a4e9dd..685c5457737 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3366,6 +3366,29 @@ reduce_2(PyObject *obj)
             goto end;
         assert(names == Py_None || PyList_Check(names));
 
+        if (required_state && Py_Py3kWarningFlag) {
+            Py_ssize_t basicsize = PyBaseObject_Type.tp_basicsize;
+            if (obj->ob_type->tp_dictoffset)
+                basicsize += sizeof(PyObject *);
+            if (obj->ob_type->tp_weaklistoffset)
+                basicsize += sizeof(PyObject *);
+            if (names != Py_None)
+                basicsize += sizeof(PyObject *) * PyList_GET_SIZE(names);
+            if (obj->ob_type->tp_basicsize > basicsize) {
+                PyObject *msg = PyString_FromFormat(
+                            "can't pickle %.200s objects",
+                             Py_TYPE(obj)->tp_name);
+                if (msg == NULL) {
+                    goto end;
+                }
+                if (PyErr_WarnPy3k(PyString_AS_STRING(msg), 1) < 0) {
+                    Py_DECREF(msg);
+                    goto end;
+                }
+                Py_DECREF(msg);
+            }
+        }
+
         if (names != Py_None) {
             slots = PyDict_New();
             if (slots == NULL)


From solipsis at pitrou.net  Wed Aug  2 05:07:52 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 02 Aug 2017 09:07:52 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=-2
Message-ID: <20170802090751.16075.63C9ECA3C59BCB9E@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [-7, 1, 0] memory blocks, sum=-6
test_functools leaked [0, 3, 1] memory blocks, sum=4


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogoA48q1', '--timeout', '7200']

From webhook-mailer at python.org  Wed Aug  2 16:44:33 2017
From: webhook-mailer at python.org (Vinay Sajip)
Date: Wed, 02 Aug 2017 20:44:33 -0000
Subject: [Python-checkins] bpo-31080: Allowed logging.config.fileConfig() to
 accept both args and kwargs. (GH-2979)
Message-ID: <mailman.24.1501706674.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/6ea56d2ebcae69257f8dd7af28c357b25bf394c3
commit: 6ea56d2ebcae69257f8dd7af28c357b25bf394c3
branch: master
author: Preston Landers <planders at utexas.edu>
committer: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: 2017-08-02T21:44:28+01:00
summary:

bpo-31080: Allowed logging.config.fileConfig() to accept both args and kwargs. (GH-2979)

files:
A Misc/NEWS.d/next/Library/2017-08-01-18-26-55.bpo-31080.2CFVCO.rst
M Doc/library/logging.config.rst
M Lib/logging/config.py
M Lib/test/test_logging.py

diff --git a/Doc/library/logging.config.rst b/Doc/library/logging.config.rst
index a7928a0647c..06378379c33 100644
--- a/Doc/library/logging.config.rst
+++ b/Doc/library/logging.config.rst
@@ -715,7 +715,12 @@ a corresponding section in the configuration file.
 The ``args`` entry, when :func:`eval`\ uated in the context of the ``logging``
 package's namespace, is the list of arguments to the constructor for the handler
 class. Refer to the constructors for the relevant handlers, or to the examples
-below, to see how typical entries are constructed.
+below, to see how typical entries are constructed. If not provided, it defaults
+to ``()``.
+
+The optional ``kwargs`` entry, when :func:`eval`\ uated in the context of the
+``logging`` package's namespace, is the keyword argument dict to the constructor
+for the handler class. If not provided, it defaults to ``{}``.
 
 .. code-block:: ini
 
@@ -754,6 +759,7 @@ below, to see how typical entries are constructed.
    level=WARN
    formatter=form07
    args=('localhost', 'from at abc', ['user1 at abc', 'user2 at xyz'], 'Logger Subject')
+   kwargs={'timeout': 10.0}
 
    [handler_hand08]
    class=handlers.MemoryHandler
@@ -767,6 +773,7 @@ below, to see how typical entries are constructed.
    level=NOTSET
    formatter=form09
    args=('localhost:9022', '/log', 'GET')
+   kwargs={'secure': True}
 
 Sections which specify formatter configuration are typified by the following.
 
diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index d692514adfe..b3f4e28796a 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -143,9 +143,11 @@ def _install_handlers(cp, formatters):
             klass = eval(klass, vars(logging))
         except (AttributeError, NameError):
             klass = _resolve(klass)
-        args = section["args"]
+        args = section.get("args", '()')
         args = eval(args, vars(logging))
-        h = klass(*args)
+        kwargs = section.get("kwargs", '{}')
+        kwargs = eval(kwargs, vars(logging))
+        h = klass(*args, **kwargs)
         if "level" in section:
             level = section["level"]
             h.setLevel(level)
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 36ea0725153..a91cfd4ccd3 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -1273,7 +1273,7 @@ class ConfigFileTest(BaseTest):
     datefmt=
     """
 
-    # config7 adds a compiler logger.
+    # config7 adds a compiler logger, and uses kwargs instead of args.
     config7 = """
     [loggers]
     keys=root,parser,compiler
@@ -1304,7 +1304,7 @@ class ConfigFileTest(BaseTest):
     class=StreamHandler
     level=NOTSET
     formatter=form1
-    args=(sys.stdout,)
+    kwargs={'stream': sys.stdout,}
 
     [formatter_form1]
     format=%(levelname)s ++ %(message)s
diff --git a/Misc/NEWS.d/next/Library/2017-08-01-18-26-55.bpo-31080.2CFVCO.rst b/Misc/NEWS.d/next/Library/2017-08-01-18-26-55.bpo-31080.2CFVCO.rst
new file mode 100644
index 00000000000..afa2d532c5c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-01-18-26-55.bpo-31080.2CFVCO.rst
@@ -0,0 +1 @@
+Allow `logging.config.fileConfig` to accept kwargs and/or args.


From webhook-mailer at python.org  Wed Aug  2 18:50:55 2017
From: webhook-mailer at python.org (Mariatta)
Date: Wed, 02 Aug 2017 22:50:55 -0000
Subject: [Python-checkins] Add @bitdancer as codeowner of email related
 stuff. (GH-2987)
Message-ID: <mailman.25.1501714256.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/d9d55c91bec4776b41685b48fe660621e89f0617
commit: d9d55c91bec4776b41685b48fe660621e89f0617
branch: master
author: R. David Murray <rdmurray at bitdance.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-08-02T15:50:50-07:00
summary:

Add @bitdancer as codeowner of email related stuff. (GH-2987)

files:
M .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 137681b9a95..1c5164f6640 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -19,3 +19,10 @@
 
 # SSL
 **/*ssl*                      @tiran
+
+# Email and related
+**/*mail*                     @bitdancer
+**/*smtp*                     @bitdancer
+**/*mime*                     @bitdancer
+**/*imap*                     @bitdancer
+**/*poplib*                   @bitdancer


From lp_benchmark_robot at intel.com  Wed Aug  2 19:27:48 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Wed, 2 Aug 2017 16:27:48 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-02
Message-ID: <8b3e9571-fcd6-4a77-a53f-ee094e3fe37f@orsmsx110.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-02 03:03:27-07:00.
  - commit:		de34cbe
  - previous commit:	6f446be
  - revision date:	2017-08-02 15:31:07+09:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.106% |  +0.313%   |  +4.655%   |  +8.041%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 2.081% |  +0.241%   |  +22.334%  |  +13.474%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 2.009% |  -0.204%   |  +23.003%  |  +12.051%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 1.147% |  -0.298%   |  +21.541%  |  +11.142%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 3.367% |  -0.969%   |  +7.253%   |  +12.763%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.507% |  +0.108%   |  +11.657%  |  +11.247%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.675% |  +0.235%   |  +7.596%   |  +9.920%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.785% |  -0.006%   |  +4.386%   |  +5.309%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.922% |  +0.282%   |  +8.242%   |  +16.473%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.376% |  -0.205%   |  +9.864%   |  +11.987%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.132% |  +0.117%   |  +3.493%   |  +6.498%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.948% |  -0.150%   |  +4.575%   |  +7.405%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 1.112% |  -0.079%   |  +4.424%   |  +4.213%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.210% |  -0.100%   |  +9.673%   |  +11.192%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.738% |  +1.593%   |  +7.420%   |  +10.183%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 1.249% |  +0.146%   |  +6.100%   |  +11.250%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 1.297% |  -0.054%   |  +10.361%  |  +10.632%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.352% |  +0.425%   |  +8.444%   |  +9.853%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.282% |  +0.292%   |  +4.319%   |  +8.553%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 1.427% |  -0.144%   |  +3.816%   |  +9.007%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.438% |  -0.963%   |  +8.962%   |  +12.120%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.659% |  -0.185%   |  +47.410%  |  +11.134%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.323% |  -0.042%   |  +10.346%  |  +13.363%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.638% |  +0.216%   |  +18.820%  |  +10.936%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 7.155% |  +1.142%   |  +4.045%   |  +13.494%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.978% |  -0.936%   |  +3.696%   |  +5.994%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.545% |  +0.005%   |  -4.212%   |  +5.504%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 3.197% |  +0.214%   |  +2.093%   |  +7.834%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.221% |  -0.079%   |  +0.038%   |  +14.917%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.842% |  +0.345%   |  +2.576%   |  +21.008%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.572% |  -0.116%   |  +3.819%   |  +18.041%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.912% |  -0.031%   |  +3.929%   |  +20.216%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.463% |  +0.570%   |  +12.856%  |  +9.739%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.228% |  -0.035%   |  +0.194%   |  +9.677%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.120% |  -0.043%   |  +9.614%   |  +4.250%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.090% |  +0.028%   |  +1.386%   |  +4.207%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 0.895% |  -0.093%   |  +11.262%  |  +11.854%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.138% |  +2.352%   |  -5.500%   |  +10.197%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.248% |  +0.169%   |  -1.685%   |  +12.103%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.348% |  -0.374%   |  -0.123%   |  +3.039%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 0.857% |  +0.231%   |  +10.805%  |  +4.854%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 0.921% |  +0.401%   |  +8.722%   |  +13.159%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 1.351% |  -0.169%   |  +1.412%   |  +4.534%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 2.684% |  -0.889%   |  +26.699%  |  +9.936%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.908% |  +0.392%   |  +6.176%   |  +3.536%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 1.245% |  -0.351%   |  +15.882%  |  +7.187%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 2.041% |  -0.439%   |  +3.160%   |  +1.326%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.838% |  +0.039%   |  +6.412%   |  +3.044%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.062% |  +0.100%   |  +5.458%   |  +8.069%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.188% |  +0.153%   |  +5.498%   |  +5.050%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.218% |  -1.171%   |  +1.912%   |  +9.092%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.104% |  +0.271%   |  +13.116%  |  +8.182%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.622% |  +0.149%   |  +11.038%  |  +6.045%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.857% |  -0.632%   |  +12.455%  |  +9.362%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.481% |  +0.230%   |  +13.935%  |  +9.522%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 5.782% |  -1.412%   |  +21.701%  |  +12.874%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.292% |  -0.329%   |  +6.197%   |  +6.677%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.293% |  +0.451%   |  +0.077%   |  +1.619%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 8.750% |  +1.278%   |  +9.083%   |  +19.383%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 2.095% |  -1.051%   |  -3.906%   |  +20.727%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 3.162% |  +0.351%   |  +6.758%   |  +8.277%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 0.932% |  -0.193%   |  +5.022%   |  +9.252%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.082% |  +0.065%   |  +2.439%   |  +6.548%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 2.185% |  -0.136%   |  -5.382%   |  +9.957%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.686% |  -0.422%   |  +5.796%   |  +9.222%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-02

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Thu Aug  3 02:01:02 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 03 Aug 2017 06:01:02 -0000
Subject: [Python-checkins] Spelling fixes (#2902)
Message-ID: <mailman.26.1501740063.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/49b2734bf12dc1cda80fd73d3ec8896ae3e362f2
commit: 49b2734bf12dc1cda80fd73d3ec8896ae3e362f2
branch: master
author: Ville Skytt? <ville.skytta at iki.fi>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-03T09:00:59+03:00
summary:

Spelling fixes (#2902)

files:
M Doc/library/sys.rst
M Include/abstract.h
M Include/unicodeobject.h
M Lib/enum.py
M Lib/idlelib/configdialog.py
M Lib/test/decimaltestdata/ddDivide.decTest
M Lib/test/decimaltestdata/ddDivideInt.decTest
M Lib/test/decimaltestdata/ddFMA.decTest
M Lib/test/decimaltestdata/ddMultiply.decTest
M Lib/test/decimaltestdata/divide.decTest
M Lib/test/decimaltestdata/dqDivide.decTest
M Lib/test/decimaltestdata/dqDivideInt.decTest
M Lib/test/decimaltestdata/dqFMA.decTest
M Lib/test/decimaltestdata/dqMultiply.decTest
M Lib/test/decimaltestdata/fma.decTest
M Lib/test/decimaltestdata/multiply.decTest
M Lib/test/test_binop.py
M Lib/test/test_functools.py
M Lib/test/test_importlib/import_/test___package__.py
M Lib/test/test_os.py
M Lib/test/test_subprocess.py
M Lib/test/test_warnings/__init__.py
M Lib/unittest/test/testmock/testmagicmethods.py
M Misc/HISTORY
M Misc/NEWS
M Modules/_ctypes/_ctypes.c
M Modules/_lzmamodule.c
M Modules/posixmodule.c
M Python/ceval.c

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 54b99e0fd99..8b94929c500 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -610,7 +610,7 @@ always available.
    :class:`~collections.namedtuple` of the form `(firstiter, finalizer)`,
    where *firstiter* and *finalizer* are expected to be either ``None`` or
    functions which take an :term:`asynchronous generator iterator` as an
-   argument, and are used to schedule finalization of an asychronous
+   argument, and are used to schedule finalization of an asynchronous
    generator by an event loop.
 
    .. versionadded:: 3.6
diff --git a/Include/abstract.h b/Include/abstract.h
index fe089dcbb56..8969019e30c 100644
--- a/Include/abstract.h
+++ b/Include/abstract.h
@@ -170,7 +170,7 @@ PyAPI_FUNC(PyObject*) _PyStack_AsTupleSlice(
    format to a Python dictionary ("kwargs" dict).
 
    The type of kwnames keys is not checked. The final function getting
-   arguments is reponsible to check if all keys are strings, for example using
+   arguments is responsible to check if all keys are strings, for example using
    PyArg_ParseTupleAndKeywords() or PyArg_ValidateKeywordArguments().
 
    Duplicate keys are merged using the last value. If duplicate keys must raise
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index bb91568cb4e..5ca1f87013f 100644
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -1227,7 +1227,7 @@ PyAPI_FUNC(PyObject*) PyUnicode_Encode(
 /* Encodes a Unicode object and returns the result as Python
    object.
 
-   This API is DEPRECATED.  It is superceeded by PyUnicode_AsEncodedString()
+   This API is DEPRECATED.  It is superseded by PyUnicode_AsEncodedString()
    since all standard encodings (except rot13) encode str to bytes.
    Use PyCodec_Encode() for encoding with rot13 and non-standard codecs
    that encode form str to non-bytes. */
diff --git a/Lib/enum.py b/Lib/enum.py
index 73dd613887d..6d90f7dd65f 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -840,7 +840,7 @@ def _decompose(flag, value):
     not_covered = value
     negative = value < 0
     # issue29167: wrap accesses to _value2member_map_ in a list to avoid race
-    #             conditions between iterating over it and having more psuedo-
+    #             conditions between iterating over it and having more pseudo-
     #             members added to it
     if negative:
         # only check for named flags
diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 6d8a03b1c00..f7a6b7367e4 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -1216,7 +1216,7 @@ def create_page_extensions(self):
         which are boolean, and can be toggled with a True/False button.
 
         Methods:
-            load_extentions:
+            load_extensions:
             extension_selected: Handle selection from list.
             create_extension_frame: Hold widgets for one extension.
             set_extension_value: Set in userCfg['extensions'].
diff --git a/Lib/test/decimaltestdata/ddDivide.decTest b/Lib/test/decimaltestdata/ddDivide.decTest
index 5531d0e0315..5b2651b2b66 100644
--- a/Lib/test/decimaltestdata/ddDivide.decTest
+++ b/Lib/test/decimaltestdata/ddDivide.decTest
@@ -579,7 +579,7 @@ dddiv1056 divide  1e-277 -1e+311 -> -0E-398 Underflow Subnormal Inexact Rounded
 dddiv1057 divide -1e-277  1e+311 -> -0E-398 Underflow Subnormal Inexact Rounded Clamped
 dddiv1058 divide -1e-277 -1e+311 ->  0E-398 Underflow Subnormal Inexact Rounded Clamped
 
--- 'subnormal' boundary (all hard underflow or overflow in base arithemtic)
+-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic)
 dddiv1060 divide 1e-291 1e+101 -> 1E-392 Subnormal
 dddiv1061 divide 1e-291 1e+102 -> 1E-393 Subnormal
 dddiv1062 divide 1e-291 1e+103 -> 1E-394 Subnormal
diff --git a/Lib/test/decimaltestdata/ddDivideInt.decTest b/Lib/test/decimaltestdata/ddDivideInt.decTest
index 1555b4217dc..342d13041b1 100644
--- a/Lib/test/decimaltestdata/ddDivideInt.decTest
+++ b/Lib/test/decimaltestdata/ddDivideInt.decTest
@@ -248,7 +248,7 @@ dddvi1056 divideint  1e-277 -1e+311 -> -0
 dddvi1057 divideint -1e-277  1e+311 -> -0
 dddvi1058 divideint -1e-277 -1e+311 ->  0
 
--- 'subnormal' boundary (all hard underflow or overflow in base arithemtic)
+-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic)
 dddvi1060 divideint 1e-291 1e+101 -> 0
 dddvi1061 divideint 1e-291 1e+102 -> 0
 dddvi1062 divideint 1e-291 1e+103 -> 0
diff --git a/Lib/test/decimaltestdata/ddFMA.decTest b/Lib/test/decimaltestdata/ddFMA.decTest
index f0acfc74d53..9094fc015bd 100644
--- a/Lib/test/decimaltestdata/ddFMA.decTest
+++ b/Lib/test/decimaltestdata/ddFMA.decTest
@@ -26,7 +26,7 @@ extended:    1
 clamp:       1
 rounding:    half_even
 
--- These tests comprese three parts:
+-- These tests comprise three parts:
 --   1. Sanity checks and other three-operand tests (especially those
 --      where the fused operation makes a difference)
 --   2. Multiply tests (third operand is neutral zero [0E+emax])
@@ -458,7 +458,7 @@ ddfma2756 fma   1e-277 -1e-311   0e+384  ->  -0E-398 Underflow Subnormal Inexact
 ddfma2757 fma  -1e-277  1e-311   0e+384  ->  -0E-398 Underflow Subnormal Inexact Rounded Clamped
 ddfma2758 fma  -1e-277 -1e-311   0e+384  ->   0E-398 Underflow Subnormal Inexact Rounded Clamped
 
--- 'subnormal' boundary (all hard underflow or overflow in base arithemtic)
+-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic)
 ddfma2760 fma  1e-291 1e-101   0e+384  ->  1E-392 Subnormal
 ddfma2761 fma  1e-291 1e-102   0e+384  ->  1E-393 Subnormal
 ddfma2762 fma  1e-291 1e-103   0e+384  ->  1E-394 Subnormal
diff --git a/Lib/test/decimaltestdata/ddMultiply.decTest b/Lib/test/decimaltestdata/ddMultiply.decTest
index 45a381dc619..b7342ac2fe7 100644
--- a/Lib/test/decimaltestdata/ddMultiply.decTest
+++ b/Lib/test/decimaltestdata/ddMultiply.decTest
@@ -347,7 +347,7 @@ ddmul756 multiply  1e-277 -1e-311 -> -0E-398 Underflow Subnormal Inexact Rounded
 ddmul757 multiply -1e-277  1e-311 -> -0E-398 Underflow Subnormal Inexact Rounded Clamped
 ddmul758 multiply -1e-277 -1e-311 ->  0E-398 Underflow Subnormal Inexact Rounded Clamped
 
--- 'subnormal' boundary (all hard underflow or overflow in base arithemtic)
+-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic)
 ddmul760 multiply 1e-291 1e-101 -> 1E-392 Subnormal
 ddmul761 multiply 1e-291 1e-102 -> 1E-393 Subnormal
 ddmul762 multiply 1e-291 1e-103 -> 1E-394 Subnormal
diff --git a/Lib/test/decimaltestdata/divide.decTest b/Lib/test/decimaltestdata/divide.decTest
index efbb5baf855..a51aa5d935e 100644
--- a/Lib/test/decimaltestdata/divide.decTest
+++ b/Lib/test/decimaltestdata/divide.decTest
@@ -759,7 +759,7 @@ divx959 divide 9E-999999999 -9.100 -> -9.8901099E-1000000000 Inexact Rounded Und
 
 -- overflow and underflow (additional edge tests in multiply.decTest)
 -- 'subnormal' results now possible (all hard underflow or overflow in
--- base arithemtic)
+-- base arithmetic)
 divx960 divide 1e-600000000 1e+400000001 -> 1E-1000000001 Subnormal
 divx961 divide 1e-600000000 1e+400000002 -> 1E-1000000002 Subnormal
 divx962 divide 1e-600000000 1e+400000003 -> 1E-1000000003 Subnormal
diff --git a/Lib/test/decimaltestdata/dqDivide.decTest b/Lib/test/decimaltestdata/dqDivide.decTest
index 3cf60c60241..1d623ff4123 100644
--- a/Lib/test/decimaltestdata/dqDivide.decTest
+++ b/Lib/test/decimaltestdata/dqDivide.decTest
@@ -580,7 +580,7 @@ dqdiv1756 divide  1e-4277 -1e+3311 -> -0E-6176 Underflow Subnormal Inexact Round
 dqdiv1757 divide -1e-4277  1e+3311 -> -0E-6176 Underflow Subnormal Inexact Rounded Clamped
 dqdiv1758 divide -1e-4277 -1e+3311 ->  0E-6176 Underflow Subnormal Inexact Rounded Clamped
 
--- 'subnormal' boundary (all hard underflow or overflow in base arithemtic)
+-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic)
 dqdiv1760 divide 1e-6069 1e+101 -> 1E-6170 Subnormal
 dqdiv1761 divide 1e-6069 1e+102 -> 1E-6171 Subnormal
 dqdiv1762 divide 1e-6069 1e+103 -> 1E-6172 Subnormal
diff --git a/Lib/test/decimaltestdata/dqDivideInt.decTest b/Lib/test/decimaltestdata/dqDivideInt.decTest
index 3fec6dbaa37..ed74fe61386 100644
--- a/Lib/test/decimaltestdata/dqDivideInt.decTest
+++ b/Lib/test/decimaltestdata/dqDivideInt.decTest
@@ -249,7 +249,7 @@ dqdvi1056 divideint  1e-277 -1e+311 -> -0
 dqdvi1057 divideint -1e-277  1e+311 -> -0
 dqdvi1058 divideint -1e-277 -1e+311 ->  0
 
--- 'subnormal' boundary (all hard underflow or overflow in base arithemtic)
+-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic)
 dqdvi1060 divideint 1e-291 1e+101 -> 0
 dqdvi1061 divideint 1e-291 1e+102 -> 0
 dqdvi1062 divideint 1e-291 1e+103 -> 0
diff --git a/Lib/test/decimaltestdata/dqFMA.decTest b/Lib/test/decimaltestdata/dqFMA.decTest
index 2353f2fa2cb..caa24025a75 100644
--- a/Lib/test/decimaltestdata/dqFMA.decTest
+++ b/Lib/test/decimaltestdata/dqFMA.decTest
@@ -26,7 +26,7 @@ maxExponent: 6144
 minExponent: -6143
 rounding:    half_even
 
--- These tests comprese three parts:
+-- These tests comprise three parts:
 --   1. Sanity checks and other three-operand tests (especially those
 --      where the fused operation makes a difference)
 --   2. Multiply tests (third operand is neutral zero [0E+emax])
@@ -476,7 +476,7 @@ dqfma2756 fma   1e-4277 -1e-3311   0e+6144  -> -0E-6176 Underflow Subnormal Inex
 dqfma2757 fma  -1e-4277  1e-3311   0e+6144  -> -0E-6176 Underflow Subnormal Inexact Rounded Clamped
 dqfma2758 fma  -1e-4277 -1e-3311   0e+6144  ->  0E-6176 Underflow Subnormal Inexact Rounded Clamped
 
--- 'subnormal' boundary (all hard underflow or overflow in base arithemtic)
+-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic)
 dqfma2760 fma  1e-6069 1e-101   0e+6144  -> 1E-6170 Subnormal
 dqfma2761 fma  1e-6069 1e-102   0e+6144  -> 1E-6171 Subnormal
 dqfma2762 fma  1e-6069 1e-103   0e+6144  -> 1E-6172 Subnormal
diff --git a/Lib/test/decimaltestdata/dqMultiply.decTest b/Lib/test/decimaltestdata/dqMultiply.decTest
index 676c1f5ea44..f9df480bb2a 100644
--- a/Lib/test/decimaltestdata/dqMultiply.decTest
+++ b/Lib/test/decimaltestdata/dqMultiply.decTest
@@ -355,7 +355,7 @@ dqmul756 multiply  1e-4277 -1e-3311 -> -0E-6176 Underflow Subnormal Inexact Roun
 dqmul757 multiply -1e-4277  1e-3311 -> -0E-6176 Underflow Subnormal Inexact Rounded Clamped
 dqmul758 multiply -1e-4277 -1e-3311 ->  0E-6176 Underflow Subnormal Inexact Rounded Clamped
 
--- 'subnormal' boundary (all hard underflow or overflow in base arithemtic)
+-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic)
 dqmul760 multiply 1e-6069 1e-101 -> 1E-6170 Subnormal
 dqmul761 multiply 1e-6069 1e-102 -> 1E-6171 Subnormal
 dqmul762 multiply 1e-6069 1e-103 -> 1E-6172 Subnormal
diff --git a/Lib/test/decimaltestdata/fma.decTest b/Lib/test/decimaltestdata/fma.decTest
index 0b188fa4c30..46672af3928 100644
--- a/Lib/test/decimaltestdata/fma.decTest
+++ b/Lib/test/decimaltestdata/fma.decTest
@@ -25,7 +25,7 @@ rounding:    half_up
 maxExponent: 384
 minexponent: -383
 
--- These tests comprese three parts:
+-- These tests comprise three parts:
 --   1. Sanity checks and other three-operand tests (especially those
 --      where the fused operation makes a difference)
 --   2. Multiply tests (third operand is neutral zero [0E+emax])
@@ -610,7 +610,7 @@ fmax2756 fma  1e-777777 -1e-411111  0E+999999  -> -0E-1000007 Underflow Subnorma
 fmax2757 fma -1e-777777  1e-411111  0E+999999  -> -0E-1000007 Underflow Subnormal Inexact Rounded Clamped
 fmax2758 fma -1e-777777 -1e-411111  0E+999999  ->  0E-1000007 Underflow Subnormal Inexact Rounded Clamped
 
--- 'subnormal' boundary (all hard underflow or overflow in base arithemtic)
+-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic)
 precision: 9
 fmax2760 fma 1e-600000 1e-400001  0E+999999  -> 1E-1000001 Subnormal
 fmax2761 fma 1e-600000 1e-400002  0E+999999  -> 1E-1000002 Subnormal
diff --git a/Lib/test/decimaltestdata/multiply.decTest b/Lib/test/decimaltestdata/multiply.decTest
index e8bd77a87c3..f291538b7da 100644
--- a/Lib/test/decimaltestdata/multiply.decTest
+++ b/Lib/test/decimaltestdata/multiply.decTest
@@ -533,7 +533,7 @@ mulx756 multiply  1e-777777777 -1e-411111111 -> -0E-1000000007 Underflow Subnorm
 mulx757 multiply -1e-777777777  1e-411111111 -> -0E-1000000007 Underflow Subnormal Inexact Rounded Clamped
 mulx758 multiply -1e-777777777 -1e-411111111 ->  0E-1000000007 Underflow Subnormal Inexact Rounded Clamped
 
--- 'subnormal' boundary (all hard underflow or overflow in base arithemtic)
+-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic)
 precision: 9
 mulx760 multiply 1e-600000000 1e-400000001 -> 1E-1000000001 Subnormal
 mulx761 multiply 1e-600000000 1e-400000002 -> 1E-1000000002 Subnormal
diff --git a/Lib/test/test_binop.py b/Lib/test/test_binop.py
index 4f5b8a8b93e..299af09c498 100644
--- a/Lib/test/test_binop.py
+++ b/Lib/test/test_binop.py
@@ -22,7 +22,7 @@ def isnum(x):
     return 0
 
 def isRat(x):
-    """Test wheter an object is an instance of the Rat class."""
+    """Test whether an object is an instance of the Rat class."""
     return isinstance(x, Rat)
 
 class Rat(object):
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index 8eede7a6849..3acfb92be4a 100644
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -1253,7 +1253,7 @@ def f(x, y):
         self.assertEqual(mock_int.__hash__.call_count, 2)
         self.assertEqual(f.cache_info(), (1, 1, 1, 1))
 
-        # Cache eviction: No use as an argument gives no additonal call
+        # Cache eviction: No use as an argument gives no additional call
         self.assertEqual(f(6, 2), 20)
         self.assertEqual(mock_int.__hash__.call_count, 2)
         self.assertEqual(f.cache_info(), (1, 2, 1, 1))
diff --git a/Lib/test/test_importlib/import_/test___package__.py b/Lib/test/test_importlib/import_/test___package__.py
index b26634ea453..761b256b387 100644
--- a/Lib/test/test_importlib/import_/test___package__.py
+++ b/Lib/test/test_importlib/import_/test___package__.py
@@ -11,7 +11,7 @@
 
 class Using__package__:
 
-    """Use of __package__ supercedes the use of __name__/__path__ to calculate
+    """Use of __package__ supersedes the use of __name__/__path__ to calculate
     what package a module belongs to. The basic algorithm is [__package__]::
 
       def resolve_name(name, package, level):
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 611692f7644..234f701a115 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -1598,19 +1598,19 @@ def test_internal_execvpe_str(self):
     def test_execve_invalid_env(self):
         args = [sys.executable, '-c', 'pass']
 
-        # null character in the enviroment variable name
+        # null character in the environment variable name
         newenv = os.environ.copy()
         newenv["FRUIT\0VEGETABLE"] = "cabbage"
         with self.assertRaises(ValueError):
             os.execve(args[0], args, newenv)
 
-        # null character in the enviroment variable value
+        # null character in the environment variable value
         newenv = os.environ.copy()
         newenv["FRUIT"] = "orange\0VEGETABLE=cabbage"
         with self.assertRaises(ValueError):
             os.execve(args[0], args, newenv)
 
-        # equal character in the enviroment variable name
+        # equal character in the environment variable name
         newenv = os.environ.copy()
         newenv["FRUIT=ORANGE"] = "lemon"
         with self.assertRaises(ValueError):
@@ -2430,7 +2430,7 @@ def test_spawnve_noargs(self):
     def _test_invalid_env(self, spawn):
         args = [sys.executable, '-c', 'pass']
 
-        # null character in the enviroment variable name
+        # null character in the environment variable name
         newenv = os.environ.copy()
         newenv["FRUIT\0VEGETABLE"] = "cabbage"
         try:
@@ -2440,7 +2440,7 @@ def _test_invalid_env(self, spawn):
         else:
             self.assertEqual(exitcode, 127)
 
-        # null character in the enviroment variable value
+        # null character in the environment variable value
         newenv = os.environ.copy()
         newenv["FRUIT"] = "orange\0VEGETABLE=cabbage"
         try:
@@ -2450,7 +2450,7 @@ def _test_invalid_env(self, spawn):
         else:
             self.assertEqual(exitcode, 127)
 
-        # equal character in the enviroment variable name
+        # equal character in the environment variable name
         newenv = os.environ.copy()
         newenv["FRUIT=ORANGE"] = "lemon"
         try:
@@ -2460,7 +2460,7 @@ def _test_invalid_env(self, spawn):
         else:
             self.assertEqual(exitcode, 127)
 
-        # equal character in the enviroment variable value
+        # equal character in the environment variable value
         filename = support.TESTFN
         self.addCleanup(support.unlink, filename)
         with open(filename, "w") as fp:
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index a99976aa56f..d152826213e 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -668,25 +668,25 @@ def test_invalid_cmd(self):
             subprocess.Popen([sys.executable, "-c", "pass#\0"])
 
     def test_invalid_env(self):
-        # null character in the enviroment variable name
+        # null character in the environment variable name
         newenv = os.environ.copy()
         newenv["FRUIT\0VEGETABLE"] = "cabbage"
         with self.assertRaises(ValueError):
             subprocess.Popen([sys.executable, "-c", "pass"], env=newenv)
 
-        # null character in the enviroment variable value
+        # null character in the environment variable value
         newenv = os.environ.copy()
         newenv["FRUIT"] = "orange\0VEGETABLE=cabbage"
         with self.assertRaises(ValueError):
             subprocess.Popen([sys.executable, "-c", "pass"], env=newenv)
 
-        # equal character in the enviroment variable name
+        # equal character in the environment variable name
         newenv = os.environ.copy()
         newenv["FRUIT=ORANGE"] = "lemon"
         with self.assertRaises(ValueError):
             subprocess.Popen([sys.executable, "-c", "pass"], env=newenv)
 
-        # equal character in the enviroment variable value
+        # equal character in the environment variable value
         newenv = os.environ.copy()
         newenv["FRUIT"] = "orange=lemon"
         with subprocess.Popen([sys.executable, "-c",
diff --git a/Lib/test/test_warnings/__init__.py b/Lib/test/test_warnings/__init__.py
index 3481e9cb968..69623c40f46 100644
--- a/Lib/test/test_warnings/__init__.py
+++ b/Lib/test/test_warnings/__init__.py
@@ -950,7 +950,7 @@ def test_catch_warnings_defaults(self):
             self.assertIs(wmod.filters, orig_filters)
 
     def test_record_override_showwarning_before(self):
-        # Issue #28835: If warnings.showwarning() was overriden, make sure
+        # Issue #28835: If warnings.showwarning() was overridden, make sure
         # that catch_warnings(record=True) overrides it again.
         text = "This is a warning"
         wmod = self.module
diff --git a/Lib/unittest/test/testmock/testmagicmethods.py b/Lib/unittest/test/testmock/testmagicmethods.py
index 24569b532de..7993db33893 100644
--- a/Lib/unittest/test/testmock/testmagicmethods.py
+++ b/Lib/unittest/test/testmock/testmagicmethods.py
@@ -255,7 +255,7 @@ def test_magicmock(self):
 
         for entry in _magics:
             self.assertTrue(hasattr(mock, entry))
-        self.assertFalse(hasattr(mock, '__imaginery__'))
+        self.assertFalse(hasattr(mock, '__imaginary__'))
 
 
     def test_magic_mock_equality(self):
diff --git a/Misc/HISTORY b/Misc/HISTORY
index 4ce431f660e..4872cfce80b 100644
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -1597,7 +1597,7 @@ Library
   negative values the same way for keyword arguments as it does for
   positional arguments.
 
-- Issue #21812: turtle.shapetransform did not tranform the turtle on the
+- Issue #21812: turtle.shapetransform did not transform the turtle on the
   first call.  (Issue identified and fixed by Lita Cho.)
 
 - Issue #21635: The difflib SequenceMatcher.get_matching_blocks() method
@@ -3245,7 +3245,7 @@ Core and Builtins
 
 - Issue #19466: Clear the frames of daemon threads earlier during the
   Python shutdown to call objects destructors. So "unclosed file" resource
-  warnings are now corretly emitted for daemon threads.
+  warnings are now correctly emitted for daemon threads.
 
 - Issue #19514: Deduplicate some _Py_IDENTIFIER declarations.
   Patch by Andrei Dorian Duma.
@@ -3386,7 +3386,7 @@ Library
 - Issue #19448: Add private API to SSL module to lookup ASN.1 objects by OID,
   NID, short name and long name.
 
-- Issue #19282: dbm.open now supports the context management protocol. (Inital
+- Issue #19282: dbm.open now supports the context management protocol. (Initial
   patch by Claudiu Popa)
 
 - Issue #8311: Added support for writing any bytes-like objects in the aifc,
@@ -3481,7 +3481,7 @@ Library
 - Issue #19227: Remove pthread_atfork() handler. The handler was added to
   solve #18747 but has caused issues.
 
-- Issue #19420: Fix reference leak in module initalization code of
+- Issue #19420: Fix reference leak in module initialization code of
   _hashopenssl.c
 
 - Issue #19329: Optimized compiling charsets in regular expressions.
@@ -4175,7 +4175,7 @@ Library
 
 - Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes
   inside subjectAltName correctly. Formerly the module has used OpenSSL's
-  GENERAL_NAME_print() function to get the string represention of ASN.1
+  GENERAL_NAME_print() function to get the string representation of ASN.1
   strings for ``rfc822Name`` (email), ``dNSName`` (DNS) and
   ``uniformResourceIdentifier`` (URI).
 
@@ -4268,7 +4268,7 @@ IDLE
 Documentation
 -------------
 
-- Issue #18743: Fix references to non-existant "StringIO" module.
+- Issue #18743: Fix references to non-existent "StringIO" module.
 
 - Issue #18783: Removed existing mentions of Python long type in docstrings,
   error messages and comments.
@@ -5022,7 +5022,7 @@ Library
   Thomas Barlow.
 
 - Issue #17358: Modules loaded by imp.load_source() and load_compiled() (and by
-  extention load_module()) now have a better chance of working when reloaded.
+  extension load_module()) now have a better chance of working when reloaded.
 
 - Issue #17804: New function ``struct.iter_unpack`` allows for streaming
   struct unpacking.
@@ -5135,8 +5135,8 @@ Library
   error message has been removed.  Patch by Ram Rachum.
 
 - Issue #18080: When building a C extension module on OS X, if the compiler
-  is overriden with the CC environment variable, use the new compiler as
-  the default for linking if LDSHARED is not also overriden.  This restores
+  is overridden with the CC environment variable, use the new compiler as
+  the default for linking if LDSHARED is not also overridden.  This restores
   Distutils behavior introduced in 3.2.3 and inadvertently dropped in 3.3.0.
 
 - Issue #18113: Fixed a refcount leak in the curses.panel module's
@@ -5207,7 +5207,7 @@ Library
   specifically addresses a stack misalignment issue on x86 and issues on
   some more recent platforms.
 
-- Issue #8862: Fixed curses cleanup when getkey is interrputed by a signal.
+- Issue #8862: Fixed curses cleanup when getkey is interrupted by a signal.
 
 - Issue #17443: imaplib.IMAP4_stream was using the default unbuffered IO
   in subprocess, but the imap code assumes buffered IO.  In Python2 this
@@ -5382,7 +5382,7 @@ Library
   internal XML encoding is not UTF-8 or US-ASCII.  It also now accepts bytes
   and strings larger than 2 GiB.
 
-- Issue #6083: Fix multiple segmentation faults occured when PyArg_ParseTuple
+- Issue #6083: Fix multiple segmentation faults occurred when PyArg_ParseTuple
   parses nested mutating sequence.
 
 - Issue #5289: Fix ctypes.util.find_library on Solaris.
@@ -26790,7 +26790,7 @@ using sre (without changes to the re API).
 
 filecmp - supersedes the old cmp.py and dircmp.py modules.
 
-tabnanny - check Python sources for tab-width dependance.  (Moved from
+tabnanny - check Python sources for tab-width dependence.  (Moved from
 Tools/scripts/.)
 
 urllib2 - new and improved but incompatible version of urllib (still
diff --git a/Misc/NEWS b/Misc/NEWS
index 38449c0409f..1ef28927266 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -454,7 +454,7 @@ Library
   Rodola'.
 
 - bpo-30595: multiprocessing.Queue.get() with a timeout now polls its reader in
-  non-blocking mode if it succeeded to aquire the lock but the acquire took
+  non-blocking mode if it succeeded to acquire the lock but the acquire took
   longer than the timeout.
 
 - bpo-28556: Updates to typing module: Add generic AsyncContextManager, add
@@ -892,7 +892,7 @@ Library
   re.sub() replacement templates regular expressions now are errors.
 
 - Issue #28835: Fix a regression introduced in warnings.catch_warnings():
-  call warnings.showwarning() if it was overriden inside the context manager.
+  call warnings.showwarning() if it was overridden inside the context manager.
 
 - Issue #27172: To assist with upgrades from 2.7, the previously documented
   deprecation of ``inspect.getfullargspec()`` has been reversed. This decision
@@ -1680,7 +1680,7 @@ Library
   again.  But they still are deprecated and will be disabled in 3.7.
 
 - Issue #28835: Fix a regression introduced in warnings.catch_warnings():
-  call warnings.showwarning() if it was overriden inside the context manager.
+  call warnings.showwarning() if it was overridden inside the context manager.
 
 - Issue #27172: To assist with upgrades from 2.7, the previously documented
   deprecation of ``inspect.getfullargspec()`` has been reversed. This decision
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index fc953af5184..fe39567374d 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -3670,7 +3670,7 @@ _build_callargs(PyCFuncPtrObject *self, PyObject *argtypes,
             */
             if (ob == NULL)
                 goto error;
-            /* The .from_param call that will ocurr later will pass this
+            /* The .from_param call that will occur later will pass this
                as a byref parameter. */
             PyTuple_SET_ITEM(callargs, i, ob);
             *poutmask |= (1 << i); /* mark as out arg */
diff --git a/Modules/_lzmamodule.c b/Modules/_lzmamodule.c
index bb77552b67b..26bfa0b4ebb 100644
--- a/Modules/_lzmamodule.c
+++ b/Modules/_lzmamodule.c
@@ -824,7 +824,7 @@ PyDoc_STRVAR(Compressor_doc,
 "be FORMAT_XZ (default), FORMAT_ALONE, or FORMAT_RAW.\n"
 "\n"
 "check specifies the integrity check to use. For FORMAT_XZ, the default\n"
-"is CHECK_CRC64. FORMAT_ALONE and FORMAT_RAW do not suport integrity\n"
+"is CHECK_CRC64. FORMAT_ALONE and FORMAT_RAW do not support integrity\n"
 "checks; for these formats, check must be omitted, or be CHECK_NONE.\n"
 "\n"
 "The settings used by the compressor can be specified either as a\n"
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 0c6723fb09f..2e5e79a8d36 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -1038,7 +1038,7 @@ path_converter(PyObject *o, void *p)
     }
     else if (is_buffer) {
         /* XXX Replace PyObject_CheckBuffer with PyBytes_Check in other code
-           after removing suport of non-bytes buffer objects. */
+           after removing support of non-bytes buffer objects. */
         if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
             "%s%s%s should be %s, not %.200s",
             path->function_name ? path->function_name : "",
diff --git a/Python/ceval.c b/Python/ceval.c
index dd90e18a855..be5cda58cda 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3313,7 +3313,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
                                     ^- (-oparg-1)
                              ^- (-oparg-2)
 
-                   `callable` will be POPed by call_funtion.
+                   `callable` will be POPed by call_function.
                    NULL will will be POPed manually later.
                 */
                 res = call_function(&sp, oparg, NULL);


From webhook-mailer at python.org  Thu Aug  3 04:37:20 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 03 Aug 2017 08:37:20 -0000
Subject: [Python-checkins] bpo-31071: Avoid masking original TypeError in
 call with * unpacking (#2957)
Message-ID: <mailman.27.1501749441.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/25e4f779d7ae9f37a1933cb5cbfad06e673c01f9
commit: 25e4f779d7ae9f37a1933cb5cbfad06e673c01f9
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-03T11:37:15+03:00
summary:

bpo-31071: Avoid masking original TypeError in call with * unpacking (#2957)

when other arguments are passed.

files:
A Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst
M Lib/test/test_extcall.py
M Python/ceval.c

diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py
index 043df013112..2c1848337b2 100644
--- a/Lib/test/test_extcall.py
+++ b/Lib/test/test_extcall.py
@@ -163,6 +163,10 @@
     Traceback (most recent call last):
       ...
     TypeError: myerror
+    >>> g(*range(1), *(broken() for i in range(1)))
+    Traceback (most recent call last):
+      ...
+    TypeError: myerror
 
     >>> class BrokenIterable1:
     ...     def __iter__(self):
@@ -172,6 +176,10 @@
     Traceback (most recent call last):
       ...
     TypeError: myerror
+    >>> g(*range(1), *BrokenIterable1())
+    Traceback (most recent call last):
+      ...
+    TypeError: myerror
 
     >>> class BrokenIterable2:
     ...     def __iter__(self):
@@ -182,6 +190,10 @@
     Traceback (most recent call last):
       ...
     TypeError: myerror
+    >>> g(*range(1), *BrokenIterable2())
+    Traceback (most recent call last):
+      ...
+    TypeError: myerror
 
     >>> class BrokenSequence:
     ...     def __getitem__(self, idx):
@@ -191,6 +203,10 @@
     Traceback (most recent call last):
       ...
     TypeError: myerror
+    >>> g(*range(1), *BrokenSequence())
+    Traceback (most recent call last):
+      ...
+    TypeError: myerror
 
 Make sure that the function doesn't stomp the dictionary
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst b/Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst
new file mode 100644
index 00000000000..c34d4751bfa
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst	
@@ -0,0 +1,2 @@
+Avoid masking original TypeError in call with * unpacking when other
+arguments are passed.
diff --git a/Python/ceval.c b/Python/ceval.c
index be5cda58cda..9f732f56ba8 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -66,6 +66,8 @@ static void format_exc_unbound(PyCodeObject *co, int oparg);
 static PyObject * unicode_concatenate(PyObject *, PyObject *,
                                       PyFrameObject *, const _Py_CODEUNIT *);
 static PyObject * special_lookup(PyObject *, _Py_Identifier *);
+static int check_args_iterable(PyObject *func, PyObject *vararg);
+static void format_kwargs_mapping_error(PyObject *func, PyObject *kwargs);
 
 #define NAME_ERROR_MSG \
     "name '%.200s' is not defined"
@@ -2512,14 +2514,9 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
                 none_val = _PyList_Extend((PyListObject *)sum, PEEK(i));
                 if (none_val == NULL) {
                     if (opcode == BUILD_TUPLE_UNPACK_WITH_CALL &&
-                        PyErr_ExceptionMatches(PyExc_TypeError)) {
-                        PyObject *func = PEEK(1 + oparg);
-                        PyErr_Format(PyExc_TypeError,
-                                "%.200s%.200s argument after * "
-                                "must be an iterable, not %.200s",
-                                PyEval_GetFuncName(func),
-                                PyEval_GetFuncDesc(func),
-                                PEEK(i)->ob_type->tp_name);
+                        PyErr_ExceptionMatches(PyExc_TypeError))
+                    {
+                        check_args_iterable(PEEK(1 + oparg), PEEK(i));
                     }
                     Py_DECREF(sum);
                     goto error;
@@ -2732,12 +2729,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
                 if (_PyDict_MergeEx(sum, arg, 2) < 0) {
                     PyObject *func = PEEK(2 + oparg);
                     if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
-                        PyErr_Format(PyExc_TypeError,
-                                "%.200s%.200s argument after ** "
-                                "must be a mapping, not %.200s",
-                                PyEval_GetFuncName(func),
-                                PyEval_GetFuncDesc(func),
-                                arg->ob_type->tp_name);
+                        format_kwargs_mapping_error(func, arg);
                     }
                     else if (PyErr_ExceptionMatches(PyExc_KeyError)) {
                         PyObject *exc, *val, *tb;
@@ -3390,13 +3382,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
                          * is not a mapping.
                          */
                         if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
-                            func = SECOND();
-                            PyErr_Format(PyExc_TypeError,
-                                         "%.200s%.200s argument after ** "
-                                         "must be a mapping, not %.200s",
-                                         PyEval_GetFuncName(func),
-                                         PyEval_GetFuncDesc(func),
-                                         kwargs->ob_type->tp_name);
+                            format_kwargs_mapping_error(SECOND(), kwargs);
                         }
                         Py_DECREF(kwargs);
                         goto error;
@@ -3409,14 +3395,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
             callargs = POP();
             func = TOP();
             if (!PyTuple_CheckExact(callargs)) {
-                if (Py_TYPE(callargs)->tp_iter == NULL &&
-                        !PySequence_Check(callargs)) {
-                    PyErr_Format(PyExc_TypeError,
-                                 "%.200s%.200s argument after * "
-                                 "must be an iterable, not %.200s",
-                                 PyEval_GetFuncName(func),
-                                 PyEval_GetFuncDesc(func),
-                                 callargs->ob_type->tp_name);
+                if (check_args_iterable(func, callargs) < 0) {
                     Py_DECREF(callargs);
                     goto error;
                 }
@@ -5179,6 +5158,32 @@ import_all_from(PyObject *locals, PyObject *v)
     return err;
 }
 
+static int
+check_args_iterable(PyObject *func, PyObject *args)
+{
+    if (args->ob_type->tp_iter == NULL && !PySequence_Check(args)) {
+        PyErr_Format(PyExc_TypeError,
+                     "%.200s%.200s argument after * "
+                     "must be an iterable, not %.200s",
+                     PyEval_GetFuncName(func),
+                     PyEval_GetFuncDesc(func),
+                     args->ob_type->tp_name);
+        return -1;
+    }
+    return 0;
+}
+
+static void
+format_kwargs_mapping_error(PyObject *func, PyObject *kwargs)
+{
+    PyErr_Format(PyExc_TypeError,
+                 "%.200s%.200s argument after ** "
+                 "must be a mapping, not %.200s",
+                 PyEval_GetFuncName(func),
+                 PyEval_GetFuncDesc(func),
+                 kwargs->ob_type->tp_name);
+}
+
 static void
 format_exc_check_arg(PyObject *exc, const char *format_str, PyObject *obj)
 {


From webhook-mailer at python.org  Thu Aug  3 04:45:29 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 03 Aug 2017 08:45:29 -0000
Subject: [Python-checkins] bpo-30978: str.format_map() now passes key lookup
 exceptions through. (#2790)
Message-ID: <mailman.28.1501749930.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/5075416b8fedc5526b643dabc915f7945fa0d969
commit: 5075416b8fedc5526b643dabc915f7945fa0d969
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-03T11:45:23+03:00
summary:

bpo-30978: str.format_map() now passes key lookup exceptions through. (#2790)

Previously any exception was replaced with a KeyError exception.

files:
A Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst
M Lib/test/test_re.py
M Lib/test/test_unicode.py
M Objects/stringlib/unicode_format.h

diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index 0ea5a204696..e9c07a04f57 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -468,7 +468,7 @@ def test_match_getitem(self):
             m[(0,)]
         with self.assertRaisesRegex(IndexError, 'no such group'):
             m[(0, 1)]
-        with self.assertRaisesRegex(KeyError, 'a2'):
+        with self.assertRaisesRegex(IndexError, 'no such group'):
             'a1={a2}'.format_map(m)
 
         m = pat.match('ac')
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 506f0715c2e..341007b6507 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1278,6 +1278,13 @@ def __format__(self, spec):
         self.assertRaises(ValueError, '{}'.format_map, 'a')
         self.assertRaises(ValueError, '{a} {}'.format_map, {"a" : 2, "b" : 1})
 
+        class BadMapping:
+            def __getitem__(self, key):
+                return 1/0
+        self.assertRaises(KeyError, '{a}'.format_map, {})
+        self.assertRaises(TypeError, '{a}'.format_map, [])
+        self.assertRaises(ZeroDivisionError, '{a}'.format_map, BadMapping())
+
     def test_format_huge_precision(self):
         format_string = ".{}f".format(sys.maxsize + 1)
         with self.assertRaises(ValueError):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst b/Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst
new file mode 100644
index 00000000000..bb67a9fb244
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst	
@@ -0,0 +1,2 @@
+str.format_map() now passes key lookup exceptions through.
+Previously any exception was replaced with a KeyError exception.
diff --git a/Objects/stringlib/unicode_format.h b/Objects/stringlib/unicode_format.h
index 7ac0d75166b..baaac811a56 100644
--- a/Objects/stringlib/unicode_format.h
+++ b/Objects/stringlib/unicode_format.h
@@ -410,18 +410,22 @@ get_field_object(SubString *input, PyObject *args, PyObject *kwargs,
     if (index == -1) {
         /* look up in kwargs */
         PyObject *key = SubString_new_object(&first);
-        if (key == NULL)
+        if (key == NULL) {
             goto error;
-
-        /* Use PyObject_GetItem instead of PyDict_GetItem because this
-           code is no longer just used with kwargs. It might be passed
-           a non-dict when called through format_map. */
-        if ((kwargs == NULL) || (obj = PyObject_GetItem(kwargs, key)) == NULL) {
+        }
+        if (kwargs == NULL) {
             PyErr_SetObject(PyExc_KeyError, key);
             Py_DECREF(key);
             goto error;
         }
+        /* Use PyObject_GetItem instead of PyDict_GetItem because this
+           code is no longer just used with kwargs. It might be passed
+           a non-dict when called through format_map. */
+        obj = PyObject_GetItem(kwargs, key);
         Py_DECREF(key);
+        if (obj == NULL) {
+            goto error;
+        }
     }
     else {
         /* If args is NULL, we have a format string with a positional field


From solipsis at pitrou.net  Thu Aug  3 05:10:35 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 03 Aug 2017 09:10:35 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=-1
Message-ID: <20170803091033.16390.AEA4F908ECB0A4A4@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [0, 0, -7] memory blocks, sum=-7
test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_forkserver leaked [1, 2, -1] memory blocks, sum=2


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogWyi5iP', '--timeout', '7200']

From webhook-mailer at python.org  Thu Aug  3 05:14:11 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 03 Aug 2017 09:14:11 -0000
Subject: [Python-checkins] [3.6] bpo-30978: str.format_map() now passes key
 lookup exceptions through. (GH-2790) (#2992)
Message-ID: <mailman.29.1501751652.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/f08b2be4416163e3d18b8d09891e7cda0d8a21d4
commit: f08b2be4416163e3d18b8d09891e7cda0d8a21d4
branch: 3.6
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-03T12:14:07+03:00
summary:

[3.6] bpo-30978: str.format_map() now passes key lookup exceptions through. (GH-2790) (#2992)

Previously any exception was replaced with a KeyError exception.
(cherry picked from commit 5075416)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst
M Lib/test/test_re.py
M Lib/test/test_unicode.py
M Objects/stringlib/unicode_format.h

diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index a6cbbd0b67a..e23e5a9a6ca 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -471,7 +471,7 @@ def test_match_getitem(self):
             m[(0,)]
         with self.assertRaisesRegex(IndexError, 'no such group'):
             m[(0, 1)]
-        with self.assertRaisesRegex(KeyError, 'a2'):
+        with self.assertRaisesRegex(IndexError, 'no such group'):
             'a1={a2}'.format_map(m)
 
         m = pat.match('ac')
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 2844bc5540c..56ab0ad7329 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1279,6 +1279,13 @@ def __format__(self, spec):
         self.assertRaises(ValueError, '{}'.format_map, 'a')
         self.assertRaises(ValueError, '{a} {}'.format_map, {"a" : 2, "b" : 1})
 
+        class BadMapping:
+            def __getitem__(self, key):
+                return 1/0
+        self.assertRaises(KeyError, '{a}'.format_map, {})
+        self.assertRaises(TypeError, '{a}'.format_map, [])
+        self.assertRaises(ZeroDivisionError, '{a}'.format_map, BadMapping())
+
     def test_format_huge_precision(self):
         format_string = ".{}f".format(sys.maxsize + 1)
         with self.assertRaises(ValueError):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst b/Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst
new file mode 100644
index 00000000000..bb67a9fb244
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst	
@@ -0,0 +1,2 @@
+str.format_map() now passes key lookup exceptions through.
+Previously any exception was replaced with a KeyError exception.
diff --git a/Objects/stringlib/unicode_format.h b/Objects/stringlib/unicode_format.h
index 14fa28ea54a..7314af02a4a 100644
--- a/Objects/stringlib/unicode_format.h
+++ b/Objects/stringlib/unicode_format.h
@@ -412,18 +412,22 @@ get_field_object(SubString *input, PyObject *args, PyObject *kwargs,
     if (index == -1) {
         /* look up in kwargs */
         PyObject *key = SubString_new_object(&first);
-        if (key == NULL)
+        if (key == NULL) {
             goto error;
-
-        /* Use PyObject_GetItem instead of PyDict_GetItem because this
-           code is no longer just used with kwargs. It might be passed
-           a non-dict when called through format_map. */
-        if ((kwargs == NULL) || (obj = PyObject_GetItem(kwargs, key)) == NULL) {
+        }
+        if (kwargs == NULL) {
             PyErr_SetObject(PyExc_KeyError, key);
             Py_DECREF(key);
             goto error;
         }
+        /* Use PyObject_GetItem instead of PyDict_GetItem because this
+           code is no longer just used with kwargs. It might be passed
+           a non-dict when called through format_map. */
+        obj = PyObject_GetItem(kwargs, key);
         Py_DECREF(key);
+        if (obj == NULL) {
+            goto error;
+        }
     }
     else {
         /* If args is NULL, we have a format string with a positional field


From webhook-mailer at python.org  Thu Aug  3 05:14:38 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 03 Aug 2017 09:14:38 -0000
Subject: [Python-checkins] [3.6] bpo-31071: Avoid masking original TypeError
 in call with * unpacking (GH-2957) (#2991)
Message-ID: <mailman.30.1501751679.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/946a0b69e217ff22a6c056047eab42053e9a2d5f
commit: 946a0b69e217ff22a6c056047eab42053e9a2d5f
branch: 3.6
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-03T12:14:35+03:00
summary:

[3.6] bpo-31071: Avoid masking original TypeError in call with * unpacking (GH-2957) (#2991)

when other arguments are passed.
(cherry picked from commit 25e4f77)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst
M Lib/test/test_extcall.py
M Python/ceval.c

diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py
index 043df013112..2c1848337b2 100644
--- a/Lib/test/test_extcall.py
+++ b/Lib/test/test_extcall.py
@@ -163,6 +163,10 @@
     Traceback (most recent call last):
       ...
     TypeError: myerror
+    >>> g(*range(1), *(broken() for i in range(1)))
+    Traceback (most recent call last):
+      ...
+    TypeError: myerror
 
     >>> class BrokenIterable1:
     ...     def __iter__(self):
@@ -172,6 +176,10 @@
     Traceback (most recent call last):
       ...
     TypeError: myerror
+    >>> g(*range(1), *BrokenIterable1())
+    Traceback (most recent call last):
+      ...
+    TypeError: myerror
 
     >>> class BrokenIterable2:
     ...     def __iter__(self):
@@ -182,6 +190,10 @@
     Traceback (most recent call last):
       ...
     TypeError: myerror
+    >>> g(*range(1), *BrokenIterable2())
+    Traceback (most recent call last):
+      ...
+    TypeError: myerror
 
     >>> class BrokenSequence:
     ...     def __getitem__(self, idx):
@@ -191,6 +203,10 @@
     Traceback (most recent call last):
       ...
     TypeError: myerror
+    >>> g(*range(1), *BrokenSequence())
+    Traceback (most recent call last):
+      ...
+    TypeError: myerror
 
 Make sure that the function doesn't stomp the dictionary
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst b/Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst
new file mode 100644
index 00000000000..c34d4751bfa
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst	
@@ -0,0 +1,2 @@
+Avoid masking original TypeError in call with * unpacking when other
+arguments are passed.
diff --git a/Python/ceval.c b/Python/ceval.c
index 770dfcba89e..8eb78bf4d46 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -64,6 +64,8 @@ static void format_exc_unbound(PyCodeObject *co, int oparg);
 static PyObject * unicode_concatenate(PyObject *, PyObject *,
                                       PyFrameObject *, const _Py_CODEUNIT *);
 static PyObject * special_lookup(PyObject *, _Py_Identifier *);
+static int check_args_iterable(PyObject *func, PyObject *vararg);
+static void format_kwargs_mapping_error(PyObject *func, PyObject *kwargs);
 
 #define NAME_ERROR_MSG \
     "name '%.200s' is not defined"
@@ -2578,14 +2580,9 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
                 none_val = _PyList_Extend((PyListObject *)sum, PEEK(i));
                 if (none_val == NULL) {
                     if (opcode == BUILD_TUPLE_UNPACK_WITH_CALL &&
-                        PyErr_ExceptionMatches(PyExc_TypeError)) {
-                        PyObject *func = PEEK(1 + oparg);
-                        PyErr_Format(PyExc_TypeError,
-                                "%.200s%.200s argument after * "
-                                "must be an iterable, not %.200s",
-                                PyEval_GetFuncName(func),
-                                PyEval_GetFuncDesc(func),
-                                PEEK(i)->ob_type->tp_name);
+                        PyErr_ExceptionMatches(PyExc_TypeError))
+                    {
+                        check_args_iterable(PEEK(1 + oparg), PEEK(i));
                     }
                     Py_DECREF(sum);
                     goto error;
@@ -2798,12 +2795,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
                 if (_PyDict_MergeEx(sum, arg, 2) < 0) {
                     PyObject *func = PEEK(2 + oparg);
                     if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
-                        PyErr_Format(PyExc_TypeError,
-                                "%.200s%.200s argument after ** "
-                                "must be a mapping, not %.200s",
-                                PyEval_GetFuncName(func),
-                                PyEval_GetFuncDesc(func),
-                                arg->ob_type->tp_name);
+                        format_kwargs_mapping_error(func, arg);
                     }
                     else if (PyErr_ExceptionMatches(PyExc_KeyError)) {
                         PyObject *exc, *val, *tb;
@@ -3370,13 +3362,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
                          * is not a mapping.
                          */
                         if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
-                            func = SECOND();
-                            PyErr_Format(PyExc_TypeError,
-                                         "%.200s%.200s argument after ** "
-                                         "must be a mapping, not %.200s",
-                                         PyEval_GetFuncName(func),
-                                         PyEval_GetFuncDesc(func),
-                                         kwargs->ob_type->tp_name);
+                            format_kwargs_mapping_error(SECOND(), kwargs);
                         }
                         Py_DECREF(kwargs);
                         goto error;
@@ -3389,14 +3375,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
             callargs = POP();
             func = TOP();
             if (!PyTuple_CheckExact(callargs)) {
-                if (Py_TYPE(callargs)->tp_iter == NULL &&
-                        !PySequence_Check(callargs)) {
-                    PyErr_Format(PyExc_TypeError,
-                                 "%.200s%.200s argument after * "
-                                 "must be an iterable, not %.200s",
-                                 PyEval_GetFuncName(func),
-                                 PyEval_GetFuncDesc(func),
-                                 callargs->ob_type->tp_name);
+                if (check_args_iterable(func, callargs) < 0) {
                     Py_DECREF(callargs);
                     goto error;
                 }
@@ -5351,6 +5330,32 @@ import_all_from(PyObject *locals, PyObject *v)
     return err;
 }
 
+static int
+check_args_iterable(PyObject *func, PyObject *args)
+{
+    if (args->ob_type->tp_iter == NULL && !PySequence_Check(args)) {
+        PyErr_Format(PyExc_TypeError,
+                     "%.200s%.200s argument after * "
+                     "must be an iterable, not %.200s",
+                     PyEval_GetFuncName(func),
+                     PyEval_GetFuncDesc(func),
+                     args->ob_type->tp_name);
+        return -1;
+    }
+    return 0;
+}
+
+static void
+format_kwargs_mapping_error(PyObject *func, PyObject *kwargs)
+{
+    PyErr_Format(PyExc_TypeError,
+                 "%.200s%.200s argument after ** "
+                 "must be a mapping, not %.200s",
+                 PyEval_GetFuncName(func),
+                 PyEval_GetFuncDesc(func),
+                 kwargs->ob_type->tp_name);
+}
+
 static void
 format_exc_check_arg(PyObject *exc, const char *format_str, PyObject *obj)
 {


From webhook-mailer at python.org  Thu Aug  3 10:20:46 2017
From: webhook-mailer at python.org (Mariatta)
Date: Thu, 03 Aug 2017 14:20:46 -0000
Subject: [Python-checkins] Improve grammar in asyncio documentation (GH-2993)
Message-ID: <mailman.31.1501770047.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/87c3c5de731af18a271f4559cd69ccb8d050208f
commit: 87c3c5de731af18a271f4559cd69ccb8d050208f
branch: master
author: Mike DePalatis <mike at depalatis.net>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-08-04T00:20:42+10:00
summary:

Improve grammar in asyncio documentation (GH-2993)

"not only is it .." is the correct form, as opposed to:
"not only it is ..."

files:
M Doc/library/asyncio-dev.rst

diff --git a/Doc/library/asyncio-dev.rst b/Doc/library/asyncio-dev.rst
index cc4a14b2016..1838eb95a7d 100644
--- a/Doc/library/asyncio-dev.rst
+++ b/Doc/library/asyncio-dev.rst
@@ -52,7 +52,7 @@ Cancellation
 ------------
 
 Cancellation of tasks is not common in classic programming. In asynchronous
-programming, not only it is something common, but you have to prepare your
+programming, not only is it something common, but you have to prepare your
 code to handle it.
 
 Futures and tasks can be cancelled explicitly with their :meth:`Future.cancel`


From webhook-mailer at python.org  Thu Aug  3 10:33:37 2017
From: webhook-mailer at python.org (Mariatta)
Date: Thu, 03 Aug 2017 14:33:37 -0000
Subject: [Python-checkins] [3.6] Improve grammar in asyncio documentation
 (GH-2993) (GH-2994)
Message-ID: <mailman.32.1501770818.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/9b3abacf87653fab707e83b31afd73ac4140228e
commit: 9b3abacf87653fab707e83b31afd73ac4140228e
branch: 3.6
author: Mariatta <Mariatta at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-08-04T00:33:33+10:00
summary:

[3.6] Improve grammar in asyncio documentation (GH-2993) (GH-2994)

"not only is it .." is the correct form, as opposed to:
"not only it is ..."
(cherry picked from commit 87c3c5de731af18a271f4559cd69ccb8d050208f)

files:
M Doc/library/asyncio-dev.rst

diff --git a/Doc/library/asyncio-dev.rst b/Doc/library/asyncio-dev.rst
index cc4a14b2016..1838eb95a7d 100644
--- a/Doc/library/asyncio-dev.rst
+++ b/Doc/library/asyncio-dev.rst
@@ -52,7 +52,7 @@ Cancellation
 ------------
 
 Cancellation of tasks is not common in classic programming. In asynchronous
-programming, not only it is something common, but you have to prepare your
+programming, not only is it something common, but you have to prepare your
 code to handle it.
 
 Futures and tasks can be cancelled explicitly with their :meth:`Future.cancel`


From webhook-mailer at python.org  Thu Aug  3 10:45:18 2017
From: webhook-mailer at python.org (INADA Naoki)
Date: Thu, 03 Aug 2017 14:45:18 -0000
Subject: [Python-checkins] bpo-29304: Simplify dict lookup functions
 (GH-2407)
Message-ID: <mailman.33.1501771520.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/778928b0c7aa438c282727535814d73df850693a
commit: 778928b0c7aa438c282727535814d73df850693a
branch: master
author: INADA Naoki <methane at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-08-03T23:45:15+09:00
summary:

bpo-29304: Simplify dict lookup functions (GH-2407)

* remove hashpos parameter from lookdict functions.
* remove many duplicated code from lookdict functions.

files:
M Objects/dict-common.h
M Objects/dictobject.c
M Objects/odictobject.c

diff --git a/Objects/dict-common.h b/Objects/dict-common.h
index 62185527347..3e524686b44 100644
--- a/Objects/dict-common.h
+++ b/Objects/dict-common.h
@@ -12,8 +12,7 @@ typedef struct {
  * -1 when no entry found, -3 when compare raises error.
  */
 typedef Py_ssize_t (*dict_lookup_func)
-(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **value_addr,
- Py_ssize_t *hashpos);
+    (PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **value_addr);
 
 #define DKIX_EMPTY (-1)
 #define DKIX_DUMMY (-2)  /* Used internally */
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index c44ff47f8b3..e395f4dabb3 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -223,18 +223,14 @@ equally good collision statistics, needed less code & used less memory.
 
 /* forward declarations */
 static Py_ssize_t lookdict(PyDictObject *mp, PyObject *key,
-                           Py_hash_t hash, PyObject **value_addr,
-                           Py_ssize_t *hashpos);
+                           Py_hash_t hash, PyObject **value_addr);
 static Py_ssize_t lookdict_unicode(PyDictObject *mp, PyObject *key,
-                                   Py_hash_t hash, PyObject **value_addr,
-                                   Py_ssize_t *hashpos);
+                                   Py_hash_t hash, PyObject **value_addr);
 static Py_ssize_t
 lookdict_unicode_nodummy(PyDictObject *mp, PyObject *key,
-                         Py_hash_t hash, PyObject **value_addr,
-                         Py_ssize_t *hashpos);
+                         Py_hash_t hash, PyObject **value_addr);
 static Py_ssize_t lookdict_split(PyDictObject *mp, PyObject *key,
-                                 Py_hash_t hash, PyObject **value_addr,
-                                 Py_ssize_t *hashpos);
+                                 Py_hash_t hash, PyObject **value_addr);
 
 static int dictresize(PyDictObject *mp, Py_ssize_t minused);
 
@@ -672,118 +668,59 @@ never raise an exception; that function can never return DKIX_ERROR when key
 is string.  Otherwise, it falls back to lookdict().
 lookdict_unicode_nodummy is further specialized for string keys that cannot be
 the <dummy> value.
-For both, when the key isn't found a DKIX_EMPTY is returned. hashpos returns
-where the key index should be inserted.
+For both, when the key isn't found a DKIX_EMPTY is returned.
 */
 static Py_ssize_t _Py_HOT_FUNCTION
 lookdict(PyDictObject *mp, PyObject *key,
-         Py_hash_t hash, PyObject **value_addr, Py_ssize_t *hashpos)
+         Py_hash_t hash, PyObject **value_addr)
 {
-    size_t i, mask;
-    Py_ssize_t ix, freeslot;
-    int cmp;
+    size_t i, mask, perturb;
     PyDictKeysObject *dk;
-    PyDictKeyEntry *ep0, *ep;
-    PyObject *startkey;
+    PyDictKeyEntry *ep0;
 
 top:
     dk = mp->ma_keys;
-    mask = DK_MASK(dk);
     ep0 = DK_ENTRIES(dk);
+    mask = DK_MASK(dk);
+    perturb = hash;
     i = (size_t)hash & mask;
 
-    ix = dk_get_index(dk, i);
-    if (ix == DKIX_EMPTY) {
-        if (hashpos != NULL)
-            *hashpos = i;
-        *value_addr = NULL;
-        return DKIX_EMPTY;
-    }
-    if (ix == DKIX_DUMMY) {
-        freeslot = i;
-    }
-    else {
-        ep = &ep0[ix];
-        assert(ep->me_key != NULL);
-        if (ep->me_key == key) {
-            *value_addr = ep->me_value;
-            if (hashpos != NULL)
-                *hashpos = i;
-            return ix;
-        }
-        if (ep->me_hash == hash) {
-            startkey = ep->me_key;
-            Py_INCREF(startkey);
-            cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
-            Py_DECREF(startkey);
-            if (cmp < 0) {
-                *value_addr = NULL;
-                return DKIX_ERROR;
-            }
-            if (dk == mp->ma_keys && ep->me_key == startkey) {
-                if (cmp > 0) {
-                    *value_addr = ep->me_value;
-                    if (hashpos != NULL)
-                        *hashpos = i;
-                    return ix;
-                }
-            }
-            else {
-                /* The dict was mutated, restart */
-                goto top;
-            }
-        }
-        freeslot = -1;
-    }
-
-    for (size_t perturb = hash;;) {
-        perturb >>= PERTURB_SHIFT;
-        i = (i*5 + perturb + 1) & mask;
-        ix = dk_get_index(dk, i);
+    for (;;) {
+        Py_ssize_t ix = dk_get_index(dk, i);
         if (ix == DKIX_EMPTY) {
-            if (hashpos != NULL) {
-                *hashpos = (freeslot == -1) ? (Py_ssize_t)i : freeslot;
-            }
             *value_addr = NULL;
             return ix;
         }
-        if (ix == DKIX_DUMMY) {
-            if (freeslot == -1)
-                freeslot = i;
-            continue;
-        }
-        ep = &ep0[ix];
-        assert(ep->me_key != NULL);
-        if (ep->me_key == key) {
-            if (hashpos != NULL) {
-                *hashpos = i;
-            }
-            *value_addr = ep->me_value;
-            return ix;
-        }
-        if (ep->me_hash == hash) {
-            startkey = ep->me_key;
-            Py_INCREF(startkey);
-            cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
-            Py_DECREF(startkey);
-            if (cmp < 0) {
-                *value_addr = NULL;
-                return DKIX_ERROR;
+        if (ix >= 0) {
+            PyDictKeyEntry *ep = &ep0[ix];
+            assert(ep->me_key != NULL);
+            if (ep->me_key == key) {
+                *value_addr = ep->me_value;
+                return ix;
             }
-            if (dk == mp->ma_keys && ep->me_key == startkey) {
-                if (cmp > 0) {
-                    if (hashpos != NULL) {
-                        *hashpos = i;
+            if (ep->me_hash == hash) {
+                PyObject *startkey = ep->me_key;
+                Py_INCREF(startkey);
+                int cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
+                Py_DECREF(startkey);
+                if (cmp < 0) {
+                    *value_addr = NULL;
+                    return DKIX_ERROR;
+                }
+                if (dk == mp->ma_keys && ep->me_key == startkey) {
+                    if (cmp > 0) {
+                        *value_addr = ep->me_value;
+                        return ix;
                     }
-                    *value_addr = ep->me_value;
-                    return ix;
                 }
-            }
-            else {
-                /* The dict was mutated, restart */
-                goto top;
+                else {
+                    /* The dict was mutated, restart */
+                    goto top;
+                }
             }
         }
+        perturb >>= PERTURB_SHIFT;
+        i = (i*5 + perturb + 1) & mask;
     }
     assert(0);          /* NOT REACHED */
     return 0;
@@ -792,13 +729,8 @@ lookdict(PyDictObject *mp, PyObject *key,
 /* Specialized version for string-only keys */
 static Py_ssize_t _Py_HOT_FUNCTION
 lookdict_unicode(PyDictObject *mp, PyObject *key,
-                 Py_hash_t hash, PyObject **value_addr, Py_ssize_t *hashpos)
+                 Py_hash_t hash, PyObject **value_addr)
 {
-    size_t i;
-    size_t mask = DK_MASK(mp->ma_keys);
-    Py_ssize_t ix, freeslot;
-    PyDictKeyEntry *ep, *ep0 = DK_ENTRIES(mp->ma_keys);
-
     assert(mp->ma_values == NULL);
     /* Make sure this function doesn't have to handle non-unicode keys,
        including subclasses of str; e.g., one reason to subclass
@@ -806,59 +738,34 @@ lookdict_unicode(PyDictObject *mp, PyObject *key,
        that here. */
     if (!PyUnicode_CheckExact(key)) {
         mp->ma_keys->dk_lookup = lookdict;
-        return lookdict(mp, key, hash, value_addr, hashpos);
-    }
-    i = (size_t)hash & mask;
-    ix = dk_get_index(mp->ma_keys, i);
-    if (ix == DKIX_EMPTY) {
-        if (hashpos != NULL)
-            *hashpos = i;
-        *value_addr = NULL;
-        return DKIX_EMPTY;
-    }
-    if (ix == DKIX_DUMMY) {
-        freeslot = i;
-    }
-    else {
-        ep = &ep0[ix];
-        assert(ep->me_key != NULL);
-        if (ep->me_key == key
-            || (ep->me_hash == hash && unicode_eq(ep->me_key, key))) {
-            if (hashpos != NULL)
-                *hashpos = i;
-            *value_addr = ep->me_value;
-            return ix;
-        }
-        freeslot = -1;
+        return lookdict(mp, key, hash, value_addr);
     }
 
-    for (size_t perturb = hash;;) {
-        perturb >>= PERTURB_SHIFT;
-        i = mask & (i*5 + perturb + 1);
-        ix = dk_get_index(mp->ma_keys, i);
+    PyDictKeyEntry *ep0 = DK_ENTRIES(mp->ma_keys);
+    size_t mask = DK_MASK(mp->ma_keys);
+    size_t perturb = (size_t)hash;
+    size_t i = (size_t)hash & mask;
+
+    for (;;) {
+        Py_ssize_t ix = dk_get_index(mp->ma_keys, i);
         if (ix == DKIX_EMPTY) {
-            if (hashpos != NULL) {
-                *hashpos = (freeslot == -1) ? (Py_ssize_t)i : freeslot;
-            }
             *value_addr = NULL;
             return DKIX_EMPTY;
         }
-        if (ix == DKIX_DUMMY) {
-            if (freeslot == -1)
-                freeslot = i;
-            continue;
-        }
-        ep = &ep0[ix];
-        assert(ep->me_key != NULL);
-        if (ep->me_key == key
-            || (ep->me_hash == hash && unicode_eq(ep->me_key, key))) {
-            *value_addr = ep->me_value;
-            if (hashpos != NULL) {
-                *hashpos = i;
+        if (ix >= 0) {
+            PyDictKeyEntry *ep = &ep0[ix];
+            assert(ep->me_key != NULL);
+            assert(PyUnicode_CheckExact(ep->me_key));
+            if (ep->me_key == key ||
+                    (ep->me_hash == hash && unicode_eq(ep->me_key, key))) {
+                *value_addr = ep->me_value;
+                return ix;
             }
-            return ix;
         }
+        perturb >>= PERTURB_SHIFT;
+        i = mask & (i*5 + perturb + 1);
     }
+
     assert(0);          /* NOT REACHED */
     return 0;
 }
@@ -867,14 +774,8 @@ lookdict_unicode(PyDictObject *mp, PyObject *key,
  * will be present. */
 static Py_ssize_t _Py_HOT_FUNCTION
 lookdict_unicode_nodummy(PyDictObject *mp, PyObject *key,
-                         Py_hash_t hash, PyObject **value_addr,
-                         Py_ssize_t *hashpos)
+                         Py_hash_t hash, PyObject **value_addr)
 {
-    size_t i;
-    size_t mask = DK_MASK(mp->ma_keys);
-    Py_ssize_t ix;
-    PyDictKeyEntry *ep, *ep0 = DK_ENTRIES(mp->ma_keys);
-
     assert(mp->ma_values == NULL);
     /* Make sure this function doesn't have to handle non-unicode keys,
        including subclasses of str; e.g., one reason to subclass
@@ -882,47 +783,31 @@ lookdict_unicode_nodummy(PyDictObject *mp, PyObject *key,
        that here. */
     if (!PyUnicode_CheckExact(key)) {
         mp->ma_keys->dk_lookup = lookdict;
-        return lookdict(mp, key, hash, value_addr, hashpos);
+        return lookdict(mp, key, hash, value_addr);
     }
-    i = (size_t)hash & mask;
-    ix = dk_get_index(mp->ma_keys, i);
-    assert (ix != DKIX_DUMMY);
-    if (ix == DKIX_EMPTY) {
-        if (hashpos != NULL)
-            *hashpos = i;
-        *value_addr = NULL;
-        return DKIX_EMPTY;
-    }
-    ep = &ep0[ix];
-    assert(ep->me_key != NULL);
-    assert(PyUnicode_CheckExact(ep->me_key));
-    if (ep->me_key == key ||
-        (ep->me_hash == hash && unicode_eq(ep->me_key, key))) {
-        if (hashpos != NULL)
-            *hashpos = i;
-        *value_addr = ep->me_value;
-        return ix;
-    }
-    for (size_t perturb = hash;;) {
-        perturb >>= PERTURB_SHIFT;
-        i = mask & (i*5 + perturb + 1);
-        ix = dk_get_index(mp->ma_keys, i);
+
+    PyDictKeyEntry *ep0 = DK_ENTRIES(mp->ma_keys);
+    size_t mask = DK_MASK(mp->ma_keys);
+    size_t perturb = (size_t)hash;
+    size_t i = (size_t)hash & mask;
+
+    for (;;) {
+        Py_ssize_t ix = dk_get_index(mp->ma_keys, i);
         assert (ix != DKIX_DUMMY);
         if (ix == DKIX_EMPTY) {
-            if (hashpos != NULL)
-                *hashpos = i;
             *value_addr = NULL;
             return DKIX_EMPTY;
         }
-        ep = &ep0[ix];
-        assert(ep->me_key != NULL && PyUnicode_CheckExact(ep->me_key));
+        PyDictKeyEntry *ep = &ep0[ix];
+        assert(ep->me_key != NULL);
+        assert(PyUnicode_CheckExact(ep->me_key));
         if (ep->me_key == key ||
             (ep->me_hash == hash && unicode_eq(ep->me_key, key))) {
-            if (hashpos != NULL)
-                *hashpos = i;
             *value_addr = ep->me_value;
             return ix;
         }
+        perturb >>= PERTURB_SHIFT;
+        i = mask & (i*5 + perturb + 1);
     }
     assert(0);          /* NOT REACHED */
     return 0;
@@ -935,61 +820,40 @@ lookdict_unicode_nodummy(PyDictObject *mp, PyObject *key,
  */
 static Py_ssize_t _Py_HOT_FUNCTION
 lookdict_split(PyDictObject *mp, PyObject *key,
-               Py_hash_t hash, PyObject **value_addr, Py_ssize_t *hashpos)
+               Py_hash_t hash, PyObject **value_addr)
 {
-    size_t i;
-    size_t mask = DK_MASK(mp->ma_keys);
-    Py_ssize_t ix;
-    PyDictKeyEntry *ep, *ep0 = DK_ENTRIES(mp->ma_keys);
-
     /* mp must split table */
     assert(mp->ma_values != NULL);
     if (!PyUnicode_CheckExact(key)) {
-        ix = lookdict(mp, key, hash, value_addr, hashpos);
+        Py_ssize_t ix = lookdict(mp, key, hash, value_addr);
         if (ix >= 0) {
             *value_addr = mp->ma_values[ix];
         }
         return ix;
     }
 
-    i = (size_t)hash & mask;
-    ix = dk_get_index(mp->ma_keys, i);
-    if (ix == DKIX_EMPTY) {
-        if (hashpos != NULL)
-            *hashpos = i;
-        *value_addr = NULL;
-        return DKIX_EMPTY;
-    }
-    assert(ix >= 0);
-    ep = &ep0[ix];
-    assert(ep->me_key != NULL && PyUnicode_CheckExact(ep->me_key));
-    if (ep->me_key == key ||
-        (ep->me_hash == hash && unicode_eq(ep->me_key, key))) {
-        if (hashpos != NULL)
-            *hashpos = i;
-        *value_addr = mp->ma_values[ix];
-        return ix;
-    }
-    for (size_t perturb = hash;;) {
-        perturb >>= PERTURB_SHIFT;
-        i = mask & (i*5 + perturb + 1);
-        ix = dk_get_index(mp->ma_keys, i);
+    PyDictKeyEntry *ep0 = DK_ENTRIES(mp->ma_keys);
+    size_t mask = DK_MASK(mp->ma_keys);
+    size_t perturb = (size_t)hash;
+    size_t i = (size_t)hash & mask;
+
+    for (;;) {
+        Py_ssize_t ix = dk_get_index(mp->ma_keys, i);
+        assert (ix != DKIX_DUMMY);
         if (ix == DKIX_EMPTY) {
-            if (hashpos != NULL)
-                *hashpos = i;
             *value_addr = NULL;
             return DKIX_EMPTY;
         }
-        assert(ix >= 0);
-        ep = &ep0[ix];
-        assert(ep->me_key != NULL && PyUnicode_CheckExact(ep->me_key));
+        PyDictKeyEntry *ep = &ep0[ix];
+        assert(ep->me_key != NULL);
+        assert(PyUnicode_CheckExact(ep->me_key));
         if (ep->me_key == key ||
             (ep->me_hash == hash && unicode_eq(ep->me_key, key))) {
-            if (hashpos != NULL)
-                *hashpos = i;
             *value_addr = mp->ma_values[ix];
             return ix;
         }
+        perturb >>= PERTURB_SHIFT;
+        i = mask & (i*5 + perturb + 1);
     }
     assert(0);          /* NOT REACHED */
     return 0;
@@ -1061,23 +925,19 @@ _PyDict_MaybeUntrack(PyObject *op)
 
    The dict must be combined. */
 static Py_ssize_t
-find_empty_slot(PyDictKeysObject *keys, PyObject *key, Py_hash_t hash)
+find_empty_slot(PyDictKeysObject *keys, Py_hash_t hash)
 {
-    size_t i;
-    size_t mask = DK_MASK(keys);
-    Py_ssize_t ix;
-
-    assert(key != NULL);
+    assert(keys != NULL);
 
-    i = hash & mask;
-    ix = dk_get_index(keys, i);
-    for (size_t perturb = hash; ix != DKIX_EMPTY;) {
+    const size_t mask = DK_MASK(keys);
+    size_t i = hash & mask;
+    Py_ssize_t ix = dk_get_index(keys, i);
+    for (size_t perturb = hash; ix >= 0;) {
         perturb >>= PERTURB_SHIFT;
-        i = i*5 + perturb + 1;
-        ix = dk_get_index(keys, i & mask);
+        i = (i*5 + perturb + 1) & mask;
+        ix = dk_get_index(keys, i);
     }
-    assert(DK_ENTRIES(keys)[keys->dk_nentries].me_value == NULL);
-    return i & mask;
+    return i;
 }
 
 static int
@@ -1096,7 +956,6 @@ insertdict(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject *value)
 {
     PyObject *old_value;
     PyDictKeyEntry *ep;
-    Py_ssize_t hashpos, ix;
 
     Py_INCREF(key);
     Py_INCREF(value);
@@ -1105,7 +964,7 @@ insertdict(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject *value)
             goto Fail;
     }
 
-    ix = mp->ma_keys->dk_lookup(mp, key, hash, &old_value, &hashpos);
+    Py_ssize_t ix = mp->ma_keys->dk_lookup(mp, key, hash, &old_value);
     if (ix == DKIX_ERROR)
         goto Fail;
 
@@ -1120,7 +979,6 @@ insertdict(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject *value)
          (ix == DKIX_EMPTY && mp->ma_used != mp->ma_keys->dk_nentries))) {
         if (insertion_resize(mp) < 0)
             goto Fail;
-        hashpos = find_empty_slot(mp->ma_keys, key, hash);
         ix = DKIX_EMPTY;
     }
 
@@ -1131,8 +989,8 @@ insertdict(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject *value)
             /* Need to resize. */
             if (insertion_resize(mp) < 0)
                 goto Fail;
-            hashpos = find_empty_slot(mp->ma_keys, key, hash);
         }
+        Py_ssize_t hashpos = find_empty_slot(mp->ma_keys, hash);
         ep = &DK_ENTRIES(mp->ma_keys)[mp->ma_keys->dk_nentries];
         dk_set_index(mp->ma_keys, hashpos, mp->ma_keys->dk_nentries);
         ep->me_key = key;
@@ -1411,14 +1269,14 @@ PyDict_GetItem(PyObject *op, PyObject *key)
         /* preserve the existing exception */
         PyObject *err_type, *err_value, *err_tb;
         PyErr_Fetch(&err_type, &err_value, &err_tb);
-        ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value, NULL);
+        ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value);
         /* ignore errors */
         PyErr_Restore(err_type, err_value, err_tb);
         if (ix < 0)
             return NULL;
     }
     else {
-        ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value, NULL);
+        ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value);
         if (ix < 0) {
             PyErr_Clear();
             return NULL;
@@ -1443,7 +1301,7 @@ _PyDict_GetItem_KnownHash(PyObject *op, PyObject *key, Py_hash_t hash)
         return NULL;
     }
 
-    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value, NULL);
+    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value);
     if (ix < 0) {
         return NULL;
     }
@@ -1475,7 +1333,7 @@ PyDict_GetItemWithError(PyObject *op, PyObject *key)
         }
     }
 
-    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value, NULL);
+    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value);
     if (ix < 0)
         return NULL;
     return value;
@@ -1514,14 +1372,14 @@ _PyDict_LoadGlobal(PyDictObject *globals, PyDictObject *builtins, PyObject *key)
     }
 
     /* namespace 1: globals */
-    ix = globals->ma_keys->dk_lookup(globals, key, hash, &value, NULL);
+    ix = globals->ma_keys->dk_lookup(globals, key, hash, &value);
     if (ix == DKIX_ERROR)
         return NULL;
     if (ix != DKIX_EMPTY && value != NULL)
         return value;
 
     /* namespace 2: builtins */
-    ix = builtins->ma_keys->dk_lookup(builtins, key, hash, &value, NULL);
+    ix = builtins->ma_keys->dk_lookup(builtins, key, hash, &value);
     if (ix < 0)
         return NULL;
     return value;
@@ -1577,12 +1435,15 @@ _PyDict_SetItem_KnownHash(PyObject *op, PyObject *key, PyObject *value,
 }
 
 static int
-delitem_common(PyDictObject *mp, Py_ssize_t hashpos, Py_ssize_t ix,
+delitem_common(PyDictObject *mp, Py_hash_t hash, Py_ssize_t ix,
                PyObject *old_value)
 {
     PyObject *old_key;
     PyDictKeyEntry *ep;
 
+    Py_ssize_t hashpos = lookdict_index(mp->ma_keys, hash, ix);
+    assert(hashpos >= 0);
+
     mp->ma_used--;
     mp->ma_version_tag = DICT_NEXT_VERSION();
     ep = &DK_ENTRIES(mp->ma_keys)[ix];
@@ -1616,7 +1477,7 @@ PyDict_DelItem(PyObject *op, PyObject *key)
 int
 _PyDict_DelItem_KnownHash(PyObject *op, PyObject *key, Py_hash_t hash)
 {
-    Py_ssize_t hashpos, ix;
+    Py_ssize_t ix;
     PyDictObject *mp;
     PyObject *old_value;
 
@@ -1627,25 +1488,24 @@ _PyDict_DelItem_KnownHash(PyObject *op, PyObject *key, Py_hash_t hash)
     assert(key);
     assert(hash != -1);
     mp = (PyDictObject *)op;
-    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value, &hashpos);
+    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value);
     if (ix == DKIX_ERROR)
         return -1;
     if (ix == DKIX_EMPTY || old_value == NULL) {
         _PyErr_SetKeyError(key);
         return -1;
     }
-    assert(dk_get_index(mp->ma_keys, hashpos) == ix);
 
     // Split table doesn't allow deletion.  Combine it.
     if (_PyDict_HasSplitTable(mp)) {
         if (dictresize(mp, DK_SIZE(mp->ma_keys))) {
             return -1;
         }
-        ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value, &hashpos);
+        ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value);
         assert(ix >= 0);
     }
 
-    return delitem_common(mp, hashpos, ix, old_value);
+    return delitem_common(mp, hash, ix, old_value);
 }
 
 /* This function promises that the predicate -> deletion sequence is atomic
@@ -1671,27 +1531,30 @@ _PyDict_DelItemIf(PyObject *op, PyObject *key,
     if (hash == -1)
         return -1;
     mp = (PyDictObject *)op;
-    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value, &hashpos);
+    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value);
     if (ix == DKIX_ERROR)
         return -1;
     if (ix == DKIX_EMPTY || old_value == NULL) {
         _PyErr_SetKeyError(key);
         return -1;
     }
-    assert(dk_get_index(mp->ma_keys, hashpos) == ix);
 
     // Split table doesn't allow deletion.  Combine it.
     if (_PyDict_HasSplitTable(mp)) {
         if (dictresize(mp, DK_SIZE(mp->ma_keys))) {
             return -1;
         }
-        ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value, &hashpos);
+        ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value);
         assert(ix >= 0);
     }
 
     res = predicate(old_value);
     if (res == -1)
         return -1;
+
+    hashpos = lookdict_index(mp->ma_keys, hash, ix);
+    assert(hashpos >= 0);
+
     if (res > 0)
         return delitem_common(mp, hashpos, ix, old_value);
     else
@@ -1828,7 +1691,7 @@ _PyDict_Pop_KnownHash(PyObject *dict, PyObject *key, Py_hash_t hash, PyObject *d
         _PyErr_SetKeyError(key);
         return NULL;
     }
-    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value, &hashpos);
+    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value);
     if (ix == DKIX_ERROR)
         return NULL;
     if (ix == DKIX_EMPTY || old_value == NULL) {
@@ -1845,10 +1708,12 @@ _PyDict_Pop_KnownHash(PyObject *dict, PyObject *key, Py_hash_t hash, PyObject *d
         if (dictresize(mp, DK_SIZE(mp->ma_keys))) {
             return NULL;
         }
-        ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value, &hashpos);
+        ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value);
         assert(ix >= 0);
     }
 
+    hashpos = lookdict_index(mp->ma_keys, hash, ix);
+    assert(hashpos >= 0);
     assert(old_value != NULL);
     mp->ma_used--;
     mp->ma_version_tag = DICT_NEXT_VERSION();
@@ -2107,7 +1972,7 @@ dict_subscript(PyDictObject *mp, PyObject *key)
         if (hash == -1)
             return NULL;
     }
-    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value, NULL);
+    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value);
     if (ix == DKIX_ERROR)
         return NULL;
     if (ix == DKIX_EMPTY || value == NULL) {
@@ -2718,7 +2583,7 @@ dict_equal(PyDictObject *a, PyDictObject *b)
             /* ditto for key */
             Py_INCREF(key);
             /* reuse the known hash value */
-            b->ma_keys->dk_lookup(b, key, ep->me_hash, &bval, NULL);
+            b->ma_keys->dk_lookup(b, key, ep->me_hash, &bval);
             if (bval == NULL) {
                 Py_DECREF(key);
                 Py_DECREF(aval);
@@ -2783,7 +2648,7 @@ dict___contains__(PyDictObject *self, PyObject *key)
         if (hash == -1)
             return NULL;
     }
-    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value, NULL);
+    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value);
     if (ix == DKIX_ERROR)
         return NULL;
     if (ix == DKIX_EMPTY || value == NULL)
@@ -2815,7 +2680,7 @@ dict_get_impl(PyDictObject *self, PyObject *key, PyObject *default_value)
         if (hash == -1)
             return NULL;
     }
-    ix = (self->ma_keys->dk_lookup) (self, key, hash, &val, NULL);
+    ix = (self->ma_keys->dk_lookup) (self, key, hash, &val);
     if (ix == DKIX_ERROR)
         return NULL;
     if (ix == DKIX_EMPTY || val == NULL) {
@@ -2831,7 +2696,6 @@ PyDict_SetDefault(PyObject *d, PyObject *key, PyObject *defaultobj)
     PyDictObject *mp = (PyDictObject *)d;
     PyObject *value;
     Py_hash_t hash;
-    Py_ssize_t hashpos, ix;
 
     if (!PyDict_Check(d)) {
         PyErr_BadInternalCall();
@@ -2850,7 +2714,7 @@ PyDict_SetDefault(PyObject *d, PyObject *key, PyObject *defaultobj)
             return NULL;
     }
 
-    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value, &hashpos);
+    Py_ssize_t ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value);
     if (ix == DKIX_ERROR)
         return NULL;
 
@@ -2860,7 +2724,6 @@ PyDict_SetDefault(PyObject *d, PyObject *key, PyObject *defaultobj)
         if (insertion_resize(mp) < 0) {
             return NULL;
         }
-        hashpos = find_empty_slot(mp->ma_keys, key, hash);
         ix = DKIX_EMPTY;
     }
 
@@ -2871,8 +2734,8 @@ PyDict_SetDefault(PyObject *d, PyObject *key, PyObject *defaultobj)
             if (insertion_resize(mp) < 0) {
                 return NULL;
             }
-            hashpos = find_empty_slot(mp->ma_keys, key, hash);
         }
+        Py_ssize_t hashpos = find_empty_slot(mp->ma_keys, hash);
         ep0 = DK_ENTRIES(mp->ma_keys);
         ep = &ep0[mp->ma_keys->dk_nentries];
         dk_set_index(mp->ma_keys, hashpos, mp->ma_keys->dk_nentries);
@@ -3167,7 +3030,7 @@ PyDict_Contains(PyObject *op, PyObject *key)
         if (hash == -1)
             return -1;
     }
-    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value, NULL);
+    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value);
     if (ix == DKIX_ERROR)
         return -1;
     return (ix != DKIX_EMPTY && value != NULL);
@@ -3181,7 +3044,7 @@ _PyDict_Contains(PyObject *op, PyObject *key, Py_hash_t hash)
     PyObject *value;
     Py_ssize_t ix;
 
-    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value, NULL);
+    ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value);
     if (ix == DKIX_ERROR)
         return -1;
     return (ix != DKIX_EMPTY && value != NULL);
diff --git a/Objects/odictobject.c b/Objects/odictobject.c
index 771dcc308c5..c3d1a09584e 100644
--- a/Objects/odictobject.c
+++ b/Objects/odictobject.c
@@ -546,7 +546,7 @@ _odict_get_index_raw(PyODictObject *od, PyObject *key, Py_hash_t hash)
     PyDictKeysObject *keys = ((PyDictObject *)od)->ma_keys;
     Py_ssize_t ix;
 
-    ix = (keys->dk_lookup)((PyDictObject *)od, key, hash, &value, NULL);
+    ix = (keys->dk_lookup)((PyDictObject *)od, key, hash, &value);
     if (ix == DKIX_EMPTY) {
         return keys->dk_nentries;  /* index of new entry */
     }


From lp_benchmark_robot at intel.com  Thu Aug  3 21:08:27 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Thu, 3 Aug 2017 18:08:27 -0700
Subject: [Python-checkins] [1 up,
 64 flat] Results for Python (master branch) 2017-08-03
Message-ID: <8c402fe2-c817-40b2-95a7-0f459d7a728f@orsmsx110.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-03 03:03:29-07:00.
  - commit:		5075416
  - previous commit:	de34cbe
  - revision date:	2017-08-03 11:45:23+03:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.254% |  -0.435%   |  +4.240%   |  +7.513%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.815% |  -0.104%   |  +22.253%  |  +10.079%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 1.354% |  +1.000%   |  +23.774%  |  +9.112%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 1.234% |  +0.076%   |  +21.601%  |  +6.895%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 3.441% |  -1.697%   |  +5.679%   |  +11.707%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.363% |  -0.031%   |  +11.630%  |  +10.952%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 1.003% |  +0.059%   |  +7.651%   |  +9.770%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.575% |  +0.052%   |  +4.436%   |  +4.693%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.587% |  +1.828%   |  +9.919%   |  +14.700%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.250% |  +0.013%   |  +9.875%   |  +11.825%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 0.658% |  -0.327%   |  +3.177%   |  +6.690%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.641% |  +2.095%   |  +6.574%   |  +3.484%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.858% |  +0.009%   |  +4.433%   |  +5.165%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.358% |  -0.407%   |  +9.306%   |  +10.584%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.256% |  +1.114%   |  +8.451%   |  +7.910%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.956% |  +1.064%   |  +7.099%   |  +10.664%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 1.552% |  -1.209%   |  +9.277%   |  +11.600%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.374% |  +0.516%   |  +8.917%   |  +8.640%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.748% |  +0.288%   |  +4.594%   |  +8.189%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 1.360% |  +0.852%   |  +4.635%   |  +9.801%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.618% |  -0.534%   |  +8.476%   |  +12.003%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.300% |  +0.173%   |  +47.501%  |  +11.380%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.562% |  -0.814%   |  +9.615%   |  +13.141%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.505% |  +0.907%   |  +19.556%  |  +10.697%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 7.944% |  -3.376%   |  +0.805%   |  +17.800%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.286% |  +0.464%   |  +4.143%   |  +5.778%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 1.191% |  +1.840%   |  -2.294%   |  +3.265%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.774% |  +1.818%   |  +3.872%   |  +5.359%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.498% |  -0.914%   |  -0.876%   |  +14.612%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 4.300% |  -0.864%   |  +1.734%   |  +21.366%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.252% |  +0.899%   |  +4.683%   |  +13.517%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.778% |  +1.300%   |  +5.177%   |  +15.369%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 4.097% |  -0.078%   |  +12.788%  |  +9.178%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.198% |  +0.180%   |  +0.374%   |  +9.357%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.118% |  +0.109%   |  +9.713%   |  +4.425%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.095% |  +0.102%   |  +1.487%   |  +4.361%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.288% |  -0.866%   |  +10.494%  |  +11.975%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.982% |  -3.208%   |  -8.884%   |  +10.529%  |
+-----+------------------------+--------+------------+------------+------------+
| :-) |               regex_dna| 0.668% |  +3.659%   |  +2.035%   |  +9.468%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.445% |  +0.437%   |  +0.314%   |  +3.707%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.038% |  +0.653%   |  +11.388%  |  +4.241%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.405% |  -1.436%   |  +7.412%   |  +13.361%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 1.292% |  -1.576%   |  -0.142%   |  +2.089%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 2.056% |  +1.524%   |  +27.816%  |  +7.825%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.404% |  -0.408%   |  +5.794%   |  +5.297%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 1.184% |  -0.376%   |  +15.567%  |  +8.247%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 2.049% |  -2.496%   |  +0.743%   |  -1.885%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.742% |  -1.329%   |  +5.168%   |  +2.053%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.051% |  -0.159%   |  +5.308%   |  +7.267%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.099% |  -0.256%   |  +5.256%   |  +3.565%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 2.820% |  +0.731%   |  +2.629%   |  +8.977%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.034% |  -0.517%   |  +12.667%  |  +7.224%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.648% |  -0.457%   |  +10.631%  |  +6.118%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 2.977% |  -0.264%   |  +12.225%  |  +8.921%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.274% |  +0.019%   |  +13.952%  |  +8.216%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 3.361% |  +2.985%   |  +24.038%  |  +7.573%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.156% |  -0.481%   |  +5.746%   |  +5.292%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.320% |  -0.234%   |  -0.158%   |  -0.143%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 6.185% |  +2.077%   |  +10.972%  |  +19.005%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 1.313% |  +1.210%   |  -2.649%   |  +19.221%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 2.791% |  +0.729%   |  +7.437%   |  +6.074%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 0.890% |  +0.731%   |  +5.716%   |  +8.542%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.839% |  -0.634%   |  +1.821%   |  +6.250%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 2.236% |  -0.396%   |  -5.799%   |  +10.555%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.380% |  +0.658%   |  +6.416%   |  +8.303%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/1-up-64-flat-results-for-python-master-branch-2017-08-03

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Thu Aug  3 22:00:15 2017
From: webhook-mailer at python.org (Mariatta)
Date: Fri, 04 Aug 2017 02:00:15 -0000
Subject: [Python-checkins] bpo-27470: Improve doc for commandline -3 option
Message-ID: <mailman.34.1501812016.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/dd6e4aa113c6db4fcf9d252b5063ab217e8330a2
commit: dd6e4aa113c6db4fcf9d252b5063ab217e8330a2
branch: 2.7
author: Subhendu Ghosh <subho.prp at gmail.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-08-04T12:00:10+10:00
summary:

bpo-27470: Improve doc for commandline -3 option

Mention that it warns about features that are significantly changed in Python 3
and can?t be detected using static code analysis.

Link to Porting Python 2 Code to Python 3 doc

files:
M Doc/using/cmdline.rst

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index b567818858f..f00f7f6026a 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -417,10 +417,12 @@ Miscellaneous options
 
    Warn about Python 3.x possible incompatibilities by emitting a
    :exc:`DeprecationWarning` for features that are removed or significantly
-   changed in Python 3.
+   changed in Python 3 and can't be detected using static code analysis.
 
    .. versionadded:: 2.6
 
+   See :doc:`/howto/pyporting` for more details.
+
 Options you shouldn't use
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 


From webhook-mailer at python.org  Fri Aug  4 04:45:06 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Fri, 04 Aug 2017 08:45:06 -0000
Subject: [Python-checkins] bpo-31107: Fix copyreg mangled slot names
 calculation. (#2989)
Message-ID: <mailman.35.1501836308.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/c4c9866064f03646c686d7e08b00aeb203c35c19
commit: c4c9866064f03646c686d7e08b00aeb203c35c19
branch: master
author: Shane Harvey <shane.harvey at mongodb.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-04T11:45:00+03:00
summary:

bpo-31107: Fix copyreg mangled slot names calculation. (#2989)

files:
A Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst
M Lib/copyreg.py
M Lib/test/test_copyreg.py
M Misc/ACKS

diff --git a/Lib/copyreg.py b/Lib/copyreg.py
index ed29d719def..bbe1af4e2e7 100644
--- a/Lib/copyreg.py
+++ b/Lib/copyreg.py
@@ -128,7 +128,11 @@ class found there.  (This assumes classes don't modify their
                         continue
                     # mangled names
                     elif name.startswith('__') and not name.endswith('__'):
-                        names.append('_%s%s' % (c.__name__, name))
+                        stripped = c.__name__.lstrip('_')
+                        if stripped:
+                            names.append('_%s%s' % (stripped, name))
+                        else:
+                            names.append(name)
                     else:
                         names.append(name)
 
diff --git a/Lib/test/test_copyreg.py b/Lib/test/test_copyreg.py
index 52e887cb36c..e3f1cd81aab 100644
--- a/Lib/test/test_copyreg.py
+++ b/Lib/test/test_copyreg.py
@@ -16,6 +16,12 @@ class WithWeakref(object):
 class WithPrivate(object):
     __slots__ = ('__spam',)
 
+class _WithLeadingUnderscoreAndPrivate(object):
+    __slots__ = ('__spam',)
+
+class ___(object):
+    __slots__ = ('__spam',)
+
 class WithSingleString(object):
     __slots__ = 'spam'
 
@@ -104,6 +110,10 @@ def test_slotnames(self):
         self.assertEqual(copyreg._slotnames(WithWeakref), [])
         expected = ['_WithPrivate__spam']
         self.assertEqual(copyreg._slotnames(WithPrivate), expected)
+        expected = ['_WithLeadingUnderscoreAndPrivate__spam']
+        self.assertEqual(copyreg._slotnames(_WithLeadingUnderscoreAndPrivate),
+                         expected)
+        self.assertEqual(copyreg._slotnames(___), ['__spam'])
         self.assertEqual(copyreg._slotnames(WithSingleString), ['spam'])
         expected = ['eggs', 'spam']
         expected.sort()
diff --git a/Misc/ACKS b/Misc/ACKS
index f1f6c147f49..ec7d481a587 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -598,6 +598,7 @@ David Harrigan
 Brian Harring
 Jonathan Hartley
 Travis B. Hartwell
+Shane Harvey
 Larry Hastings
 Tim Hatch
 Shane Hathaway
diff --git a/Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst b/Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst
new file mode 100644
index 00000000000..3c2a15528d8
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst
@@ -0,0 +1,2 @@
+Fix `copyreg._slotnames()` mangled attribute calculation for classes whose
+name begins with an underscore. Patch by Shane Harvey.


From solipsis at pitrou.net  Fri Aug  4 05:07:51 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 04 Aug 2017 09:07:51 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=-2
Message-ID: <20170804090750.67315.69B924EDCF3B0AD8@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [0, -7, 1] memory blocks, sum=-6
test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_forkserver leaked [-2, 1, 1] memory blocks, sum=0


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogmX2oin', '--timeout', '7200']

From webhook-mailer at python.org  Fri Aug  4 13:53:18 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Fri, 04 Aug 2017 17:53:18 -0000
Subject: [Python-checkins] Fix a shadow-compatible-local warning (#2180)
Message-ID: <mailman.36.1501869199.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/2af565baf498f389105ff71e4ae054c66fe5d55f
commit: 2af565baf498f389105ff71e4ae054c66fe5d55f
branch: master
author: Yuan Chao Chou <oswinchou at gmail.com>
committer: ?ukasz Langa <lukasz at langa.pl>
date: 2017-08-04T10:53:12-07:00
summary:

Fix a shadow-compatible-local warning (#2180)

Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val'
to prevent the variables from being misused.

files:
M Parser/asdl_c.py
M Python/Python-ast.c

diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index 096f5f8c749..b367e10231c 100644
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -522,8 +522,8 @@ def visitField(self, field, name, sum=None, prod=None, depth=0):
                 self.emit("%s = _Py_asdl_seq_new(len, arena);" % field.name, depth+1)
             self.emit("if (%s == NULL) goto failed;" % field.name, depth+1)
             self.emit("for (i = 0; i < len; i++) {", depth+1)
-            self.emit("%s value;" % ctype, depth+2)
-            self.emit("res = obj2ast_%s(PyList_GET_ITEM(tmp, i), &value, arena);" %
+            self.emit("%s val;" % ctype, depth+2)
+            self.emit("res = obj2ast_%s(PyList_GET_ITEM(tmp, i), &val, arena);" %
                       field.type, depth+2, reflow=False)
             self.emit("if (res != 0) goto failed;", depth+2)
             self.emit("if (len != PyList_GET_SIZE(tmp)) {", depth+2)
@@ -533,7 +533,7 @@ def visitField(self, field, name, sum=None, prod=None, depth=0):
                       depth+3, reflow=False)
             self.emit("goto failed;", depth+3)
             self.emit("}", depth+2)
-            self.emit("asdl_seq_SET(%s, i, value);" % field.name, depth+2)
+            self.emit("asdl_seq_SET(%s, i, val);" % field.name, depth+2)
             self.emit("}", depth+1)
         else:
             self.emit("res = obj2ast_%s(tmp, &%s, arena);" %
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index 2759b2fe9c4..77852f923f4 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -4017,14 +4017,14 @@ obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Module field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4066,14 +4066,14 @@ obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Interactive field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4127,14 +4127,14 @@ obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Suite field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4235,14 +4235,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "FunctionDef field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4263,14 +4263,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             decorator_list = _Py_asdl_seq_new(len, arena);
             if (decorator_list == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "FunctionDef field \"decorator_list\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(decorator_list, i, value);
+                asdl_seq_SET(decorator_list, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4350,14 +4350,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "AsyncFunctionDef field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4378,14 +4378,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             decorator_list = _Py_asdl_seq_new(len, arena);
             if (decorator_list == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "AsyncFunctionDef field \"decorator_list\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(decorator_list, i, value);
+                asdl_seq_SET(decorator_list, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4454,14 +4454,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             bases = _Py_asdl_seq_new(len, arena);
             if (bases == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"bases\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(bases, i, value);
+                asdl_seq_SET(bases, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4482,14 +4482,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             keywords = _Py_asdl_seq_new(len, arena);
             if (keywords == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                keyword_ty value;
-                res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &value, arena);
+                keyword_ty val;
+                res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"keywords\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(keywords, i, value);
+                asdl_seq_SET(keywords, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4510,14 +4510,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4538,14 +4538,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             decorator_list = _Py_asdl_seq_new(len, arena);
             if (decorator_list == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"decorator_list\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(decorator_list, i, value);
+                asdl_seq_SET(decorator_list, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4609,14 +4609,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             targets = _Py_asdl_seq_new(len, arena);
             if (targets == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Delete field \"targets\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(targets, i, value);
+                asdl_seq_SET(targets, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4649,14 +4649,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             targets = _Py_asdl_seq_new(len, arena);
             if (targets == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Assign field \"targets\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(targets, i, value);
+                asdl_seq_SET(targets, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4828,14 +4828,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "For field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4856,14 +4856,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             orelse = _Py_asdl_seq_new(len, arena);
             if (orelse == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "For field \"orelse\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(orelse, i, value);
+                asdl_seq_SET(orelse, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4920,14 +4920,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "AsyncFor field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4948,14 +4948,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             orelse = _Py_asdl_seq_new(len, arena);
             if (orelse == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "AsyncFor field \"orelse\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(orelse, i, value);
+                asdl_seq_SET(orelse, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5000,14 +5000,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "While field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5028,14 +5028,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             orelse = _Py_asdl_seq_new(len, arena);
             if (orelse == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "While field \"orelse\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(orelse, i, value);
+                asdl_seq_SET(orelse, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5080,14 +5080,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "If field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5108,14 +5108,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             orelse = _Py_asdl_seq_new(len, arena);
             if (orelse == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "If field \"orelse\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(orelse, i, value);
+                asdl_seq_SET(orelse, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5148,14 +5148,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             items = _Py_asdl_seq_new(len, arena);
             if (items == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                withitem_ty value;
-                res = obj2ast_withitem(PyList_GET_ITEM(tmp, i), &value, arena);
+                withitem_ty val;
+                res = obj2ast_withitem(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "With field \"items\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(items, i, value);
+                asdl_seq_SET(items, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5176,14 +5176,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "With field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5216,14 +5216,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             items = _Py_asdl_seq_new(len, arena);
             if (items == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                withitem_ty value;
-                res = obj2ast_withitem(PyList_GET_ITEM(tmp, i), &value, arena);
+                withitem_ty val;
+                res = obj2ast_withitem(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "AsyncWith field \"items\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(items, i, value);
+                asdl_seq_SET(items, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5244,14 +5244,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "AsyncWith field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5318,14 +5318,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Try field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5346,14 +5346,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             handlers = _Py_asdl_seq_new(len, arena);
             if (handlers == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                excepthandler_ty value;
-                res = obj2ast_excepthandler(PyList_GET_ITEM(tmp, i), &value, arena);
+                excepthandler_ty val;
+                res = obj2ast_excepthandler(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Try field \"handlers\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(handlers, i, value);
+                asdl_seq_SET(handlers, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5374,14 +5374,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             orelse = _Py_asdl_seq_new(len, arena);
             if (orelse == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Try field \"orelse\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(orelse, i, value);
+                asdl_seq_SET(orelse, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5402,14 +5402,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             finalbody = _Py_asdl_seq_new(len, arena);
             if (finalbody == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Try field \"finalbody\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(finalbody, i, value);
+                asdl_seq_SET(finalbody, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5475,14 +5475,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             names = _Py_asdl_seq_new(len, arena);
             if (names == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                alias_ty value;
-                res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &value, arena);
+                alias_ty val;
+                res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Import field \"names\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(names, i, value);
+                asdl_seq_SET(names, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5526,14 +5526,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             names = _Py_asdl_seq_new(len, arena);
             if (names == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                alias_ty value;
-                res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &value, arena);
+                alias_ty val;
+                res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ImportFrom field \"names\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(names, i, value);
+                asdl_seq_SET(names, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5575,14 +5575,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             names = _Py_asdl_seq_new(len, arena);
             if (names == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                identifier value;
-                res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &value, arena);
+                identifier val;
+                res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Global field \"names\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(names, i, value);
+                asdl_seq_SET(names, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5614,14 +5614,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             names = _Py_asdl_seq_new(len, arena);
             if (names == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                identifier value;
-                res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &value, arena);
+                identifier val;
+                res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Nonlocal field \"names\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(names, i, value);
+                asdl_seq_SET(names, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5759,14 +5759,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             values = _Py_asdl_seq_new(len, arena);
             if (values == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "BoolOp field \"values\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(values, i, value);
+                asdl_seq_SET(values, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5959,14 +5959,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             keys = _Py_asdl_seq_new(len, arena);
             if (keys == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Dict field \"keys\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(keys, i, value);
+                asdl_seq_SET(keys, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5987,14 +5987,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             values = _Py_asdl_seq_new(len, arena);
             if (values == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Dict field \"values\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(values, i, value);
+                asdl_seq_SET(values, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6026,14 +6026,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             elts = _Py_asdl_seq_new(len, arena);
             if (elts == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Set field \"elts\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(elts, i, value);
+                asdl_seq_SET(elts, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6077,14 +6077,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             generators = _Py_asdl_seq_new(len, arena);
             if (generators == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                comprehension_ty value;
-                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+                comprehension_ty val;
+                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ListComp field \"generators\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(generators, i, value);
+                asdl_seq_SET(generators, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6128,14 +6128,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             generators = _Py_asdl_seq_new(len, arena);
             if (generators == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                comprehension_ty value;
-                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+                comprehension_ty val;
+                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "SetComp field \"generators\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(generators, i, value);
+                asdl_seq_SET(generators, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6191,14 +6191,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             generators = _Py_asdl_seq_new(len, arena);
             if (generators == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                comprehension_ty value;
-                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+                comprehension_ty val;
+                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "DictComp field \"generators\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(generators, i, value);
+                asdl_seq_SET(generators, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6242,14 +6242,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             generators = _Py_asdl_seq_new(len, arena);
             if (generators == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                comprehension_ty value;
-                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+                comprehension_ty val;
+                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "GeneratorExp field \"generators\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(generators, i, value);
+                asdl_seq_SET(generators, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6359,14 +6359,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             ops = _Py_asdl_int_seq_new(len, arena);
             if (ops == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                cmpop_ty value;
-                res = obj2ast_cmpop(PyList_GET_ITEM(tmp, i), &value, arena);
+                cmpop_ty val;
+                res = obj2ast_cmpop(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Compare field \"ops\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(ops, i, value);
+                asdl_seq_SET(ops, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6387,14 +6387,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             comparators = _Py_asdl_seq_new(len, arena);
             if (comparators == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Compare field \"comparators\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(comparators, i, value);
+                asdl_seq_SET(comparators, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6439,14 +6439,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             args = _Py_asdl_seq_new(len, arena);
             if (args == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Call field \"args\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(args, i, value);
+                asdl_seq_SET(args, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6467,14 +6467,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             keywords = _Py_asdl_seq_new(len, arena);
             if (keywords == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                keyword_ty value;
-                res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &value, arena);
+                keyword_ty val;
+                res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Call field \"keywords\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(keywords, i, value);
+                asdl_seq_SET(keywords, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6595,14 +6595,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             values = _Py_asdl_seq_new(len, arena);
             if (values == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "JoinedStr field \"values\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(values, i, value);
+                asdl_seq_SET(values, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6871,14 +6871,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             elts = _Py_asdl_seq_new(len, arena);
             if (elts == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "List field \"elts\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(elts, i, value);
+                asdl_seq_SET(elts, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6922,14 +6922,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             elts = _Py_asdl_seq_new(len, arena);
             if (elts == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Tuple field \"elts\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(elts, i, value);
+                asdl_seq_SET(elts, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -7091,14 +7091,14 @@ obj2ast_slice(PyObject* obj, slice_ty* out, PyArena* arena)
             dims = _Py_asdl_seq_new(len, arena);
             if (dims == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                slice_ty value;
-                res = obj2ast_slice(PyList_GET_ITEM(tmp, i), &value, arena);
+                slice_ty val;
+                res = obj2ast_slice(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ExtSlice field \"dims\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(dims, i, value);
+                asdl_seq_SET(dims, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -7455,14 +7455,14 @@ obj2ast_comprehension(PyObject* obj, comprehension_ty* out, PyArena* arena)
         ifs = _Py_asdl_seq_new(len, arena);
         if (ifs == NULL) goto failed;
         for (i = 0; i < len; i++) {
-            expr_ty value;
-            res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+            expr_ty val;
+            res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
             if (res != 0) goto failed;
             if (len != PyList_GET_SIZE(tmp)) {
                 PyErr_SetString(PyExc_RuntimeError, "comprehension field \"ifs\" changed size during iteration");
                 goto failed;
             }
-            asdl_seq_SET(ifs, i, value);
+            asdl_seq_SET(ifs, i, val);
         }
         Py_CLEAR(tmp);
     } else {
@@ -7565,14 +7565,14 @@ obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ExceptHandler field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -7615,14 +7615,14 @@ obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
         args = _Py_asdl_seq_new(len, arena);
         if (args == NULL) goto failed;
         for (i = 0; i < len; i++) {
-            arg_ty value;
-            res = obj2ast_arg(PyList_GET_ITEM(tmp, i), &value, arena);
+            arg_ty val;
+            res = obj2ast_arg(PyList_GET_ITEM(tmp, i), &val, arena);
             if (res != 0) goto failed;
             if (len != PyList_GET_SIZE(tmp)) {
                 PyErr_SetString(PyExc_RuntimeError, "arguments field \"args\" changed size during iteration");
                 goto failed;
             }
-            asdl_seq_SET(args, i, value);
+            asdl_seq_SET(args, i, val);
         }
         Py_CLEAR(tmp);
     } else {
@@ -7653,14 +7653,14 @@ obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
         kwonlyargs = _Py_asdl_seq_new(len, arena);
         if (kwonlyargs == NULL) goto failed;
         for (i = 0; i < len; i++) {
-            arg_ty value;
-            res = obj2ast_arg(PyList_GET_ITEM(tmp, i), &value, arena);
+            arg_ty val;
+            res = obj2ast_arg(PyList_GET_ITEM(tmp, i), &val, arena);
             if (res != 0) goto failed;
             if (len != PyList_GET_SIZE(tmp)) {
                 PyErr_SetString(PyExc_RuntimeError, "arguments field \"kwonlyargs\" changed size during iteration");
                 goto failed;
             }
-            asdl_seq_SET(kwonlyargs, i, value);
+            asdl_seq_SET(kwonlyargs, i, val);
         }
         Py_CLEAR(tmp);
     } else {
@@ -7681,14 +7681,14 @@ obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
         kw_defaults = _Py_asdl_seq_new(len, arena);
         if (kw_defaults == NULL) goto failed;
         for (i = 0; i < len; i++) {
-            expr_ty value;
-            res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+            expr_ty val;
+            res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
             if (res != 0) goto failed;
             if (len != PyList_GET_SIZE(tmp)) {
                 PyErr_SetString(PyExc_RuntimeError, "arguments field \"kw_defaults\" changed size during iteration");
                 goto failed;
             }
-            asdl_seq_SET(kw_defaults, i, value);
+            asdl_seq_SET(kw_defaults, i, val);
         }
         Py_CLEAR(tmp);
     } else {
@@ -7719,14 +7719,14 @@ obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
         defaults = _Py_asdl_seq_new(len, arena);
         if (defaults == NULL) goto failed;
         for (i = 0; i < len; i++) {
-            expr_ty value;
-            res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+            expr_ty val;
+            res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
             if (res != 0) goto failed;
             if (len != PyList_GET_SIZE(tmp)) {
                 PyErr_SetString(PyExc_RuntimeError, "arguments field \"defaults\" changed size during iteration");
                 goto failed;
             }
-            asdl_seq_SET(defaults, i, value);
+            asdl_seq_SET(defaults, i, val);
         }
         Py_CLEAR(tmp);
     } else {


From webhook-mailer at python.org  Fri Aug  4 13:53:45 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Fri, 04 Aug 2017 17:53:45 -0000
Subject: [Python-checkins] Fix a shadow-compatible-local warning (#2181)
Message-ID: <mailman.37.1501869226.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/a0cb7db8e4b928b4c06da4bde8695555276958f0
commit: a0cb7db8e4b928b4c06da4bde8695555276958f0
branch: 3.6
author: Yuan Chao Chou <oswinchou at gmail.com>
committer: ?ukasz Langa <lukasz at langa.pl>
date: 2017-08-04T10:53:42-07:00
summary:

Fix a shadow-compatible-local warning (#2181)

Change the shadowing naming, 'value' (Python-ast.c:4686), to 'val'
to prevent the variables from being misused.

files:
M Parser/asdl_c.py
M Python/Python-ast.c

diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index 725d73bad47..13124bbd3ad 100644
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -522,8 +522,8 @@ def visitField(self, field, name, sum=None, prod=None, depth=0):
                 self.emit("%s = _Py_asdl_seq_new(len, arena);" % field.name, depth+1)
             self.emit("if (%s == NULL) goto failed;" % field.name, depth+1)
             self.emit("for (i = 0; i < len; i++) {", depth+1)
-            self.emit("%s value;" % ctype, depth+2)
-            self.emit("res = obj2ast_%s(PyList_GET_ITEM(tmp, i), &value, arena);" %
+            self.emit("%s val;" % ctype, depth+2)
+            self.emit("res = obj2ast_%s(PyList_GET_ITEM(tmp, i), &val, arena);" %
                       field.type, depth+2, reflow=False)
             self.emit("if (res != 0) goto failed;", depth+2)
             self.emit("if (len != PyList_GET_SIZE(tmp)) {", depth+2)
@@ -533,7 +533,7 @@ def visitField(self, field, name, sum=None, prod=None, depth=0):
                       depth+3, reflow=False)
             self.emit("goto failed;", depth+3)
             self.emit("}", depth+2)
-            self.emit("asdl_seq_SET(%s, i, value);" % field.name, depth+2)
+            self.emit("asdl_seq_SET(%s, i, val);" % field.name, depth+2)
             self.emit("}", depth+1)
         else:
             self.emit("res = obj2ast_%s(tmp, &%s, arena);" %
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index e0607ba9ae6..b78a0fc714e 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -3994,14 +3994,14 @@ obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Module field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4033,14 +4033,14 @@ obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Interactive field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4094,14 +4094,14 @@ obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Suite field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4201,14 +4201,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "FunctionDef field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4229,14 +4229,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             decorator_list = _Py_asdl_seq_new(len, arena);
             if (decorator_list == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "FunctionDef field \"decorator_list\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(decorator_list, i, value);
+                asdl_seq_SET(decorator_list, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4305,14 +4305,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "AsyncFunctionDef field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4333,14 +4333,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             decorator_list = _Py_asdl_seq_new(len, arena);
             if (decorator_list == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "AsyncFunctionDef field \"decorator_list\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(decorator_list, i, value);
+                asdl_seq_SET(decorator_list, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4398,14 +4398,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             bases = _Py_asdl_seq_new(len, arena);
             if (bases == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"bases\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(bases, i, value);
+                asdl_seq_SET(bases, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4426,14 +4426,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             keywords = _Py_asdl_seq_new(len, arena);
             if (keywords == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                keyword_ty value;
-                res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &value, arena);
+                keyword_ty val;
+                res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"keywords\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(keywords, i, value);
+                asdl_seq_SET(keywords, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4454,14 +4454,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4482,14 +4482,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             decorator_list = _Py_asdl_seq_new(len, arena);
             if (decorator_list == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"decorator_list\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(decorator_list, i, value);
+                asdl_seq_SET(decorator_list, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4543,14 +4543,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             targets = _Py_asdl_seq_new(len, arena);
             if (targets == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Delete field \"targets\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(targets, i, value);
+                asdl_seq_SET(targets, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4583,14 +4583,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             targets = _Py_asdl_seq_new(len, arena);
             if (targets == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Assign field \"targets\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(targets, i, value);
+                asdl_seq_SET(targets, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4762,14 +4762,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "For field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4790,14 +4790,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             orelse = _Py_asdl_seq_new(len, arena);
             if (orelse == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "For field \"orelse\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(orelse, i, value);
+                asdl_seq_SET(orelse, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4854,14 +4854,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "AsyncFor field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4882,14 +4882,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             orelse = _Py_asdl_seq_new(len, arena);
             if (orelse == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "AsyncFor field \"orelse\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(orelse, i, value);
+                asdl_seq_SET(orelse, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4934,14 +4934,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "While field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -4962,14 +4962,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             orelse = _Py_asdl_seq_new(len, arena);
             if (orelse == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "While field \"orelse\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(orelse, i, value);
+                asdl_seq_SET(orelse, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5014,14 +5014,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "If field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5042,14 +5042,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             orelse = _Py_asdl_seq_new(len, arena);
             if (orelse == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "If field \"orelse\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(orelse, i, value);
+                asdl_seq_SET(orelse, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5082,14 +5082,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             items = _Py_asdl_seq_new(len, arena);
             if (items == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                withitem_ty value;
-                res = obj2ast_withitem(PyList_GET_ITEM(tmp, i), &value, arena);
+                withitem_ty val;
+                res = obj2ast_withitem(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "With field \"items\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(items, i, value);
+                asdl_seq_SET(items, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5110,14 +5110,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "With field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5150,14 +5150,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             items = _Py_asdl_seq_new(len, arena);
             if (items == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                withitem_ty value;
-                res = obj2ast_withitem(PyList_GET_ITEM(tmp, i), &value, arena);
+                withitem_ty val;
+                res = obj2ast_withitem(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "AsyncWith field \"items\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(items, i, value);
+                asdl_seq_SET(items, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5178,14 +5178,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "AsyncWith field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5252,14 +5252,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Try field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5280,14 +5280,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             handlers = _Py_asdl_seq_new(len, arena);
             if (handlers == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                excepthandler_ty value;
-                res = obj2ast_excepthandler(PyList_GET_ITEM(tmp, i), &value, arena);
+                excepthandler_ty val;
+                res = obj2ast_excepthandler(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Try field \"handlers\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(handlers, i, value);
+                asdl_seq_SET(handlers, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5308,14 +5308,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             orelse = _Py_asdl_seq_new(len, arena);
             if (orelse == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Try field \"orelse\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(orelse, i, value);
+                asdl_seq_SET(orelse, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5336,14 +5336,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             finalbody = _Py_asdl_seq_new(len, arena);
             if (finalbody == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Try field \"finalbody\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(finalbody, i, value);
+                asdl_seq_SET(finalbody, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5409,14 +5409,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             names = _Py_asdl_seq_new(len, arena);
             if (names == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                alias_ty value;
-                res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &value, arena);
+                alias_ty val;
+                res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Import field \"names\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(names, i, value);
+                asdl_seq_SET(names, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5460,14 +5460,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             names = _Py_asdl_seq_new(len, arena);
             if (names == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                alias_ty value;
-                res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &value, arena);
+                alias_ty val;
+                res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ImportFrom field \"names\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(names, i, value);
+                asdl_seq_SET(names, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5509,14 +5509,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             names = _Py_asdl_seq_new(len, arena);
             if (names == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                identifier value;
-                res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &value, arena);
+                identifier val;
+                res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Global field \"names\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(names, i, value);
+                asdl_seq_SET(names, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5548,14 +5548,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
             names = _Py_asdl_seq_new(len, arena);
             if (names == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                identifier value;
-                res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &value, arena);
+                identifier val;
+                res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Nonlocal field \"names\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(names, i, value);
+                asdl_seq_SET(names, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5693,14 +5693,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             values = _Py_asdl_seq_new(len, arena);
             if (values == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "BoolOp field \"values\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(values, i, value);
+                asdl_seq_SET(values, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5893,14 +5893,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             keys = _Py_asdl_seq_new(len, arena);
             if (keys == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Dict field \"keys\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(keys, i, value);
+                asdl_seq_SET(keys, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5921,14 +5921,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             values = _Py_asdl_seq_new(len, arena);
             if (values == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Dict field \"values\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(values, i, value);
+                asdl_seq_SET(values, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -5960,14 +5960,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             elts = _Py_asdl_seq_new(len, arena);
             if (elts == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Set field \"elts\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(elts, i, value);
+                asdl_seq_SET(elts, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6011,14 +6011,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             generators = _Py_asdl_seq_new(len, arena);
             if (generators == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                comprehension_ty value;
-                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+                comprehension_ty val;
+                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ListComp field \"generators\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(generators, i, value);
+                asdl_seq_SET(generators, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6062,14 +6062,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             generators = _Py_asdl_seq_new(len, arena);
             if (generators == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                comprehension_ty value;
-                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+                comprehension_ty val;
+                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "SetComp field \"generators\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(generators, i, value);
+                asdl_seq_SET(generators, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6125,14 +6125,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             generators = _Py_asdl_seq_new(len, arena);
             if (generators == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                comprehension_ty value;
-                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+                comprehension_ty val;
+                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "DictComp field \"generators\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(generators, i, value);
+                asdl_seq_SET(generators, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6176,14 +6176,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             generators = _Py_asdl_seq_new(len, arena);
             if (generators == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                comprehension_ty value;
-                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+                comprehension_ty val;
+                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "GeneratorExp field \"generators\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(generators, i, value);
+                asdl_seq_SET(generators, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6293,14 +6293,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             ops = _Py_asdl_int_seq_new(len, arena);
             if (ops == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                cmpop_ty value;
-                res = obj2ast_cmpop(PyList_GET_ITEM(tmp, i), &value, arena);
+                cmpop_ty val;
+                res = obj2ast_cmpop(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Compare field \"ops\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(ops, i, value);
+                asdl_seq_SET(ops, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6321,14 +6321,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             comparators = _Py_asdl_seq_new(len, arena);
             if (comparators == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Compare field \"comparators\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(comparators, i, value);
+                asdl_seq_SET(comparators, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6373,14 +6373,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             args = _Py_asdl_seq_new(len, arena);
             if (args == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Call field \"args\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(args, i, value);
+                asdl_seq_SET(args, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6401,14 +6401,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             keywords = _Py_asdl_seq_new(len, arena);
             if (keywords == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                keyword_ty value;
-                res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &value, arena);
+                keyword_ty val;
+                res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Call field \"keywords\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(keywords, i, value);
+                asdl_seq_SET(keywords, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6529,14 +6529,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             values = _Py_asdl_seq_new(len, arena);
             if (values == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "JoinedStr field \"values\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(values, i, value);
+                asdl_seq_SET(values, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6805,14 +6805,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             elts = _Py_asdl_seq_new(len, arena);
             if (elts == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "List field \"elts\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(elts, i, value);
+                asdl_seq_SET(elts, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -6856,14 +6856,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
             elts = _Py_asdl_seq_new(len, arena);
             if (elts == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                expr_ty value;
-                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                expr_ty val;
+                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "Tuple field \"elts\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(elts, i, value);
+                asdl_seq_SET(elts, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -7025,14 +7025,14 @@ obj2ast_slice(PyObject* obj, slice_ty* out, PyArena* arena)
             dims = _Py_asdl_seq_new(len, arena);
             if (dims == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                slice_ty value;
-                res = obj2ast_slice(PyList_GET_ITEM(tmp, i), &value, arena);
+                slice_ty val;
+                res = obj2ast_slice(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ExtSlice field \"dims\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(dims, i, value);
+                asdl_seq_SET(dims, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -7389,14 +7389,14 @@ obj2ast_comprehension(PyObject* obj, comprehension_ty* out, PyArena* arena)
         ifs = _Py_asdl_seq_new(len, arena);
         if (ifs == NULL) goto failed;
         for (i = 0; i < len; i++) {
-            expr_ty value;
-            res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+            expr_ty val;
+            res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
             if (res != 0) goto failed;
             if (len != PyList_GET_SIZE(tmp)) {
                 PyErr_SetString(PyExc_RuntimeError, "comprehension field \"ifs\" changed size during iteration");
                 goto failed;
             }
-            asdl_seq_SET(ifs, i, value);
+            asdl_seq_SET(ifs, i, val);
         }
         Py_CLEAR(tmp);
     } else {
@@ -7499,14 +7499,14 @@ obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena)
             body = _Py_asdl_seq_new(len, arena);
             if (body == NULL) goto failed;
             for (i = 0; i < len; i++) {
-                stmt_ty value;
-                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                stmt_ty val;
+                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                 if (res != 0) goto failed;
                 if (len != PyList_GET_SIZE(tmp)) {
                     PyErr_SetString(PyExc_RuntimeError, "ExceptHandler field \"body\" changed size during iteration");
                     goto failed;
                 }
-                asdl_seq_SET(body, i, value);
+                asdl_seq_SET(body, i, val);
             }
             Py_CLEAR(tmp);
         } else {
@@ -7549,14 +7549,14 @@ obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
         args = _Py_asdl_seq_new(len, arena);
         if (args == NULL) goto failed;
         for (i = 0; i < len; i++) {
-            arg_ty value;
-            res = obj2ast_arg(PyList_GET_ITEM(tmp, i), &value, arena);
+            arg_ty val;
+            res = obj2ast_arg(PyList_GET_ITEM(tmp, i), &val, arena);
             if (res != 0) goto failed;
             if (len != PyList_GET_SIZE(tmp)) {
                 PyErr_SetString(PyExc_RuntimeError, "arguments field \"args\" changed size during iteration");
                 goto failed;
             }
-            asdl_seq_SET(args, i, value);
+            asdl_seq_SET(args, i, val);
         }
         Py_CLEAR(tmp);
     } else {
@@ -7587,14 +7587,14 @@ obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
         kwonlyargs = _Py_asdl_seq_new(len, arena);
         if (kwonlyargs == NULL) goto failed;
         for (i = 0; i < len; i++) {
-            arg_ty value;
-            res = obj2ast_arg(PyList_GET_ITEM(tmp, i), &value, arena);
+            arg_ty val;
+            res = obj2ast_arg(PyList_GET_ITEM(tmp, i), &val, arena);
             if (res != 0) goto failed;
             if (len != PyList_GET_SIZE(tmp)) {
                 PyErr_SetString(PyExc_RuntimeError, "arguments field \"kwonlyargs\" changed size during iteration");
                 goto failed;
             }
-            asdl_seq_SET(kwonlyargs, i, value);
+            asdl_seq_SET(kwonlyargs, i, val);
         }
         Py_CLEAR(tmp);
     } else {
@@ -7615,14 +7615,14 @@ obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
         kw_defaults = _Py_asdl_seq_new(len, arena);
         if (kw_defaults == NULL) goto failed;
         for (i = 0; i < len; i++) {
-            expr_ty value;
-            res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+            expr_ty val;
+            res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
             if (res != 0) goto failed;
             if (len != PyList_GET_SIZE(tmp)) {
                 PyErr_SetString(PyExc_RuntimeError, "arguments field \"kw_defaults\" changed size during iteration");
                 goto failed;
             }
-            asdl_seq_SET(kw_defaults, i, value);
+            asdl_seq_SET(kw_defaults, i, val);
         }
         Py_CLEAR(tmp);
     } else {
@@ -7653,14 +7653,14 @@ obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
         defaults = _Py_asdl_seq_new(len, arena);
         if (defaults == NULL) goto failed;
         for (i = 0; i < len; i++) {
-            expr_ty value;
-            res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+            expr_ty val;
+            res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
             if (res != 0) goto failed;
             if (len != PyList_GET_SIZE(tmp)) {
                 PyErr_SetString(PyExc_RuntimeError, "arguments field \"defaults\" changed size during iteration");
                 goto failed;
             }
-            asdl_seq_SET(defaults, i, value);
+            asdl_seq_SET(defaults, i, val);
         }
         Py_CLEAR(tmp);
     } else {


From webhook-mailer at python.org  Fri Aug  4 13:54:30 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Fri, 04 Aug 2017 17:54:30 -0000
Subject: [Python-checkins] Fix a shadow-compatible-local warning (#2182)
Message-ID: <mailman.38.1501869271.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/5fbb8e367d4406f3248a60bed057f3b82d30f9ab
commit: 5fbb8e367d4406f3248a60bed057f3b82d30f9ab
branch: 2.7
author: Yuan Chao Chou <oswinchou at gmail.com>
committer: ?ukasz Langa <lukasz at langa.pl>
date: 2017-08-04T10:54:27-07:00
summary:

Fix a shadow-compatible-local warning (#2182)

Change the shadowing naming, 'value' (Python-ast.c:3814), to 'val'
to prevent the variables from being misused.

files:
M Parser/asdl_c.py
M Python/Python-ast.c

diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index 2bbd5a0f3c0..08353a9e7f5 100755
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -509,8 +509,8 @@ def visitField(self, field, name, sum=None, prod=None, depth=0):
                 self.emit("%s = asdl_seq_new(len, arena);" % field.name, depth+1)
             self.emit("if (%s == NULL) goto failed;" % field.name, depth+1)
             self.emit("for (i = 0; i < len; i++) {", depth+1)
-            self.emit("%s value;" % ctype, depth+2)
-            self.emit("res = obj2ast_%s(PyList_GET_ITEM(tmp, i), &value, arena);" %
+            self.emit("%s val;" % ctype, depth+2)
+            self.emit("res = obj2ast_%s(PyList_GET_ITEM(tmp, i), &val, arena);" %
                       field.type, depth+2, reflow=False)
             self.emit("if (res != 0) goto failed;", depth+2)
             self.emit("if (len != PyList_GET_SIZE(tmp)) {", depth+2)
@@ -520,7 +520,7 @@ def visitField(self, field, name, sum=None, prod=None, depth=0):
                       depth+3, reflow=False)
             self.emit("goto failed;", depth+3)
             self.emit("}", depth+2)
-            self.emit("asdl_seq_SET(%s, i, value);" % field.name, depth+2)
+            self.emit("asdl_seq_SET(%s, i, val);" % field.name, depth+2)
             self.emit("}", depth+1)
         else:
             self.emit("res = obj2ast_%s(tmp, &%s, arena);" %
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index 28c95b0638f..4ac5cf578fb 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -3348,14 +3348,14 @@ obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
                         body = asdl_seq_new(len, arena);
                         if (body == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Module field \"body\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(body, i, value);
+                                asdl_seq_SET(body, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -3388,14 +3388,14 @@ obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
                         body = asdl_seq_new(len, arena);
                         if (body == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Interactive field \"body\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(body, i, value);
+                                asdl_seq_SET(body, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -3451,14 +3451,14 @@ obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
                         body = asdl_seq_new(len, arena);
                         if (body == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Suite field \"body\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(body, i, value);
+                                asdl_seq_SET(body, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -3564,14 +3564,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         body = asdl_seq_new(len, arena);
                         if (body == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "FunctionDef field \"body\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(body, i, value);
+                                asdl_seq_SET(body, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -3593,14 +3593,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         decorator_list = asdl_seq_new(len, arena);
                         if (decorator_list == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                expr_ty value;
-                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                                expr_ty val;
+                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "FunctionDef field \"decorator_list\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(decorator_list, i, value);
+                                asdl_seq_SET(decorator_list, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -3649,14 +3649,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         bases = asdl_seq_new(len, arena);
                         if (bases == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                expr_ty value;
-                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                                expr_ty val;
+                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"bases\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(bases, i, value);
+                                asdl_seq_SET(bases, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -3678,14 +3678,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         body = asdl_seq_new(len, arena);
                         if (body == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"body\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(body, i, value);
+                                asdl_seq_SET(body, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -3707,14 +3707,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         decorator_list = asdl_seq_new(len, arena);
                         if (decorator_list == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                expr_ty value;
-                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                                expr_ty val;
+                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"decorator_list\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(decorator_list, i, value);
+                                asdl_seq_SET(decorator_list, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -3770,14 +3770,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         targets = asdl_seq_new(len, arena);
                         if (targets == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                expr_ty value;
-                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                                expr_ty val;
+                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Delete field \"targets\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(targets, i, value);
+                                asdl_seq_SET(targets, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -3811,14 +3811,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         targets = asdl_seq_new(len, arena);
                         if (targets == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                expr_ty value;
-                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                                expr_ty val;
+                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Assign field \"targets\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(targets, i, value);
+                                asdl_seq_SET(targets, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -3925,14 +3925,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         values = asdl_seq_new(len, arena);
                         if (values == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                expr_ty value;
-                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                                expr_ty val;
+                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Print field \"values\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(values, i, value);
+                                asdl_seq_SET(values, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4004,14 +4004,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         body = asdl_seq_new(len, arena);
                         if (body == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "For field \"body\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(body, i, value);
+                                asdl_seq_SET(body, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4033,14 +4033,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         orelse = asdl_seq_new(len, arena);
                         if (orelse == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "For field \"orelse\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(orelse, i, value);
+                                asdl_seq_SET(orelse, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4088,14 +4088,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         body = asdl_seq_new(len, arena);
                         if (body == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "While field \"body\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(body, i, value);
+                                asdl_seq_SET(body, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4117,14 +4117,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         orelse = asdl_seq_new(len, arena);
                         if (orelse == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "While field \"orelse\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(orelse, i, value);
+                                asdl_seq_SET(orelse, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4171,14 +4171,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         body = asdl_seq_new(len, arena);
                         if (body == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "If field \"body\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(body, i, value);
+                                asdl_seq_SET(body, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4200,14 +4200,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         orelse = asdl_seq_new(len, arena);
                         if (orelse == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "If field \"orelse\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(orelse, i, value);
+                                asdl_seq_SET(orelse, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4265,14 +4265,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         body = asdl_seq_new(len, arena);
                         if (body == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "With field \"body\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(body, i, value);
+                                asdl_seq_SET(body, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4354,14 +4354,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         body = asdl_seq_new(len, arena);
                         if (body == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "TryExcept field \"body\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(body, i, value);
+                                asdl_seq_SET(body, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4383,14 +4383,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         handlers = asdl_seq_new(len, arena);
                         if (handlers == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                excepthandler_ty value;
-                                res = obj2ast_excepthandler(PyList_GET_ITEM(tmp, i), &value, arena);
+                                excepthandler_ty val;
+                                res = obj2ast_excepthandler(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "TryExcept field \"handlers\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(handlers, i, value);
+                                asdl_seq_SET(handlers, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4412,14 +4412,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         orelse = asdl_seq_new(len, arena);
                         if (orelse == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "TryExcept field \"orelse\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(orelse, i, value);
+                                asdl_seq_SET(orelse, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4454,14 +4454,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         body = asdl_seq_new(len, arena);
                         if (body == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "TryFinally field \"body\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(body, i, value);
+                                asdl_seq_SET(body, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4483,14 +4483,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         finalbody = asdl_seq_new(len, arena);
                         if (finalbody == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "TryFinally field \"finalbody\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(finalbody, i, value);
+                                asdl_seq_SET(finalbody, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4558,14 +4558,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         names = asdl_seq_new(len, arena);
                         if (names == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                alias_ty value;
-                                res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &value, arena);
+                                alias_ty val;
+                                res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Import field \"names\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(names, i, value);
+                                asdl_seq_SET(names, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4611,14 +4611,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         names = asdl_seq_new(len, arena);
                         if (names == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                alias_ty value;
-                                res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &value, arena);
+                                alias_ty val;
+                                res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "ImportFrom field \"names\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(names, i, value);
+                                asdl_seq_SET(names, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4710,14 +4710,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
                         names = asdl_seq_new(len, arena);
                         if (names == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                identifier value;
-                                res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &value, arena);
+                                identifier val;
+                                res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Global field \"names\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(names, i, value);
+                                asdl_seq_SET(names, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -4862,14 +4862,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
                         values = asdl_seq_new(len, arena);
                         if (values == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                expr_ty value;
-                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                                expr_ty val;
+                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "BoolOp field \"values\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(values, i, value);
+                                asdl_seq_SET(values, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -5073,14 +5073,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
                         keys = asdl_seq_new(len, arena);
                         if (keys == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                expr_ty value;
-                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                                expr_ty val;
+                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Dict field \"keys\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(keys, i, value);
+                                asdl_seq_SET(keys, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -5102,14 +5102,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
                         values = asdl_seq_new(len, arena);
                         if (values == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                expr_ty value;
-                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                                expr_ty val;
+                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Dict field \"values\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(values, i, value);
+                                asdl_seq_SET(values, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -5142,14 +5142,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
                         elts = asdl_seq_new(len, arena);
                         if (elts == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                expr_ty value;
-                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                                expr_ty val;
+                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Set field \"elts\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(elts, i, value);
+                                asdl_seq_SET(elts, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -5195,14 +5195,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
                         generators = asdl_seq_new(len, arena);
                         if (generators == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                comprehension_ty value;
-                                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+                                comprehension_ty val;
+                                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "ListComp field \"generators\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(generators, i, value);
+                                asdl_seq_SET(generators, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -5248,14 +5248,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
                         generators = asdl_seq_new(len, arena);
                         if (generators == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                comprehension_ty value;
-                                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+                                comprehension_ty val;
+                                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "SetComp field \"generators\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(generators, i, value);
+                                asdl_seq_SET(generators, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -5314,14 +5314,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
                         generators = asdl_seq_new(len, arena);
                         if (generators == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                comprehension_ty value;
-                                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+                                comprehension_ty val;
+                                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "DictComp field \"generators\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(generators, i, value);
+                                asdl_seq_SET(generators, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -5368,14 +5368,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
                         generators = asdl_seq_new(len, arena);
                         if (generators == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                comprehension_ty value;
-                                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+                                comprehension_ty val;
+                                res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "GeneratorExp field \"generators\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(generators, i, value);
+                                asdl_seq_SET(generators, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -5444,14 +5444,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
                         ops = asdl_int_seq_new(len, arena);
                         if (ops == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                cmpop_ty value;
-                                res = obj2ast_cmpop(PyList_GET_ITEM(tmp, i), &value, arena);
+                                cmpop_ty val;
+                                res = obj2ast_cmpop(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Compare field \"ops\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(ops, i, value);
+                                asdl_seq_SET(ops, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -5473,14 +5473,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
                         comparators = asdl_seq_new(len, arena);
                         if (comparators == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                expr_ty value;
-                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                                expr_ty val;
+                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Compare field \"comparators\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(comparators, i, value);
+                                asdl_seq_SET(comparators, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -5530,14 +5530,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
                         args = asdl_seq_new(len, arena);
                         if (args == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                expr_ty value;
-                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                                expr_ty val;
+                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Call field \"args\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(args, i, value);
+                                asdl_seq_SET(args, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -5559,14 +5559,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
                         keywords = asdl_seq_new(len, arena);
                         if (keywords == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                keyword_ty value;
-                                res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &value, arena);
+                                keyword_ty val;
+                                res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Call field \"keywords\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(keywords, i, value);
+                                asdl_seq_SET(keywords, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -5826,14 +5826,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
                         elts = asdl_seq_new(len, arena);
                         if (elts == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                expr_ty value;
-                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                                expr_ty val;
+                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "List field \"elts\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(elts, i, value);
+                                asdl_seq_SET(elts, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -5879,14 +5879,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
                         elts = asdl_seq_new(len, arena);
                         if (elts == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                expr_ty value;
-                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                                expr_ty val;
+                                res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "Tuple field \"elts\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(elts, i, value);
+                                asdl_seq_SET(elts, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -6070,14 +6070,14 @@ obj2ast_slice(PyObject* obj, slice_ty* out, PyArena* arena)
                         dims = asdl_seq_new(len, arena);
                         if (dims == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                slice_ty value;
-                                res = obj2ast_slice(PyList_GET_ITEM(tmp, i), &value, arena);
+                                slice_ty val;
+                                res = obj2ast_slice(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "ExtSlice field \"dims\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(dims, i, value);
+                                asdl_seq_SET(dims, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -6451,14 +6451,14 @@ obj2ast_comprehension(PyObject* obj, comprehension_ty* out, PyArena* arena)
                 ifs = asdl_seq_new(len, arena);
                 if (ifs == NULL) goto failed;
                 for (i = 0; i < len; i++) {
-                        expr_ty value;
-                        res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                        expr_ty val;
+                        res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                         if (res != 0) goto failed;
                         if (len != PyList_GET_SIZE(tmp)) {
                                 PyErr_SetString(PyExc_RuntimeError, "comprehension field \"ifs\" changed size during iteration");
                                 goto failed;
                         }
-                        asdl_seq_SET(ifs, i, value);
+                        asdl_seq_SET(ifs, i, val);
                 }
                 Py_XDECREF(tmp);
                 tmp = NULL;
@@ -6555,14 +6555,14 @@ obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena)
                         body = asdl_seq_new(len, arena);
                         if (body == NULL) goto failed;
                         for (i = 0; i < len; i++) {
-                                stmt_ty value;
-                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                stmt_ty val;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
                                 if (res != 0) goto failed;
                                 if (len != PyList_GET_SIZE(tmp)) {
                                         PyErr_SetString(PyExc_RuntimeError, "ExceptHandler field \"body\" changed size during iteration");
                                         goto failed;
                                 }
-                                asdl_seq_SET(body, i, value);
+                                asdl_seq_SET(body, i, val);
                         }
                         Py_XDECREF(tmp);
                         tmp = NULL;
@@ -6607,14 +6607,14 @@ obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
                 args = asdl_seq_new(len, arena);
                 if (args == NULL) goto failed;
                 for (i = 0; i < len; i++) {
-                        expr_ty value;
-                        res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                        expr_ty val;
+                        res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                         if (res != 0) goto failed;
                         if (len != PyList_GET_SIZE(tmp)) {
                                 PyErr_SetString(PyExc_RuntimeError, "arguments field \"args\" changed size during iteration");
                                 goto failed;
                         }
-                        asdl_seq_SET(args, i, value);
+                        asdl_seq_SET(args, i, val);
                 }
                 Py_XDECREF(tmp);
                 tmp = NULL;
@@ -6658,14 +6658,14 @@ obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
                 defaults = asdl_seq_new(len, arena);
                 if (defaults == NULL) goto failed;
                 for (i = 0; i < len; i++) {
-                        expr_ty value;
-                        res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+                        expr_ty val;
+                        res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
                         if (res != 0) goto failed;
                         if (len != PyList_GET_SIZE(tmp)) {
                                 PyErr_SetString(PyExc_RuntimeError, "arguments field \"defaults\" changed size during iteration");
                                 goto failed;
                         }
-                        asdl_seq_SET(defaults, i, value);
+                        asdl_seq_SET(defaults, i, val);
                 }
                 Py_XDECREF(tmp);
                 tmp = NULL;


From webhook-mailer at python.org  Fri Aug  4 14:21:42 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Fri, 04 Aug 2017 18:21:42 -0000
Subject: [Python-checkins] Add author of the fix for #30841 to ACKS. (#3001)
Message-ID: <mailman.39.1501870903.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/8238ef0467f210146a7aecfdc52dbe703d3e190d
commit: 8238ef0467f210146a7aecfdc52dbe703d3e190d
branch: master
author: ?ukasz Langa <lukasz at langa.pl>
committer: GitHub <noreply at github.com>
date: 2017-08-04T11:21:37-07:00
summary:

Add author of the fix for #30841 to ACKS. (#3001)

files:
M Misc/ACKS

diff --git a/Misc/ACKS b/Misc/ACKS
index ec7d481a587..e340392d8e1 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -273,6 +273,7 @@ Adal Chiriliuc
 Matt Chisholm
 Lita Cho
 Sayan Chowdhury
+Yuan-Chao Chou
 Anders Chrigstr?m
 Tom Christiansen
 Renee Chu


From lp_benchmark_robot at intel.com  Fri Aug  4 16:58:00 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Fri, 4 Aug 2017 13:58:00 -0700
Subject: [Python-checkins] [1 down, 1 up,
 63 flat] Results for Python (master branch) 2017-08-04
Message-ID: <ebbfe6f1-3aa5-4dd2-a726-c1e3e101e79f@orsmsx155.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-04 03:03:31-07:00.
  - commit:		c4c9866
  - previous commit:	5075416
  - revision date:	2017-08-04 11:45:00+03:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.098% |  -0.312%   |  +3.941%   |  +8.632%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 0.942% |  -0.179%   |  +22.114%  |  +10.972%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 2.203% |  +0.067%   |  +23.825%  |  +10.472%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.777% |  -0.778%   |  +20.991%  |  +11.948%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.700% |  -3.094%   |  +2.761%   |  +15.830%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.511% |  -0.828%   |  +10.899%  |  +11.437%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 1.436% |  -1.479%   |  +6.284%   |  +12.922%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.498% |  +0.103%   |  +4.534%   |  +5.309%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.161% |  -3.358%   |  +6.894%   |  +20.441%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.578% |  -1.291%   |  +8.711%   |  +14.295%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.214% |  +1.289%   |  +4.425%   |  +6.275%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.683% |  -1.881%   |  +4.817%   |  +5.438%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.789% |  -1.443%   |  +3.054%   |  +6.299%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.230% |  -0.331%   |  +9.005%   |  +11.309%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.851% |  -2.366%   |  +6.285%   |  +11.557%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.691% |  -1.098%   |  +6.079%   |  +11.582%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 1.372% |  -0.472%   |  +8.849%   |  +13.336%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.512% |  -2.107%   |  +6.998%   |  +11.236%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 2.509% |  -0.777%   |  +3.853%   |  +9.696%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 2.707% |  -2.053%   |  +2.678%   |  +9.946%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.696% |  -0.378%   |  +8.131%   |  +12.713%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 3.075% |  -1.261%   |  +46.839%  |  +12.069%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.450% |  -0.130%   |  +9.498%   |  +13.759%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.385% |  -0.759%   |  +18.945%  |  +11.979%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 5.324% |  +5.374%   |  +6.136%   |  +13.424%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.169% |  -0.212%   |  +3.939%   |  +5.915%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.579% |  +0.232%   |  -2.057%   |  +4.325%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 1.095% |  -1.086%   |  +2.828%   |  +7.474%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |                 pathlib| 1.252% |  +6.322%   |  +5.502%   |  +9.363%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 2.859% |  -0.061%   |  +1.674%   |  +23.657%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( |             pickle_dict| 0.760% |  -2.342%   |  +2.451%   |  +22.887%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.908% |  -0.311%   |  +4.883%   |  +21.107%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 5.752% |  -2.055%   |  +10.996%  |  +10.386%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.207% |  -0.090%   |  +0.284%   |  +9.547%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.122% |  -0.627%   |  +9.147%   |  +4.747%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.090% |  -0.597%   |  +0.898%   |  +4.531%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.238% |  -1.033%   |  +9.569%   |  +14.639%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.832% |  -1.647%   |  -10.677%  |  +14.140%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.989% |  -0.568%   |  +1.479%   |  +9.552%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.286% |  +0.378%   |  +0.691%   |  +3.810%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 0.701% |  +0.061%   |  +11.442%  |  +4.773%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.282% |  +0.523%   |  +7.896%   |  +15.522%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.773% |  +0.828%   |  +0.687%   |  +4.451%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 2.791% |  -1.504%   |  +26.731%  |  +9.549%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.243% |  -3.620%   |  +2.383%   |  +9.022%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 1.741% |  -2.898%   |  +13.119%  |  +11.079%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 0.516% |  -0.970%   |  -0.220%   |  +2.584%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.374% |  +0.611%   |  +5.748%   |  +3.244%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.304% |  -0.281%   |  +5.042%   |  +9.123%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.536% |  -0.295%   |  +4.976%   |  +4.929%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.608% |  -0.474%   |  +2.167%   |  +7.475%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.247% |  -0.149%   |  +12.537%  |  +8.284%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.998% |  -0.790%   |  +9.926%   |  +7.557%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.684% |  -0.014%   |  +12.213%  |  +9.730%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.423% |  -0.771%   |  +13.288%  |  +10.747%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 2.661% |  +0.288%   |  +24.257%  |  +9.238%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.075% |  -0.132%   |  +5.622%   |  +7.188%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.308% |  +0.775%   |  +0.619%   |  -0.366%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 8.083% |  -2.553%   |  +8.699%   |  +20.365%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.529% |  +0.455%   |  -2.182%   |  +18.109%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 2.017% |  -0.613%   |  +6.870%   |  +7.464%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.058% |  +0.223%   |  +5.926%   |  +9.202%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.178% |  +0.013%   |  +1.833%   |  +6.274%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 1.649% |  +0.330%   |  -5.450%   |  +11.999%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.242% |  -0.048%   |  +6.372%   |  +9.041%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/1-down-1-up-63-flat-results-for-python-master-branch-2017-08-04

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Fri Aug  4 17:14:35 2017
From: webhook-mailer at python.org (Brett Cannon)
Date: Fri, 04 Aug 2017 21:14:35 -0000
Subject: [Python-checkins] Notify the import-team on import-related PRs
 (GH-3002)
Message-ID: <mailman.40.1501881276.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/d255fea7c7cf91f589003a997ad38c7f4c0825a9
commit: d255fea7c7cf91f589003a997ad38c7f4c0825a9
branch: master
author: Brett Cannon <brettcannon at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-08-04T14:14:32-07:00
summary:

Notify the import-team on import-related PRs (GH-3002)

files:
M .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1c5164f6640..550c9564fca 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -15,7 +15,7 @@
 **/*pyhash*                   @tiran
 
 # Import (including importlib)
-**/*import*                   @brettcannon
+**/*import*                   @python/import-team
 
 # SSL
 **/*ssl*                      @tiran


From webhook-mailer at python.org  Fri Aug  4 22:00:09 2017
From: webhook-mailer at python.org (Gregory P. Smith)
Date: Sat, 05 Aug 2017 02:00:09 -0000
Subject: [Python-checkins] add myself to CODEOWNERS for subprocess. (#3005)
Message-ID: <mailman.41.1501898410.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/60a6632a3d2b2dde1c01850f0aa36a22c8dec8dd
commit: 60a6632a3d2b2dde1c01850f0aa36a22c8dec8dd
branch: master
author: Gregory P. Smith <greg at krypto.org>
committer: GitHub <noreply at github.com>
date: 2017-08-04T20:00:06-06:00
summary:

add myself to CODEOWNERS for subprocess. (#3005)

files:
M .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 550c9564fca..cdb9feee57b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -26,3 +26,6 @@
 **/*mime*                     @bitdancer
 **/*imap*                     @bitdancer
 **/*poplib*                   @bitdancer
+
+# subprocess
+**/*subprocess*               @gpshead


From solipsis at pitrou.net  Sat Aug  5 05:08:21 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 05 Aug 2017 09:08:21 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=15
Message-ID: <20170805090821.74578.6F8D6D04B0717C8A@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_asyncio leaked [3, 0, 0] memory blocks, sum=3
test_collections leaked [7, -7, 8] memory blocks, sum=8
test_functools leaked [0, 3, 1] memory blocks, sum=4


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogf5PHBi', '--timeout', '7200']

From webhook-mailer at python.org  Sat Aug  5 11:01:14 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sat, 05 Aug 2017 15:01:14 -0000
Subject: [Python-checkins] [3.6] bpo-31107: Fix copyreg mangled slot names
 calculation. (GH-2989) (#3003)
Message-ID: <mailman.42.1501945275.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/4795ba857ef2a89e6b477285df961672106a1792
commit: 4795ba857ef2a89e6b477285df961672106a1792
branch: 3.6
author: Shane Harvey <shane.harvey at mongodb.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-05T18:01:10+03:00
summary:

[3.6] bpo-31107: Fix copyreg mangled slot names calculation. (GH-2989) (#3003)

(cherry picked from commit c4c9866064f03646c686d7e08b00aeb203c35c19)

files:
A Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst
M Lib/copyreg.py
M Lib/test/test_copyreg.py
M Misc/ACKS

diff --git a/Lib/copyreg.py b/Lib/copyreg.py
index 67f5bb029ee..cef9984b192 100644
--- a/Lib/copyreg.py
+++ b/Lib/copyreg.py
@@ -128,7 +128,11 @@ class found there.  (This assumes classes don't modify their
                         continue
                     # mangled names
                     elif name.startswith('__') and not name.endswith('__'):
-                        names.append('_%s%s' % (c.__name__, name))
+                        stripped = c.__name__.lstrip('_')
+                        if stripped:
+                            names.append('_%s%s' % (stripped, name))
+                        else:
+                            names.append(name)
                     else:
                         names.append(name)
 
diff --git a/Lib/test/test_copyreg.py b/Lib/test/test_copyreg.py
index 52e887cb36c..e3f1cd81aab 100644
--- a/Lib/test/test_copyreg.py
+++ b/Lib/test/test_copyreg.py
@@ -16,6 +16,12 @@ class WithWeakref(object):
 class WithPrivate(object):
     __slots__ = ('__spam',)
 
+class _WithLeadingUnderscoreAndPrivate(object):
+    __slots__ = ('__spam',)
+
+class ___(object):
+    __slots__ = ('__spam',)
+
 class WithSingleString(object):
     __slots__ = 'spam'
 
@@ -104,6 +110,10 @@ def test_slotnames(self):
         self.assertEqual(copyreg._slotnames(WithWeakref), [])
         expected = ['_WithPrivate__spam']
         self.assertEqual(copyreg._slotnames(WithPrivate), expected)
+        expected = ['_WithLeadingUnderscoreAndPrivate__spam']
+        self.assertEqual(copyreg._slotnames(_WithLeadingUnderscoreAndPrivate),
+                         expected)
+        self.assertEqual(copyreg._slotnames(___), ['__spam'])
         self.assertEqual(copyreg._slotnames(WithSingleString), ['spam'])
         expected = ['eggs', 'spam']
         expected.sort()
diff --git a/Misc/ACKS b/Misc/ACKS
index 7bc13ff0c9e..20e174384ba 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -592,6 +592,7 @@ David Harrigan
 Brian Harring
 Jonathan Hartley
 Travis B. Hartwell
+Shane Harvey
 Larry Hastings
 Tim Hatch
 Shane Hathaway
diff --git a/Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst b/Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst
new file mode 100644
index 00000000000..3c2a15528d8
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst
@@ -0,0 +1,2 @@
+Fix `copyreg._slotnames()` mangled attribute calculation for classes whose
+name begins with an underscore. Patch by Shane Harvey.


From webhook-mailer at python.org  Sat Aug  5 11:03:04 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sat, 05 Aug 2017 15:03:04 -0000
Subject: [Python-checkins] [2.7] bpo-31107: Fix copyreg mangled slot names
 calculation. (GH-2989). (#3004)
Message-ID: <mailman.43.1501945386.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/88ffff5ddbb8692ecb2c661aa29000dbde9eff8c
commit: 88ffff5ddbb8692ecb2c661aa29000dbde9eff8c
branch: 2.7
author: Shane Harvey <shane.harvey at mongodb.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-05T18:03:01+03:00
summary:

[2.7] bpo-31107: Fix copyreg mangled slot names calculation. (GH-2989). (#3004)

(cherry picked from commit c4c9866064f03646c686d7e08b00aeb203c35c19)

files:
A Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst
M Lib/copy_reg.py
M Lib/test/test_copy_reg.py
M Misc/ACKS

diff --git a/Lib/copy_reg.py b/Lib/copy_reg.py
index db1715092c5..8943077593d 100644
--- a/Lib/copy_reg.py
+++ b/Lib/copy_reg.py
@@ -127,7 +127,11 @@ class found there.  (This assumes classes don't modify their
                         continue
                     # mangled names
                     elif name.startswith('__') and not name.endswith('__'):
-                        names.append('_%s%s' % (c.__name__, name))
+                        stripped = c.__name__.lstrip('_')
+                        if stripped:
+                            names.append('_%s%s' % (stripped, name))
+                        else:
+                            names.append(name)
                     else:
                         names.append(name)
 
diff --git a/Lib/test/test_copy_reg.py b/Lib/test/test_copy_reg.py
index 8cdb8b7d2ab..17ccbd084d6 100644
--- a/Lib/test/test_copy_reg.py
+++ b/Lib/test/test_copy_reg.py
@@ -17,6 +17,12 @@ class WithWeakref(object):
 class WithPrivate(object):
     __slots__ = ('__spam',)
 
+class _WithLeadingUnderscoreAndPrivate(object):
+    __slots__ = ('__spam',)
+
+class ___(object):
+    __slots__ = ('__spam',)
+
 class WithSingleString(object):
     __slots__ = 'spam'
 
@@ -105,6 +111,10 @@ def test_slotnames(self):
         self.assertEqual(copy_reg._slotnames(WithWeakref), [])
         expected = ['_WithPrivate__spam']
         self.assertEqual(copy_reg._slotnames(WithPrivate), expected)
+        expected = ['_WithLeadingUnderscoreAndPrivate__spam']
+        self.assertEqual(copy_reg._slotnames(_WithLeadingUnderscoreAndPrivate),
+                         expected)
+        self.assertEqual(copy_reg._slotnames(___), ['__spam'])
         self.assertEqual(copy_reg._slotnames(WithSingleString), ['spam'])
         expected = ['eggs', 'spam']
         expected.sort()
diff --git a/Misc/ACKS b/Misc/ACKS
index 662db9f40f7..229a874ffc2 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -543,6 +543,7 @@ David Harrigan
 Brian Harring
 Jonathan Hartley
 Travis B. Hartwell
+Shane Harvey
 Larry Hastings
 Tim Hatch
 Shane Hathaway
diff --git a/Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst b/Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst
new file mode 100644
index 00000000000..09807058b4c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst
@@ -0,0 +1,2 @@
+Fix `copy_reg._slotnames()` mangled attribute calculation for classes whose
+name begins with an underscore. Patch by Shane Harvey.


From webhook-mailer at python.org  Sat Aug  5 14:28:20 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sat, 05 Aug 2017 18:28:20 -0000
Subject: [Python-checkins] bpo-31029: test_tokenize Add missing import
 unittest (#2998)
Message-ID: <mailman.44.1501957701.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/9cd0ef8f3b93818f0ee5318cb1fc9a1ea32e95b6
commit: 9cd0ef8f3b93818f0ee5318cb1fc9a1ea32e95b6
branch: 3.6
author: Rajath Agasthya <rajathagasthya at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-05T21:28:17+03:00
summary:

bpo-31029: test_tokenize Add missing import unittest (#2998)

files:
M Lib/test/test_tokenize.py

diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 5a81a5f11a4..10e0ad80779 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -3,6 +3,7 @@
                      STRING, ENDMARKER, ENCODING, tok_name, detect_encoding,
                      open as tokenize_open, Untokenizer)
 from io import BytesIO
+import unittest
 from unittest import TestCase, mock
 from test.test_grammar import (VALID_UNDERSCORE_LITERALS,
                                INVALID_UNDERSCORE_LITERALS)


From solipsis at pitrou.net  Sun Aug  6 05:07:10 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 06 Aug 2017 09:07:10 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=11
Message-ID: <20170806090710.105420.54BDEA85F6482E4A@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [0, 0, 7] memory blocks, sum=7
test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_spawn leaked [-2, 1, 1] memory blocks, sum=0


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogDZJc6Q', '--timeout', '7200']

From webhook-mailer at python.org  Sun Aug  6 13:32:42 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Sun, 06 Aug 2017 17:32:42 -0000
Subject: [Python-checkins] [3.6] bpo-30808: Use _Py_atomic API for
 concurrency-sensitive signal state (GH-2417) (#3007)
Message-ID: <mailman.45.1502040764.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/57e836cb41656ac23042886db6b5985c036a7ce2
commit: 57e836cb41656ac23042886db6b5985c036a7ce2
branch: 3.6
author: Antoine Pitrou <pitrou at free.fr>
committer: GitHub <noreply at github.com>
date: 2017-08-06T19:32:39+02:00
summary:

[3.6] bpo-30808: Use _Py_atomic API for concurrency-sensitive signal state (GH-2417) (#3007)

* Improve signal delivery

Avoid using Py_AddPendingCall from signal handler, to avoid calling signal-unsafe functions.

* Remove unused function

* Improve comments

* Use _Py_atomic API for concurrency-sensitive signal state

* Add blurb
(cherry picked from commit 2c8a5e4c968217f9672340e520942c4ed788d8de)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-07-17-12-12-59.bpo-30808.bA3zOv.rst
M Modules/signalmodule.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-07-17-12-12-59.bpo-30808.bA3zOv.rst b/Misc/NEWS.d/next/Core and Builtins/2017-07-17-12-12-59.bpo-30808.bA3zOv.rst
new file mode 100644
index 00000000000..8adbbe7dc3a
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-07-17-12-12-59.bpo-30808.bA3zOv.rst	
@@ -0,0 +1 @@
+Use _Py_atomic API for concurrency-sensitive signal state.
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index 30990f89c3e..0e6099fd361 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -93,7 +93,7 @@ static pid_t main_pid;
 #endif
 
 static volatile struct {
-    sig_atomic_t tripped;
+    _Py_atomic_int tripped;
     PyObject *func;
 } Handlers[NSIG];
 
@@ -113,7 +113,7 @@ static volatile sig_atomic_t wakeup_fd = -1;
 #endif
 
 /* Speed up sigcheck() when none tripped */
-static volatile sig_atomic_t is_tripped = 0;
+static _Py_atomic_int is_tripped;
 
 static PyObject *DefaultHandler;
 static PyObject *IgnoreHandler;
@@ -240,11 +240,13 @@ trip_signal(int sig_num)
     int fd;
     Py_ssize_t rc;
 
-    Handlers[sig_num].tripped = 1;
+    _Py_atomic_store_relaxed(&Handlers[sig_num].tripped, 1);
 
     /* Set is_tripped after setting .tripped, as it gets
        cleared in PyErr_CheckSignals() before .tripped. */
-    is_tripped = 1;
+    _Py_atomic_store(&is_tripped, 1);
+
+    /* Notify ceval.c */
     _PyEval_SignalReceived();
 
     /* And then write to the wakeup fd *after* setting all the globals and
@@ -465,7 +467,7 @@ signal_signal_impl(PyObject *module, int signalnum, PyObject *handler)
         return NULL;
     }
     old_handler = Handlers[signalnum].func;
-    Handlers[signalnum].tripped = 0;
+    _Py_atomic_store_relaxed(&Handlers[signalnum].tripped, 0);
     Py_INCREF(handler);
     Handlers[signalnum].func = handler;
     if (old_handler != NULL)
@@ -1264,11 +1266,11 @@ PyInit__signal(void)
         goto finally;
     Py_INCREF(IntHandler);
 
-    Handlers[0].tripped = 0;
+    _Py_atomic_store_relaxed(&Handlers[0].tripped, 0);
     for (i = 1; i < NSIG; i++) {
         void (*t)(int);
         t = PyOS_getsig(i);
-        Handlers[i].tripped = 0;
+        _Py_atomic_store_relaxed(&Handlers[i].tripped, 0);
         if (t == SIG_DFL)
             Handlers[i].func = DefaultHandler;
         else if (t == SIG_IGN)
@@ -1492,7 +1494,7 @@ finisignal(void)
 
     for (i = 1; i < NSIG; i++) {
         func = Handlers[i].func;
-        Handlers[i].tripped = 0;
+        _Py_atomic_store_relaxed(&Handlers[i].tripped, 0);
         Handlers[i].func = NULL;
         if (i != SIGINT && func != NULL && func != Py_None &&
             func != DefaultHandler && func != IgnoreHandler)
@@ -1513,7 +1515,7 @@ PyErr_CheckSignals(void)
     int i;
     PyObject *f;
 
-    if (!is_tripped)
+    if (!_Py_atomic_load(&is_tripped))
         return 0;
 
 #ifdef WITH_THREAD
@@ -1535,16 +1537,16 @@ PyErr_CheckSignals(void)
      *       we receive a signal i after we zero is_tripped and before we
      *       check Handlers[i].tripped.
      */
-    is_tripped = 0;
+    _Py_atomic_store(&is_tripped, 0);
 
     if (!(f = (PyObject *)PyEval_GetFrame()))
         f = Py_None;
 
     for (i = 1; i < NSIG; i++) {
-        if (Handlers[i].tripped) {
+        if (_Py_atomic_load_relaxed(&Handlers[i].tripped)) {
             PyObject *result = NULL;
             PyObject *arglist = Py_BuildValue("(iO)", i, f);
-            Handlers[i].tripped = 0;
+            _Py_atomic_store_relaxed(&Handlers[i].tripped, 0);
 
             if (arglist) {
                 result = PyEval_CallObject(Handlers[i].func,
@@ -1552,7 +1554,7 @@ PyErr_CheckSignals(void)
                 Py_DECREF(arglist);
             }
             if (!result) {
-                is_tripped = 1;
+                _Py_atomic_store(&is_tripped, 1);
                 return -1;
             }
 
@@ -1591,12 +1593,12 @@ PyOS_FiniInterrupts(void)
 int
 PyOS_InterruptOccurred(void)
 {
-    if (Handlers[SIGINT].tripped) {
+    if (_Py_atomic_load_relaxed(&Handlers[SIGINT].tripped)) {
 #ifdef WITH_THREAD
         if (PyThread_get_thread_ident() != main_thread)
             return 0;
 #endif
-        Handlers[SIGINT].tripped = 0;
+        _Py_atomic_store_relaxed(&Handlers[SIGINT].tripped, 0);
         return 1;
     }
     return 0;
@@ -1606,11 +1608,11 @@ static void
 _clear_pending_signals(void)
 {
     int i;
-    if (!is_tripped)
+    if (!_Py_atomic_load(&is_tripped))
         return;
-    is_tripped = 0;
+    _Py_atomic_store(&is_tripped, 0);
     for (i = 1; i < NSIG; ++i) {
-        Handlers[i].tripped = 0;
+        _Py_atomic_store_relaxed(&Handlers[i].tripped, 0);
     }
 }
 


From webhook-mailer at python.org  Mon Aug  7 04:27:24 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 07 Aug 2017 08:27:24 -0000
Subject: [Python-checkins] bpo-31045: Language switch (#2652)
Message-ID: <mailman.46.1502094446.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/dff9b5f9d62aa0b23f8a255867d09d11890efd1b
commit: dff9b5f9d62aa0b23f8a255867d09d11890efd1b
branch: master
author: Julien <github at mandark.fr>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-08-07T10:27:21+02:00
summary:

bpo-31045: Language switch (#2652)

* Doc: Indicate the language

* Renaming version_switcher to switchers (to add language_switcher).

* Adding language switch.

* Doc switchers: Enhance readability of regex parsing versions.

* Doc switchers: Desambiguate the need of a replace(/\/+$/g, '') by proper naming.

* Doc switchers: py3k can't reach js, it's redirected server-side by nginx.

* Doc switchers: Examples matching actual regexes.

* Doc switchers: Better fallback on unexisting translated version.

files:
A Doc/tools/static/switchers.js
D Doc/tools/static/version_switch.js
M Doc/Makefile
M Doc/tools/templates/layout.html

diff --git a/Doc/Makefile b/Doc/Makefile
index ae59f3294f1..526269d1e19 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -167,12 +167,12 @@ serve:
 
 # for development releases: always build
 autobuild-dev:
-	make dist SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A versionswitcher=1'
+	make dist SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A switchers=1'
 	-make suspicious
 
 # for quick rebuilds (HTML only)
 autobuild-dev-html:
-	make html SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A versionswitcher=1'
+	make html SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A switchers=1'
 
 # for stable releases: only build if not in pre-release stage (alpha, beta)
 # release candidate downloads are okay, since the stable tree can be in that stage
diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
new file mode 100644
index 00000000000..470ff6d33b7
--- /dev/null
+++ b/Doc/tools/static/switchers.js
@@ -0,0 +1,146 @@
+(function() {
+  'use strict';
+
+  // Parses versions in URL segments like:
+  // "3", "dev", "release/2.7" or "3.6rc2"
+  var version_regexs = [
+    '(?:\\d)',
+    '(?:\\d\\.\\d[\\w\\d\\.]*)',
+    '(?:dev)',
+    '(?:release/\\d.\\d[\\x\\d\\.]*)'];
+
+  var all_versions = {
+    '3.7': 'dev (3.7)',
+    '3.6': '3.6',
+    '3.5': '3.5',
+    '3.4': '3.4',
+    '3.3': '3.3',
+    '2.7': '2.7',
+  };
+
+  var all_languages = {
+      'en': 'English',
+      'fr': 'Fran?ais',
+  };
+
+  function build_version_select(current_version, current_release) {
+    var buf = ['<select>'];
+
+    $.each(all_versions, function(version, title) {
+      buf.push('<option value="' + version + '"');
+      if (version == current_version)
+        buf.push(' selected="selected">' + current_release + '</option>');
+      else
+        buf.push('>' + title + '</option>');
+    });
+
+    buf.push('</select>');
+    return buf.join('');
+  }
+
+  function build_language_select(current_language) {
+    var buf = ['<select>'];
+
+    $.each(all_languages, function(language, title) {
+      if (language == current_language)
+        buf.push('<option value="' + language + '" selected="selected">' +
+                 all_languages[current_language] + '</option>');
+      else
+        buf.push('<option value="' + language + '">' + title + '</option>');
+    });
+    buf.push('</select>');
+    return buf.join('');
+  }
+
+  function navigate_to_first_existing(urls) {
+    // Navigate to the first existing URL in urls.
+    var url = urls.shift();
+    if (urls.length == 0) {
+      window.location.href = url;
+      return;
+    }
+    $.ajax({
+      url: url,
+      success: function() {
+        window.location.href = url;
+      },
+      error: function() {
+        navigate_to_first_existing(urls);
+      }
+    });
+  }
+
+  function on_version_switch() {
+    var selected_version = $(this).children('option:selected').attr('value') + '/';
+    var url = window.location.href;
+    var current_language = language_segment_from_url(url);
+    var current_version = version_segment_in_url(url);
+    var new_url = url.replace('.org/' + current_language + current_version,
+                              '.org/' + current_language + selected_version);
+    if (new_url != url) {
+      navigate_to_first_existing([
+        new_url,
+        url.replace('.org/' + current_language + current_version,
+                    '.org/' + selected_version),
+        'https://docs.python.org/' + current_language + selected_version,
+        'https://docs.python.org/' + selected_version,
+        'https://docs.python.org/'
+      ]);
+    }
+  }
+
+  function on_language_switch() {
+    var selected_language = $(this).children('option:selected').attr('value') + '/';
+    var url = window.location.href;
+    var current_language = language_segment_from_url(url);
+    var current_version = version_segment_in_url(url);
+    if (selected_language == 'en/') // Special 'default' case for english.
+      selected_language = '';
+    var new_url = url.replace('.org/' + current_language + current_version,
+                              '.org/' + selected_language + current_version);
+    if (new_url != url) {
+      navigate_to_first_existing([
+        new_url,
+        'https://docs.python.org/'
+      ]);
+    }
+  }
+
+  // Returns the path segment of the language as a string, like 'fr/'
+  // or '' if not found.
+  function language_segment_from_url(url) {
+    var language_regexp = '\.org/(' + Object.keys(all_languages).join('|') + '/)';
+    var match = url.match(language_regexp);
+    if (match !== null)
+        return match[1];
+    return '';
+  }
+
+  // Returns the path segment of the version as a string, like '3.6/'
+  // or '' if not found.
+  function version_segment_in_url(url) {
+    var language_segment = '(?:(?:' + Object.keys(all_languages).join('|') + ')/)';
+    var version_segment = '(?:(?:' + version_regexs.join('|') + ')/)';
+    var version_regexp = '\\.org/' + language_segment + '?(' + version_segment + ')';
+    var match = url.match(version_regexp);
+    if (match !== null)
+      return match[1];
+    return ''
+  }
+
+  $(document).ready(function() {
+    var release = DOCUMENTATION_OPTIONS.VERSION;
+    var language_segment = language_segment_from_url(window.location.href);
+    var current_language = language_segment.replace(/\/+$/g, '') || 'en';
+    var version = release.substr(0, 3);
+    var version_select = build_version_select(version, release);
+
+    $('.version_switcher_placeholder').html(version_select);
+    $('.version_switcher_placeholder select').bind('change', on_version_switch);
+
+    var language_select = build_language_select(current_language);
+
+    $('.language_switcher_placeholder').html(language_select);
+    $('.language_switcher_placeholder select').bind('change', on_language_switch);
+  });
+})();
diff --git a/Doc/tools/static/version_switch.js b/Doc/tools/static/version_switch.js
deleted file mode 100644
index 8b36a616718..00000000000
--- a/Doc/tools/static/version_switch.js
+++ /dev/null
@@ -1,67 +0,0 @@
-(function() {
-  'use strict';
-
-  var all_versions = {
-    '3.7': 'dev (3.7)',
-    '3.6': '3.6',
-    '3.5': '3.5',
-    '3.4': '3.4',
-    '3.3': '3.3',
-    '2.7': '2.7',
-  };
-
-  function build_select(current_version, current_release) {
-    var buf = ['<select>'];
-
-    $.each(all_versions, function(version, title) {
-      buf.push('<option value="' + version + '"');
-      if (version == current_version)
-        buf.push(' selected="selected">' + current_release + '</option>');
-      else
-        buf.push('>' + title + '</option>');
-    });
-
-    buf.push('</select>');
-    return buf.join('');
-  }
-
-  function patch_url(url, new_version) {
-    var url_re = /\.org\/(\d|py3k|dev|((release\/)?\d\.\d[\w\d\.]*))\//,
-        new_url = url.replace(url_re, '.org/' + new_version + '/');
-
-    if (new_url == url && !new_url.match(url_re)) {
-      // python 2 url without version?
-      new_url = url.replace(/\.org\//, '.org/' + new_version + '/');
-    }
-    return new_url;
-  }
-
-  function on_switch() {
-    var selected = $(this).children('option:selected').attr('value');
-
-    var url = window.location.href,
-        new_url = patch_url(url, selected);
-
-    if (new_url != url) {
-      // check beforehand if url exists, else redirect to version's start page
-      $.ajax({
-        url: new_url,
-        success: function() {
-           window.location.href = new_url;
-        },
-        error: function() {
-           window.location.href = 'https://docs.python.org/' + selected;
-        }
-      });
-    }
-  }
-
-  $(document).ready(function() {
-    var release = DOCUMENTATION_OPTIONS.VERSION;
-    var version = release.substr(0, 3);
-    var select = build_select(version, release);
-
-    $('.version_switcher_placeholder').html(select);
-    $('.version_switcher_placeholder select').bind('change', on_switch);
-  });
-})();
diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html
index 640d8b30493..c2106678ac6 100644
--- a/Doc/tools/templates/layout.html
+++ b/Doc/tools/templates/layout.html
@@ -4,7 +4,8 @@
                  style="vertical-align: middle; margin-top: -1px"/></li>
         <li><a href="https://www.python.org/">Python</a>{{ reldelim1 }}</li>
         <li>
-          {%- if versionswitcher is defined %}
+          {%- if switchers is defined %}
+          <span class="language_switcher_placeholder">{{ language or 'en' }}</span>
           <span class="version_switcher_placeholder">{{ release }}</span>
           <a href="{{ pathto('index') }}">{% trans %}Documentation {% endtrans %}</a>{{ reldelim1 }}
           {%- else %}
@@ -41,7 +42,7 @@
     <link rel="canonical" href="https://docs.python.org/3/{{pagename}}.html" />
     {% if builder != "htmlhelp" %}
     {% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}
-    {% if versionswitcher is defined and not embedded %}<script type="text/javascript" src="{{ pathto('_static/version_switch.js', 1) }}"></script>{% endif %}
+    {% if switchers is defined and not embedded %}<script type="text/javascript" src="{{ pathto('_static/switchers.js', 1) }}"></script>{% endif %}
     {% if pagename == 'whatsnew/changelog' and not embedded %}
     <script type="text/javascript">
       $(document).ready(function() {


From solipsis at pitrou.net  Mon Aug  7 05:06:48 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 07 Aug 2017 09:06:48 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=12
Message-ID: <20170807090647.84291.1506852019EC6EC8@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [7, -7, 8] memory blocks, sum=8
test_functools leaked [0, 3, 1] memory blocks, sum=4


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogABUnjJ', '--timeout', '7200']

From webhook-mailer at python.org  Mon Aug  7 13:37:13 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Mon, 07 Aug 2017 17:37:13 -0000
Subject: [Python-checkins] bpo-29910: IDLE - revert `break`s that disabled
 calltip close. (#2997)
Message-ID: <mailman.47.1502127435.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/89225871d314fa675ea9ac292e7bc75320f1aef5
commit: 89225871d314fa675ea9ac292e7bc75320f1aef5
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-07T13:37:10-04:00
summary:

bpo-29910: IDLE - revert `break`s that disabled calltip close. (#2997)

files:
M Lib/idlelib/parenmatch.py

diff --git a/Lib/idlelib/parenmatch.py b/Lib/idlelib/parenmatch.py
index c15cb818cd8..7f25880ae5e 100644
--- a/Lib/idlelib/parenmatch.py
+++ b/Lib/idlelib/parenmatch.py
@@ -104,18 +104,18 @@ def paren_closed_event(self, event):
         # If user bound non-closer to <<paren-closed>>, quit.
         closer = self.text.get("insert-1c")
         if closer not in _openers:
-            return "break"
+            return
         hp = HyperParser(self.editwin, "insert-1c")
         if not hp.is_in_code():
-            return "break"
+            return
         indices = hp.get_surrounding_brackets(_openers[closer], True)
         if indices is None:
             self.bell()
-            return "break"
+            return
         self.activate_restore()
         self.create_tag(indices)
         self.set_timeout()
-        return "break"
+        return
 
     def restore_event(self, event=None):
         "Remove effect of doing match."


From webhook-mailer at python.org  Mon Aug  7 14:22:47 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Mon, 07 Aug 2017 18:22:47 -0000
Subject: [Python-checkins] bpo-31130: IDLE -- stop leaks in
 test_configdialog. (#3016)
Message-ID: <mailman.48.1502130168.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/733d0f63c562090a2b840859b96028d6ec0a4803
commit: 733d0f63c562090a2b840859b96028d6ec0a4803
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-07T14:22:44-04:00
summary:

bpo-31130: IDLE -- stop leaks in test_configdialog. (#3016)

Initial patch by Victor Stinner.

files:
A Misc/NEWS.d/next/IDLE/2017-08-07-14-02-56.bpo-31130.FbsC7f.rst
M Lib/idlelib/configdialog.py
M Lib/idlelib/idle_test/test_configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index f7a6b7367e4..63172371a5e 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -1856,6 +1856,7 @@ def __init__(self):
 
     def clear(self):
         "Clear lists (for tests)."
+        # Call after all tests in a module to avoid memory leaks.
         self.untraced.clear()
         self.traced.clear()
 
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index caeb2b56787..cd78482150c 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -9,7 +9,7 @@
 import unittest
 from unittest import mock
 from idlelib.idle_test.mock_idle import Func
-from tkinter import Tk, Frame, IntVar, BooleanVar, DISABLED, NORMAL
+from tkinter import Tk, Frame, StringVar, IntVar, BooleanVar, DISABLED, NORMAL
 from idlelib import config
 from idlelib.configdialog import idleConf, changes, tracers
 
@@ -41,6 +41,8 @@ def tearDownModule():
     global root, dialog
     idleConf.userCfg = usercfg
     tracers.detach()
+    tracers.clear()
+    changes.clear()
     del dialog
     root.update_idletasks()
     root.destroy()
@@ -442,16 +444,20 @@ def test_update_help_changes(self):
 
 class VarTraceTest(unittest.TestCase):
 
+    @classmethod
+    def setUpClass(cls):
+        cls.tracers = configdialog.VarTrace()
+        cls.iv = IntVar(root)
+        cls.bv = BooleanVar(root)
+
+    @classmethod
+    def tearDownClass(cls):
+        del cls.tracers, cls.iv, cls.bv
+
     def setUp(self):
-        changes.clear()
-        tracers.clear()
-        self.v1 = IntVar(root)
-        self.v2 = BooleanVar(root)
+        self.tracers.clear()
         self.called = 0
 
-    def tearDown(self):
-        del self.v1, self.v2
-
     def var_changed_increment(self, *params):
         self.called += 13
 
@@ -459,64 +465,68 @@ def var_changed_boolean(self, *params):
         pass
 
     def test_init(self):
-        tracers.__init__()
-        self.assertEqual(tracers.untraced, [])
-        self.assertEqual(tracers.traced, [])
+        tr = self.tracers
+        tr.__init__()
+        self.assertEqual(tr.untraced, [])
+        self.assertEqual(tr.traced, [])
 
     def test_clear(self):
-        tracers.untraced.append(0)
-        tracers.traced.append(1)
-        tracers.clear()
-        self.assertEqual(tracers.untraced, [])
-        self.assertEqual(tracers.traced, [])
+        tr = self.tracers
+        tr.untraced.append(0)
+        tr.traced.append(1)
+        tr.clear()
+        self.assertEqual(tr.untraced, [])
+        self.assertEqual(tr.traced, [])
 
     def test_add(self):
-        tr = tracers
+        tr = self.tracers
         func = Func()
         cb = tr.make_callback = mock.Mock(return_value=func)
 
-        v1 = tr.add(self.v1, self.var_changed_increment)
-        self.assertIsInstance(v1, IntVar)
-        v2 = tr.add(self.v2, self.var_changed_boolean)
-        self.assertIsInstance(v2, BooleanVar)
+        iv = tr.add(self.iv, self.var_changed_increment)
+        self.assertIs(iv, self.iv)
+        bv = tr.add(self.bv, self.var_changed_boolean)
+        self.assertIs(bv, self.bv)
 
-        v3 = IntVar(root)
-        v3 = tr.add(v3, ('main', 'section', 'option'))
+        sv = StringVar(root)
+        sv2 = tr.add(sv, ('main', 'section', 'option'))
+        self.assertIs(sv2, sv)
         cb.assert_called_once()
-        cb.assert_called_with(v3, ('main', 'section', 'option'))
+        cb.assert_called_with(sv, ('main', 'section', 'option'))
 
-        expected = [(v1, self.var_changed_increment),
-                    (v2, self.var_changed_boolean),
-                    (v3, func)]
+        expected = [(iv, self.var_changed_increment),
+                    (bv, self.var_changed_boolean),
+                    (sv, func)]
         self.assertEqual(tr.traced, [])
         self.assertEqual(tr.untraced, expected)
 
         del tr.make_callback
 
     def test_make_callback(self):
-        cb = tracers.make_callback(self.v1, ('main', 'section', 'option'))
+        cb = self.tracers.make_callback(self.iv, ('main', 'section', 'option'))
         self.assertTrue(callable(cb))
-        self.v1.set(42)
+        self.iv.set(42)
         # Not attached, so set didn't invoke the callback.
         self.assertNotIn('section', changes['main'])
         # Invoke callback manually.
         cb()
         self.assertIn('section', changes['main'])
         self.assertEqual(changes['main']['section']['option'], '42')
+        changes.clear()
 
     def test_attach_detach(self):
-        tr = tracers
-        v1 = tr.add(self.v1, self.var_changed_increment)
-        v2 = tr.add(self.v2, self.var_changed_boolean)
-        expected = [(v1, self.var_changed_increment),
-                    (v2, self.var_changed_boolean)]
+        tr = self.tracers
+        iv = tr.add(self.iv, self.var_changed_increment)
+        bv = tr.add(self.bv, self.var_changed_boolean)
+        expected = [(iv, self.var_changed_increment),
+                    (bv, self.var_changed_boolean)]
 
         # Attach callbacks and test call increment.
         tr.attach()
         self.assertEqual(tr.untraced, [])
         self.assertCountEqual(tr.traced, expected)
-        v1.set(1)
-        self.assertEqual(v1.get(), 1)
+        iv.set(1)
+        self.assertEqual(iv.get(), 1)
         self.assertEqual(self.called, 13)
 
         # Check that only one callback is attached to a variable.
@@ -524,7 +534,7 @@ def test_attach_detach(self):
         # would be called twice and the counter would be 2.
         self.called = 0
         tr.attach()
-        v1.set(1)
+        iv.set(1)
         self.assertEqual(self.called, 13)
 
         # Detach callbacks.
@@ -532,7 +542,7 @@ def test_attach_detach(self):
         tr.detach()
         self.assertEqual(tr.traced, [])
         self.assertCountEqual(tr.untraced, expected)
-        v1.set(1)
+        iv.set(1)
         self.assertEqual(self.called, 0)
 
 
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-07-14-02-56.bpo-31130.FbsC7f.rst b/Misc/NEWS.d/next/IDLE/2017-08-07-14-02-56.bpo-31130.FbsC7f.rst
new file mode 100644
index 00000000000..c57728fda22
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-07-14-02-56.bpo-31130.FbsC7f.rst
@@ -0,0 +1 @@
+IDLE -- stop leaks in test_configdialog. Initial patch by Victor Stinner.


From webhook-mailer at python.org  Mon Aug  7 14:23:10 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Mon, 07 Aug 2017 18:23:10 -0000
Subject: [Python-checkins] [3.6] bpo-29910: IDLE - revert `break`s that
 disabled calltip close. (GH-2997) (#3017)
Message-ID: <mailman.49.1502130192.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/b61de2d46596ac00dcf2d33bbce2023d0bf4207b
commit: b61de2d46596ac00dcf2d33bbce2023d0bf4207b
branch: 3.6
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-07T14:23:07-04:00
summary:

[3.6] bpo-29910: IDLE - revert `break`s that disabled calltip close. (GH-2997) (#3017)

(cherry picked from commit 8922587)

files:
M Lib/idlelib/parenmatch.py

diff --git a/Lib/idlelib/parenmatch.py b/Lib/idlelib/parenmatch.py
index c15cb818cd8..7f25880ae5e 100644
--- a/Lib/idlelib/parenmatch.py
+++ b/Lib/idlelib/parenmatch.py
@@ -104,18 +104,18 @@ def paren_closed_event(self, event):
         # If user bound non-closer to <<paren-closed>>, quit.
         closer = self.text.get("insert-1c")
         if closer not in _openers:
-            return "break"
+            return
         hp = HyperParser(self.editwin, "insert-1c")
         if not hp.is_in_code():
-            return "break"
+            return
         indices = hp.get_surrounding_brackets(_openers[closer], True)
         if indices is None:
             self.bell()
-            return "break"
+            return
         self.activate_restore()
         self.create_tag(indices)
         self.set_timeout()
-        return "break"
+        return
 
     def restore_event(self, event=None):
         "Remove effect of doing match."


From webhook-mailer at python.org  Mon Aug  7 15:20:09 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Mon, 07 Aug 2017 19:20:09 -0000
Subject: [Python-checkins] [3.6] bpo-31130: IDLE -- stop leaks in
 test_configdialog. (GH-3016) (#3018)
Message-ID: <mailman.50.1502133610.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/9d7d928b5853b921ed27f1e535dfe8174169854c
commit: 9d7d928b5853b921ed27f1e535dfe8174169854c
branch: 3.6
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-07T15:20:03-04:00
summary:

[3.6] bpo-31130: IDLE -- stop leaks in test_configdialog. (GH-3016) (#3018)

Initial patch by Victor Stinner.
(cherry picked from commit 733d0f6)

files:
A Misc/NEWS.d/next/IDLE/2017-08-07-14-02-56.bpo-31130.FbsC7f.rst
M Lib/idlelib/configdialog.py
M Lib/idlelib/idle_test/test_configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 6d8a03b1c00..e634d5f3599 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -1856,6 +1856,7 @@ def __init__(self):
 
     def clear(self):
         "Clear lists (for tests)."
+        # Call after all tests in a module to avoid memory leaks.
         self.untraced.clear()
         self.traced.clear()
 
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index caeb2b56787..cd78482150c 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -9,7 +9,7 @@
 import unittest
 from unittest import mock
 from idlelib.idle_test.mock_idle import Func
-from tkinter import Tk, Frame, IntVar, BooleanVar, DISABLED, NORMAL
+from tkinter import Tk, Frame, StringVar, IntVar, BooleanVar, DISABLED, NORMAL
 from idlelib import config
 from idlelib.configdialog import idleConf, changes, tracers
 
@@ -41,6 +41,8 @@ def tearDownModule():
     global root, dialog
     idleConf.userCfg = usercfg
     tracers.detach()
+    tracers.clear()
+    changes.clear()
     del dialog
     root.update_idletasks()
     root.destroy()
@@ -442,16 +444,20 @@ def test_update_help_changes(self):
 
 class VarTraceTest(unittest.TestCase):
 
+    @classmethod
+    def setUpClass(cls):
+        cls.tracers = configdialog.VarTrace()
+        cls.iv = IntVar(root)
+        cls.bv = BooleanVar(root)
+
+    @classmethod
+    def tearDownClass(cls):
+        del cls.tracers, cls.iv, cls.bv
+
     def setUp(self):
-        changes.clear()
-        tracers.clear()
-        self.v1 = IntVar(root)
-        self.v2 = BooleanVar(root)
+        self.tracers.clear()
         self.called = 0
 
-    def tearDown(self):
-        del self.v1, self.v2
-
     def var_changed_increment(self, *params):
         self.called += 13
 
@@ -459,64 +465,68 @@ def var_changed_boolean(self, *params):
         pass
 
     def test_init(self):
-        tracers.__init__()
-        self.assertEqual(tracers.untraced, [])
-        self.assertEqual(tracers.traced, [])
+        tr = self.tracers
+        tr.__init__()
+        self.assertEqual(tr.untraced, [])
+        self.assertEqual(tr.traced, [])
 
     def test_clear(self):
-        tracers.untraced.append(0)
-        tracers.traced.append(1)
-        tracers.clear()
-        self.assertEqual(tracers.untraced, [])
-        self.assertEqual(tracers.traced, [])
+        tr = self.tracers
+        tr.untraced.append(0)
+        tr.traced.append(1)
+        tr.clear()
+        self.assertEqual(tr.untraced, [])
+        self.assertEqual(tr.traced, [])
 
     def test_add(self):
-        tr = tracers
+        tr = self.tracers
         func = Func()
         cb = tr.make_callback = mock.Mock(return_value=func)
 
-        v1 = tr.add(self.v1, self.var_changed_increment)
-        self.assertIsInstance(v1, IntVar)
-        v2 = tr.add(self.v2, self.var_changed_boolean)
-        self.assertIsInstance(v2, BooleanVar)
+        iv = tr.add(self.iv, self.var_changed_increment)
+        self.assertIs(iv, self.iv)
+        bv = tr.add(self.bv, self.var_changed_boolean)
+        self.assertIs(bv, self.bv)
 
-        v3 = IntVar(root)
-        v3 = tr.add(v3, ('main', 'section', 'option'))
+        sv = StringVar(root)
+        sv2 = tr.add(sv, ('main', 'section', 'option'))
+        self.assertIs(sv2, sv)
         cb.assert_called_once()
-        cb.assert_called_with(v3, ('main', 'section', 'option'))
+        cb.assert_called_with(sv, ('main', 'section', 'option'))
 
-        expected = [(v1, self.var_changed_increment),
-                    (v2, self.var_changed_boolean),
-                    (v3, func)]
+        expected = [(iv, self.var_changed_increment),
+                    (bv, self.var_changed_boolean),
+                    (sv, func)]
         self.assertEqual(tr.traced, [])
         self.assertEqual(tr.untraced, expected)
 
         del tr.make_callback
 
     def test_make_callback(self):
-        cb = tracers.make_callback(self.v1, ('main', 'section', 'option'))
+        cb = self.tracers.make_callback(self.iv, ('main', 'section', 'option'))
         self.assertTrue(callable(cb))
-        self.v1.set(42)
+        self.iv.set(42)
         # Not attached, so set didn't invoke the callback.
         self.assertNotIn('section', changes['main'])
         # Invoke callback manually.
         cb()
         self.assertIn('section', changes['main'])
         self.assertEqual(changes['main']['section']['option'], '42')
+        changes.clear()
 
     def test_attach_detach(self):
-        tr = tracers
-        v1 = tr.add(self.v1, self.var_changed_increment)
-        v2 = tr.add(self.v2, self.var_changed_boolean)
-        expected = [(v1, self.var_changed_increment),
-                    (v2, self.var_changed_boolean)]
+        tr = self.tracers
+        iv = tr.add(self.iv, self.var_changed_increment)
+        bv = tr.add(self.bv, self.var_changed_boolean)
+        expected = [(iv, self.var_changed_increment),
+                    (bv, self.var_changed_boolean)]
 
         # Attach callbacks and test call increment.
         tr.attach()
         self.assertEqual(tr.untraced, [])
         self.assertCountEqual(tr.traced, expected)
-        v1.set(1)
-        self.assertEqual(v1.get(), 1)
+        iv.set(1)
+        self.assertEqual(iv.get(), 1)
         self.assertEqual(self.called, 13)
 
         # Check that only one callback is attached to a variable.
@@ -524,7 +534,7 @@ def test_attach_detach(self):
         # would be called twice and the counter would be 2.
         self.called = 0
         tr.attach()
-        v1.set(1)
+        iv.set(1)
         self.assertEqual(self.called, 13)
 
         # Detach callbacks.
@@ -532,7 +542,7 @@ def test_attach_detach(self):
         tr.detach()
         self.assertEqual(tr.traced, [])
         self.assertCountEqual(tr.untraced, expected)
-        v1.set(1)
+        iv.set(1)
         self.assertEqual(self.called, 0)
 
 
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-07-14-02-56.bpo-31130.FbsC7f.rst b/Misc/NEWS.d/next/IDLE/2017-08-07-14-02-56.bpo-31130.FbsC7f.rst
new file mode 100644
index 00000000000..c57728fda22
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-07-14-02-56.bpo-31130.FbsC7f.rst
@@ -0,0 +1 @@
+IDLE -- stop leaks in test_configdialog. Initial patch by Victor Stinner.


From lp_benchmark_robot at intel.com  Mon Aug  7 20:13:33 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Mon, 7 Aug 2017 17:13:33 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-07
Message-ID: <fad75d3f-fb5e-4781-b1d7-38632dc475fe@orsmsx156.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-07 03:03:38-07:00.
  - commit:		dff9b5f
  - previous commit:	c4c9866
  - revision date:	2017-08-07 10:27:21+02:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.061% |  +0.182%   |  +4.116%   |  +7.809%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.883% |  -0.321%   |  +21.864%  |  +10.172%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 2.210% |  +0.162%   |  +23.948%  |  +10.138%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.813% |  -0.142%   |  +20.879%  |  +10.731%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 1.674% |  +0.101%   |  +2.859%   |  +17.876%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 2.217% |  +0.230%   |  +11.104%  |  +11.051%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 1.197% |  -0.477%   |  +5.838%   |  +11.563%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.483% |  +0.059%   |  +4.591%   |  +4.551%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.601% |  +0.034%   |  +6.926%   |  +19.134%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 3.721% |  +1.000%   |  +9.625%   |  +14.738%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.241% |  -0.169%   |  +4.264%   |  +6.576%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.418% |  +0.224%   |  +5.030%   |  +6.044%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 1.473% |  -0.406%   |  +2.661%   |  +7.337%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.538% |  +0.089%   |  +9.086%   |  +11.146%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.169% |  +2.353%   |  +8.490%   |  +8.393%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.757% |  +0.302%   |  +6.362%   |  +11.160%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.362% |  +0.377%   |  +9.193%   |  +10.718%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.529% |  +1.015%   |  +7.941%   |  +11.041%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.603% |  +0.455%   |  +4.290%   |  +9.956%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 1.966% |  +0.004%   |  +2.682%   |  +9.078%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.572% |  +0.626%   |  +8.706%   |  +12.650%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.787% |  +0.609%   |  +47.162%  |  +10.801%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.706% |  +0.438%   |  +9.894%   |  +12.450%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.719% |  -0.226%   |  +18.761%  |  +11.207%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 6.365% |  -0.799%   |  +5.387%   |  +13.796%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.641% |  +0.283%   |  +4.211%   |  +5.222%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.570% |  +0.116%   |  -1.939%   |  +2.363%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.828% |  -0.133%   |  +2.699%   |  +6.484%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.266% |  +0.006%   |  +5.507%   |  +9.932%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.228% |  +0.320%   |  +1.989%   |  +23.379%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.274% |  +0.047%   |  +2.497%   |  +18.925%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.899% |  -0.221%   |  +4.672%   |  +19.564%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.474% |  +0.793%   |  +11.702%  |  +10.010%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.044% |  +0.052%   |  +0.336%   |  +9.567%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.127% |  +0.077%   |  +9.217%   |  +4.995%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.089% |  +0.105%   |  +1.002%   |  +4.870%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 0.880% |  -0.027%   |  +9.545%   |  +12.693%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.101% |  +0.022%   |  -10.653%  |  +12.654%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.449% |  +0.130%   |  +1.608%   |  +10.019%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.518% |  +0.295%   |  +0.983%   |  +2.351%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 2.291% |  -0.853%   |  +10.686%  |  +4.047%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.706% |  +0.233%   |  +8.111%   |  +15.122%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 1.065% |  -0.082%   |  +0.606%   |  +1.928%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.825% |  +0.479%   |  +27.081%  |  +8.451%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.960% |  +0.428%   |  +2.801%   |  +6.974%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 2.172% |  -0.219%   |  +12.929%  |  +10.069%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 1.970% |  -0.506%   |  -0.727%   |  -2.287%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.323% |  -0.009%   |  +5.739%   |  +1.943%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.436% |  +0.221%   |  +5.251%   |  +7.050%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.548% |  -0.207%   |  +4.779%   |  +4.800%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.084% |  +0.826%   |  +2.975%   |  +8.680%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.754% |  -0.188%   |  +12.373%  |  +7.936%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.484% |  +0.659%   |  +10.519%  |  +6.502%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.607% |  +0.207%   |  +12.395%  |  +8.296%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.543% |  +0.013%   |  +13.299%  |  +8.454%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 1.738% |  +0.245%   |  +24.442%  |  +6.771%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.120% |  +0.111%   |  +5.726%   |  +7.758%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.462% |  +0.078%   |  +0.697%   |  +0.503%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 8.353% |  -0.271%   |  +8.451%   |  +20.604%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 2.001% |  -0.161%   |  -2.347%   |  +20.254%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 1.861% |  +0.269%   |  +7.121%   |  +7.394%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.448% |  -0.196%   |  +5.741%   |  +8.524%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.156% |  +0.678%   |  +2.498%   |  +6.155%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 2.203% |  -0.133%   |  -5.590%   |  +10.972%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.300% |  +0.356%   |  +6.705%   |  +8.374%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-07

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From solipsis at pitrou.net  Tue Aug  8 05:05:40 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 08 Aug 2017 09:05:40 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=4
Message-ID: <20170808090539.89491.B17A84782C980795@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_functools leaked [0, 3, 1] memory blocks, sum=4


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogICLIFv', '--timeout', '7200']

From webhook-mailer at python.org  Tue Aug  8 07:16:25 2017
From: webhook-mailer at python.org (Larry Hastings)
Date: Tue, 08 Aug 2017 11:16:25 -0000
Subject: [Python-checkins] [3.5] bpo-31036: use an existing Misc/NEWS rather
 than trying to use blurb (#2874)
Message-ID: <mailman.51.1502190986.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/abe7b60b80f5cb23f84a49f95ef6ce23521eed14
commit: abe7b60b80f5cb23f84a49f95ef6ce23521eed14
branch: 3.5
author: Ned Deily <nad at python.org>
committer: Larry Hastings <larry at hastings.org>
date: 2017-08-07T00:34:16-07:00
summary:

[3.5] bpo-31036: use an existing Misc/NEWS rather than trying to use blurb (#2874)

* bpo-31036: use an existing Misc/NEWS rather than trying to use blurb

* bpo-31036: avoid echoing comments

(cherry picked from commit 3de144890ad3bc50694368a1b33be6d7f3a780b3)

files:
M Doc/Makefile

diff --git a/Doc/Makefile b/Doc/Makefile
index 5075b0264d0..04da82fea96 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -40,7 +40,19 @@ help:
 
 build:
 	-mkdir -p build
-	$(BLURB) merge -f build/NEWS
+# Look first for a Misc/NEWS file (building from a source release tarball
+# or old repo) and use that, otherwise look for a Misc/NEWS.d directory
+# (building from a newer repo) and use blurb to generate the NEWS file.
+	@if [ -f  ../Misc/NEWS ] ; then \
+		echo "Using existing Misc/NEWS file"; \
+		cp ../Misc/NEWS build/NEWS; \
+	elif [ -d ../Misc/NEWS.d ]; then \
+		echo "Building NEWS from Misc/NEWS.d with blurb"; \
+		$(BLURB) merge -f build/NEWS; \
+	else \
+		echo "Neither Misc/NEWS.d nor Misc/NEWS found; cannot build docs"; \
+		exit 1; \
+	fi
 	$(SPHINXBUILD) $(ALLSPHINXOPTS)
 	@echo
 


From webhook-mailer at python.org  Tue Aug  8 08:13:56 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 08 Aug 2017 12:13:56 -0000
Subject: [Python-checkins] bpo-31045: Language switch (#2652) (#3023)
Message-ID: <mailman.52.1502194437.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/e93135dbb265e801c0000a19cd9c5428d57d1cf4
commit: e93135dbb265e801c0000a19cd9c5428d57d1cf4
branch: 3.6
author: Julien Palard <julien at palard.fr>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-08-08T14:13:53+02:00
summary:

bpo-31045: Language switch (#2652) (#3023)

* Doc: Indicate the language

* Renaming version_switcher to switchers (to add language_switcher).

* Adding language switch.

* Doc switchers: Enhance readability of regex parsing versions.

* Doc switchers: Desambiguate the need of a replace(/\/+$/g, '') by proper naming.

* Doc switchers: py3k can't reach js, it's redirected server-side by nginx.

* Doc switchers: Examples matching actual regexes.

* Doc switchers: Better fallback on unexisting translated version.

(cherry picked from commit dff9b5f9d62aa0b23f8a255867d09d11890efd1b)

files:
A Doc/tools/static/switchers.js
D Doc/tools/static/version_switch.js
M Doc/Makefile
M Doc/tools/templates/layout.html

diff --git a/Doc/Makefile b/Doc/Makefile
index ae59f3294f1..526269d1e19 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -167,12 +167,12 @@ serve:
 
 # for development releases: always build
 autobuild-dev:
-	make dist SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A versionswitcher=1'
+	make dist SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A switchers=1'
 	-make suspicious
 
 # for quick rebuilds (HTML only)
 autobuild-dev-html:
-	make html SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A versionswitcher=1'
+	make html SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A switchers=1'
 
 # for stable releases: only build if not in pre-release stage (alpha, beta)
 # release candidate downloads are okay, since the stable tree can be in that stage
diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
new file mode 100644
index 00000000000..470ff6d33b7
--- /dev/null
+++ b/Doc/tools/static/switchers.js
@@ -0,0 +1,146 @@
+(function() {
+  'use strict';
+
+  // Parses versions in URL segments like:
+  // "3", "dev", "release/2.7" or "3.6rc2"
+  var version_regexs = [
+    '(?:\\d)',
+    '(?:\\d\\.\\d[\\w\\d\\.]*)',
+    '(?:dev)',
+    '(?:release/\\d.\\d[\\x\\d\\.]*)'];
+
+  var all_versions = {
+    '3.7': 'dev (3.7)',
+    '3.6': '3.6',
+    '3.5': '3.5',
+    '3.4': '3.4',
+    '3.3': '3.3',
+    '2.7': '2.7',
+  };
+
+  var all_languages = {
+      'en': 'English',
+      'fr': 'Fran?ais',
+  };
+
+  function build_version_select(current_version, current_release) {
+    var buf = ['<select>'];
+
+    $.each(all_versions, function(version, title) {
+      buf.push('<option value="' + version + '"');
+      if (version == current_version)
+        buf.push(' selected="selected">' + current_release + '</option>');
+      else
+        buf.push('>' + title + '</option>');
+    });
+
+    buf.push('</select>');
+    return buf.join('');
+  }
+
+  function build_language_select(current_language) {
+    var buf = ['<select>'];
+
+    $.each(all_languages, function(language, title) {
+      if (language == current_language)
+        buf.push('<option value="' + language + '" selected="selected">' +
+                 all_languages[current_language] + '</option>');
+      else
+        buf.push('<option value="' + language + '">' + title + '</option>');
+    });
+    buf.push('</select>');
+    return buf.join('');
+  }
+
+  function navigate_to_first_existing(urls) {
+    // Navigate to the first existing URL in urls.
+    var url = urls.shift();
+    if (urls.length == 0) {
+      window.location.href = url;
+      return;
+    }
+    $.ajax({
+      url: url,
+      success: function() {
+        window.location.href = url;
+      },
+      error: function() {
+        navigate_to_first_existing(urls);
+      }
+    });
+  }
+
+  function on_version_switch() {
+    var selected_version = $(this).children('option:selected').attr('value') + '/';
+    var url = window.location.href;
+    var current_language = language_segment_from_url(url);
+    var current_version = version_segment_in_url(url);
+    var new_url = url.replace('.org/' + current_language + current_version,
+                              '.org/' + current_language + selected_version);
+    if (new_url != url) {
+      navigate_to_first_existing([
+        new_url,
+        url.replace('.org/' + current_language + current_version,
+                    '.org/' + selected_version),
+        'https://docs.python.org/' + current_language + selected_version,
+        'https://docs.python.org/' + selected_version,
+        'https://docs.python.org/'
+      ]);
+    }
+  }
+
+  function on_language_switch() {
+    var selected_language = $(this).children('option:selected').attr('value') + '/';
+    var url = window.location.href;
+    var current_language = language_segment_from_url(url);
+    var current_version = version_segment_in_url(url);
+    if (selected_language == 'en/') // Special 'default' case for english.
+      selected_language = '';
+    var new_url = url.replace('.org/' + current_language + current_version,
+                              '.org/' + selected_language + current_version);
+    if (new_url != url) {
+      navigate_to_first_existing([
+        new_url,
+        'https://docs.python.org/'
+      ]);
+    }
+  }
+
+  // Returns the path segment of the language as a string, like 'fr/'
+  // or '' if not found.
+  function language_segment_from_url(url) {
+    var language_regexp = '\.org/(' + Object.keys(all_languages).join('|') + '/)';
+    var match = url.match(language_regexp);
+    if (match !== null)
+        return match[1];
+    return '';
+  }
+
+  // Returns the path segment of the version as a string, like '3.6/'
+  // or '' if not found.
+  function version_segment_in_url(url) {
+    var language_segment = '(?:(?:' + Object.keys(all_languages).join('|') + ')/)';
+    var version_segment = '(?:(?:' + version_regexs.join('|') + ')/)';
+    var version_regexp = '\\.org/' + language_segment + '?(' + version_segment + ')';
+    var match = url.match(version_regexp);
+    if (match !== null)
+      return match[1];
+    return ''
+  }
+
+  $(document).ready(function() {
+    var release = DOCUMENTATION_OPTIONS.VERSION;
+    var language_segment = language_segment_from_url(window.location.href);
+    var current_language = language_segment.replace(/\/+$/g, '') || 'en';
+    var version = release.substr(0, 3);
+    var version_select = build_version_select(version, release);
+
+    $('.version_switcher_placeholder').html(version_select);
+    $('.version_switcher_placeholder select').bind('change', on_version_switch);
+
+    var language_select = build_language_select(current_language);
+
+    $('.language_switcher_placeholder').html(language_select);
+    $('.language_switcher_placeholder select').bind('change', on_language_switch);
+  });
+})();
diff --git a/Doc/tools/static/version_switch.js b/Doc/tools/static/version_switch.js
deleted file mode 100644
index 8b36a616718..00000000000
--- a/Doc/tools/static/version_switch.js
+++ /dev/null
@@ -1,67 +0,0 @@
-(function() {
-  'use strict';
-
-  var all_versions = {
-    '3.7': 'dev (3.7)',
-    '3.6': '3.6',
-    '3.5': '3.5',
-    '3.4': '3.4',
-    '3.3': '3.3',
-    '2.7': '2.7',
-  };
-
-  function build_select(current_version, current_release) {
-    var buf = ['<select>'];
-
-    $.each(all_versions, function(version, title) {
-      buf.push('<option value="' + version + '"');
-      if (version == current_version)
-        buf.push(' selected="selected">' + current_release + '</option>');
-      else
-        buf.push('>' + title + '</option>');
-    });
-
-    buf.push('</select>');
-    return buf.join('');
-  }
-
-  function patch_url(url, new_version) {
-    var url_re = /\.org\/(\d|py3k|dev|((release\/)?\d\.\d[\w\d\.]*))\//,
-        new_url = url.replace(url_re, '.org/' + new_version + '/');
-
-    if (new_url == url && !new_url.match(url_re)) {
-      // python 2 url without version?
-      new_url = url.replace(/\.org\//, '.org/' + new_version + '/');
-    }
-    return new_url;
-  }
-
-  function on_switch() {
-    var selected = $(this).children('option:selected').attr('value');
-
-    var url = window.location.href,
-        new_url = patch_url(url, selected);
-
-    if (new_url != url) {
-      // check beforehand if url exists, else redirect to version's start page
-      $.ajax({
-        url: new_url,
-        success: function() {
-           window.location.href = new_url;
-        },
-        error: function() {
-           window.location.href = 'https://docs.python.org/' + selected;
-        }
-      });
-    }
-  }
-
-  $(document).ready(function() {
-    var release = DOCUMENTATION_OPTIONS.VERSION;
-    var version = release.substr(0, 3);
-    var select = build_select(version, release);
-
-    $('.version_switcher_placeholder').html(select);
-    $('.version_switcher_placeholder select').bind('change', on_switch);
-  });
-})();
diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html
index 640d8b30493..c2106678ac6 100644
--- a/Doc/tools/templates/layout.html
+++ b/Doc/tools/templates/layout.html
@@ -4,7 +4,8 @@
                  style="vertical-align: middle; margin-top: -1px"/></li>
         <li><a href="https://www.python.org/">Python</a>{{ reldelim1 }}</li>
         <li>
-          {%- if versionswitcher is defined %}
+          {%- if switchers is defined %}
+          <span class="language_switcher_placeholder">{{ language or 'en' }}</span>
           <span class="version_switcher_placeholder">{{ release }}</span>
           <a href="{{ pathto('index') }}">{% trans %}Documentation {% endtrans %}</a>{{ reldelim1 }}
           {%- else %}
@@ -41,7 +42,7 @@
     <link rel="canonical" href="https://docs.python.org/3/{{pagename}}.html" />
     {% if builder != "htmlhelp" %}
     {% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}
-    {% if versionswitcher is defined and not embedded %}<script type="text/javascript" src="{{ pathto('_static/version_switch.js', 1) }}"></script>{% endif %}
+    {% if switchers is defined and not embedded %}<script type="text/javascript" src="{{ pathto('_static/switchers.js', 1) }}"></script>{% endif %}
     {% if pagename == 'whatsnew/changelog' and not embedded %}
     <script type="text/javascript">
       $(document).ready(function() {


From webhook-mailer at python.org  Tue Aug  8 08:14:26 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 08 Aug 2017 12:14:26 -0000
Subject: [Python-checkins] bpo-31045: Language switch (#2652) (#3024)
Message-ID: <mailman.53.1502194468.29000.python-checkins@python.org>

https://github.com/python/cpython/commit/245dafca85097dd8b84f02b01f39f5d32091754b
commit: 245dafca85097dd8b84f02b01f39f5d32091754b
branch: 2.7
author: Julien Palard <julien at palard.fr>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-08-08T14:14:23+02:00
summary:

bpo-31045: Language switch (#2652) (#3024)

* Doc: Indicate the language

* Renaming version_switcher to switchers (to add language_switcher).

* Adding language switch.

* Doc switchers: Enhance readability of regex parsing versions.

* Doc switchers: Desambiguate the need of a replace(/\/+$/g, '') by proper naming.

* Doc switchers: py3k can't reach js, it's redirected server-side by nginx.

* Doc switchers: Examples matching actual regexes.

* Doc switchers: Better fallback on unexisting translated version.

(cherry picked from commit dff9b5f9d62aa0b23f8a255867d09d11890efd1b)

files:
A Doc/tools/static/switchers.js
D Doc/tools/static/version_switch.js
M Doc/Makefile
M Doc/tools/templates/layout.html

diff --git a/Doc/Makefile b/Doc/Makefile
index 3a8260cb73a..ebabc0206bf 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -157,12 +157,12 @@ serve:
 
 # for development releases: always build
 autobuild-dev:
-	make dist SPHINXOPTS='$(SPHINXOPTS) -A daily=1 -A versionswitcher=1'
+	make dist SPHINXOPTS='$(SPHINXOPTS) -A daily=1 -A switchers=1'
 	-make suspicious
 
 # for quick rebuilds (HTML only)
 autobuild-dev-html:
-	make html SPHINXOPTS='$(SPHINXOPTS) -A daily=1 -A versionswitcher=1'
+	make html SPHINXOPTS='$(SPHINXOPTS) -A daily=1 -A switchers=1'
 
 # for stable releases: only build if not in pre-release stage (alpha, beta)
 # release candidate downloads are okay, since the stable tree can be in that stage
diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
new file mode 100644
index 00000000000..470ff6d33b7
--- /dev/null
+++ b/Doc/tools/static/switchers.js
@@ -0,0 +1,146 @@
+(function() {
+  'use strict';
+
+  // Parses versions in URL segments like:
+  // "3", "dev", "release/2.7" or "3.6rc2"
+  var version_regexs = [
+    '(?:\\d)',
+    '(?:\\d\\.\\d[\\w\\d\\.]*)',
+    '(?:dev)',
+    '(?:release/\\d.\\d[\\x\\d\\.]*)'];
+
+  var all_versions = {
+    '3.7': 'dev (3.7)',
+    '3.6': '3.6',
+    '3.5': '3.5',
+    '3.4': '3.4',
+    '3.3': '3.3',
+    '2.7': '2.7',
+  };
+
+  var all_languages = {
+      'en': 'English',
+      'fr': 'Fran?ais',
+  };
+
+  function build_version_select(current_version, current_release) {
+    var buf = ['<select>'];
+
+    $.each(all_versions, function(version, title) {
+      buf.push('<option value="' + version + '"');
+      if (version == current_version)
+        buf.push(' selected="selected">' + current_release + '</option>');
+      else
+        buf.push('>' + title + '</option>');
+    });
+
+    buf.push('</select>');
+    return buf.join('');
+  }
+
+  function build_language_select(current_language) {
+    var buf = ['<select>'];
+
+    $.each(all_languages, function(language, title) {
+      if (language == current_language)
+        buf.push('<option value="' + language + '" selected="selected">' +
+                 all_languages[current_language] + '</option>');
+      else
+        buf.push('<option value="' + language + '">' + title + '</option>');
+    });
+    buf.push('</select>');
+    return buf.join('');
+  }
+
+  function navigate_to_first_existing(urls) {
+    // Navigate to the first existing URL in urls.
+    var url = urls.shift();
+    if (urls.length == 0) {
+      window.location.href = url;
+      return;
+    }
+    $.ajax({
+      url: url,
+      success: function() {
+        window.location.href = url;
+      },
+      error: function() {
+        navigate_to_first_existing(urls);
+      }
+    });
+  }
+
+  function on_version_switch() {
+    var selected_version = $(this).children('option:selected').attr('value') + '/';
+    var url = window.location.href;
+    var current_language = language_segment_from_url(url);
+    var current_version = version_segment_in_url(url);
+    var new_url = url.replace('.org/' + current_language + current_version,
+                              '.org/' + current_language + selected_version);
+    if (new_url != url) {
+      navigate_to_first_existing([
+        new_url,
+        url.replace('.org/' + current_language + current_version,
+                    '.org/' + selected_version),
+        'https://docs.python.org/' + current_language + selected_version,
+        'https://docs.python.org/' + selected_version,
+        'https://docs.python.org/'
+      ]);
+    }
+  }
+
+  function on_language_switch() {
+    var selected_language = $(this).children('option:selected').attr('value') + '/';
+    var url = window.location.href;
+    var current_language = language_segment_from_url(url);
+    var current_version = version_segment_in_url(url);
+    if (selected_language == 'en/') // Special 'default' case for english.
+      selected_language = '';
+    var new_url = url.replace('.org/' + current_language + current_version,
+                              '.org/' + selected_language + current_version);
+    if (new_url != url) {
+      navigate_to_first_existing([
+        new_url,
+        'https://docs.python.org/'
+      ]);
+    }
+  }
+
+  // Returns the path segment of the language as a string, like 'fr/'
+  // or '' if not found.
+  function language_segment_from_url(url) {
+    var language_regexp = '\.org/(' + Object.keys(all_languages).join('|') + '/)';
+    var match = url.match(language_regexp);
+    if (match !== null)
+        return match[1];
+    return '';
+  }
+
+  // Returns the path segment of the version as a string, like '3.6/'
+  // or '' if not found.
+  function version_segment_in_url(url) {
+    var language_segment = '(?:(?:' + Object.keys(all_languages).join('|') + ')/)';
+    var version_segment = '(?:(?:' + version_regexs.join('|') + ')/)';
+    var version_regexp = '\\.org/' + language_segment + '?(' + version_segment + ')';
+    var match = url.match(version_regexp);
+    if (match !== null)
+      return match[1];
+    return ''
+  }
+
+  $(document).ready(function() {
+    var release = DOCUMENTATION_OPTIONS.VERSION;
+    var language_segment = language_segment_from_url(window.location.href);
+    var current_language = language_segment.replace(/\/+$/g, '') || 'en';
+    var version = release.substr(0, 3);
+    var version_select = build_version_select(version, release);
+
+    $('.version_switcher_placeholder').html(version_select);
+    $('.version_switcher_placeholder select').bind('change', on_version_switch);
+
+    var language_select = build_language_select(current_language);
+
+    $('.language_switcher_placeholder').html(language_select);
+    $('.language_switcher_placeholder select').bind('change', on_language_switch);
+  });
+})();
diff --git a/Doc/tools/static/version_switch.js b/Doc/tools/static/version_switch.js
deleted file mode 100644
index 8b36a616718..00000000000
--- a/Doc/tools/static/version_switch.js
+++ /dev/null
@@ -1,67 +0,0 @@
-(function() {
-  'use strict';
-
-  var all_versions = {
-    '3.7': 'dev (3.7)',
-    '3.6': '3.6',
-    '3.5': '3.5',
-    '3.4': '3.4',
-    '3.3': '3.3',
-    '2.7': '2.7',
-  };
-
-  function build_select(current_version, current_release) {
-    var buf = ['<select>'];
-
-    $.each(all_versions, function(version, title) {
-      buf.push('<option value="' + version + '"');
-      if (version == current_version)
-        buf.push(' selected="selected">' + current_release + '</option>');
-      else
-        buf.push('>' + title + '</option>');
-    });
-
-    buf.push('</select>');
-    return buf.join('');
-  }
-
-  function patch_url(url, new_version) {
-    var url_re = /\.org\/(\d|py3k|dev|((release\/)?\d\.\d[\w\d\.]*))\//,
-        new_url = url.replace(url_re, '.org/' + new_version + '/');
-
-    if (new_url == url && !new_url.match(url_re)) {
-      // python 2 url without version?
-      new_url = url.replace(/\.org\//, '.org/' + new_version + '/');
-    }
-    return new_url;
-  }
-
-  function on_switch() {
-    var selected = $(this).children('option:selected').attr('value');
-
-    var url = window.location.href,
-        new_url = patch_url(url, selected);
-
-    if (new_url != url) {
-      // check beforehand if url exists, else redirect to version's start page
-      $.ajax({
-        url: new_url,
-        success: function() {
-           window.location.href = new_url;
-        },
-        error: function() {
-           window.location.href = 'https://docs.python.org/' + selected;
-        }
-      });
-    }
-  }
-
-  $(document).ready(function() {
-    var release = DOCUMENTATION_OPTIONS.VERSION;
-    var version = release.substr(0, 3);
-    var select = build_select(version, release);
-
-    $('.version_switcher_placeholder').html(select);
-    $('.version_switcher_placeholder select').bind('change', on_switch);
-  });
-})();
diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html
index acf4f33de31..cc16ae446ff 100644
--- a/Doc/tools/templates/layout.html
+++ b/Doc/tools/templates/layout.html
@@ -4,7 +4,8 @@
                  style="vertical-align: middle; margin-top: -1px"/></li>
         <li><a href="https://www.python.org/">Python</a>{{ reldelim1 }}</li>
         <li>
-          {%- if versionswitcher is defined %}
+          {%- if switchers is defined %}
+          <span class="language_switcher_placeholder">{{ language or 'en' }}</span>
           <span class="version_switcher_placeholder">{{ release }}</span>
           <a href="{{ pathto('index') }}">{% trans %}Documentation{% endtrans %}</a>{{ reldelim1 }}
           {%- else %}
@@ -18,7 +19,7 @@
     <link rel="shortcut icon" type="image/png" href="{{ pathto('_static/py.png', 1) }}" />
     <link rel="canonical" href="https://docs.python.org/2/{{pagename}}.html" />
     {% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}
-    {% if versionswitcher is defined and not embedded %}<script type="text/javascript" src="{{ pathto('_static/version_switch.js', 1) }}"></script>{% endif %}
+    {% if switchers is defined and not embedded %}<script type="text/javascript" src="{{ pathto('_static/switchers.js', 1) }}"></script>{% endif %}
 {{ super() }}
     {% if builder == 'qthelp' %}
     <style type="text/css">


From webhook-mailer at python.org  Tue Aug  8 13:15:55 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 08 Aug 2017 17:15:55 -0000
Subject: [Python-checkins] ttk: fix LabeledScale and OptionMenu destroy()
 method (#3026)
Message-ID: <mailman.0.1502212557.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/56e162ad5c5d3effe9b4f05d0179e1b6a2a2d9b8
commit: 56e162ad5c5d3effe9b4f05d0179e1b6a2a2d9b8
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-08T19:15:52+02:00
summary:

ttk: fix LabeledScale and OptionMenu destroy() method (#3026)

bpo-31135: Call the parent destroy() method even if the used
attribute doesn't exist.

The LabeledScale.destroy() method now also explicitly clears label
and scale attributes to help the garbage collector to destroy all
widgets.

files:
A Misc/NEWS.d/next/Library/2017-08-08-14-59-26.bpo-31135.9q1QdB.rst
M Lib/lib-tk/ttk.py

diff --git a/Lib/lib-tk/ttk.py b/Lib/lib-tk/ttk.py
index 11254391c0f..77c93b12ae7 100644
--- a/Lib/lib-tk/ttk.py
+++ b/Lib/lib-tk/ttk.py
@@ -1521,7 +1521,9 @@ def destroy(self):
             pass
         else:
             del self._variable
-            Frame.destroy(self)
+        Frame.destroy(self)
+        self.label = None
+        self.scale = None
 
 
     def _adjust(self, *args):
@@ -1620,5 +1622,8 @@ def set_menu(self, default=None, *values):
 
     def destroy(self):
         """Destroy this widget and its associated variable."""
-        del self._variable
+        try:
+            del self._variable
+        except AttributeError:
+            pass
         Menubutton.destroy(self)
diff --git a/Misc/NEWS.d/next/Library/2017-08-08-14-59-26.bpo-31135.9q1QdB.rst b/Misc/NEWS.d/next/Library/2017-08-08-14-59-26.bpo-31135.9q1QdB.rst
new file mode 100644
index 00000000000..4d89633e126
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-08-14-59-26.bpo-31135.9q1QdB.rst
@@ -0,0 +1,4 @@
+ttk: Fix LabeledScale and OptionMenu destroy() method. Call the parent
+destroy() method even if the used attribute doesn't exist. The
+LabeledScale.destroy() method now also explicitly clears label and scale
+attributes to help the garbage collector to destroy all widgets.


From webhook-mailer at python.org  Tue Aug  8 13:41:23 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 08 Aug 2017 17:41:23 -0000
Subject: [Python-checkins] ttk: fix LabeledScale and OptionMenu destroy()
 method (#3025)
Message-ID: <mailman.1.1502214085.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/cd7e9c1b67d3d07ee03e0a79af2791c19031cecb
commit: cd7e9c1b67d3d07ee03e0a79af2791c19031cecb
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-08T19:41:21+02:00
summary:

ttk: fix LabeledScale and OptionMenu destroy() method (#3025)

bpo-31135: Call the parent destroy() method even if the used
attribute doesn't exist.

The LabeledScale.destroy() method now also explicitly clears label
and scale attributes to help the garbage collector to destroy all
widgets.

files:
A Misc/NEWS.d/next/Library/2017-08-08-14-44-37.bpo-31135.HH94xR.rst
M Lib/tkinter/ttk.py

diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py
index 3ecc004f0e0..e1a965e8dff 100644
--- a/Lib/tkinter/ttk.py
+++ b/Lib/tkinter/ttk.py
@@ -1543,11 +1543,12 @@ def destroy(self):
         try:
             self._variable.trace_vdelete('w', self.__tracecb)
         except AttributeError:
-            # widget has been destroyed already
             pass
         else:
             del self._variable
-            Frame.destroy(self)
+        super().destroy()
+        self.label = None
+        self.scale = None
 
 
     def _adjust(self, *args):
@@ -1644,5 +1645,8 @@ def set_menu(self, default=None, *values):
 
     def destroy(self):
         """Destroy this widget and its associated variable."""
-        del self._variable
-        Menubutton.destroy(self)
+        try:
+            del self._variable
+        except AttributeError:
+            pass
+        super().destroy()
diff --git a/Misc/NEWS.d/next/Library/2017-08-08-14-44-37.bpo-31135.HH94xR.rst b/Misc/NEWS.d/next/Library/2017-08-08-14-44-37.bpo-31135.HH94xR.rst
new file mode 100644
index 00000000000..60068fb648f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-08-14-44-37.bpo-31135.HH94xR.rst
@@ -0,0 +1,4 @@
+ttk: fix the destroy() method of LabeledScale and OptionMenu classes.
+Call the parent destroy() method even if the used attribute doesn't
+exist. The LabeledScale.destroy() method now also explicitly clears label and
+scale attributes to help the garbage collector to destroy all widgets.


From webhook-mailer at python.org  Tue Aug  8 17:26:49 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 08 Aug 2017 21:26:49 -0000
Subject: [Python-checkins] bpo-31149: Doc: Add Japanese to the language
 switcher. (#3028)
Message-ID: <mailman.2.1502227611.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/c82b7f332aff606af6c9c163da75f1e86514125e
commit: c82b7f332aff606af6c9c163da75f1e86514125e
branch: master
author: Julien Palard <julien at palard.fr>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-08-08T23:26:46+02:00
summary:

bpo-31149: Doc: Add Japanese to the language switcher. (#3028)

files:
M Doc/tools/static/switchers.js

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index 470ff6d33b7..de9e7b76f9e 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -21,6 +21,7 @@
   var all_languages = {
       'en': 'English',
       'fr': 'Fran?ais',
+      'ja': 'Japanese',
   };
 
   function build_version_select(current_version, current_release) {


From lp_benchmark_robot at intel.com  Tue Aug  8 20:19:50 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Tue, 8 Aug 2017 17:19:50 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-08
Message-ID: <4474c227-6108-4a7c-8660-e27c78ac8e1e@orsmsx110.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-08 03:03:40-07:00.
  - commit:		733d0f6
  - previous commit:	dff9b5f
  - revision date:	2017-08-07 14:22:44-04:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.079% |  -0.190%   |  +3.934%   |  +7.583%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 0.744% |  +0.349%   |  +22.136%  |  +7.180%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 2.685% |  -0.182%   |  +23.810%  |  +6.259%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.569% |  +0.207%   |  +21.043%  |  +7.332%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.421% |  -0.081%   |  +2.780%   |  +14.751%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.150% |  +0.096%   |  +11.189%  |  +10.171%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.642% |  +0.158%   |  +5.987%   |  +10.769%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.518% |  -0.237%   |  +4.365%   |  +5.800%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.584% |  -0.005%   |  +6.922%   |  +17.212%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 2.347% |  -0.419%   |  +9.246%   |  +13.428%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.309% |  -0.080%   |  +4.187%   |  +7.042%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.670% |  -0.116%   |  +4.920%   |  +5.113%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 2.359% |  +0.143%   |  +2.800%   |  +6.673%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.629% |  -0.418%   |  +8.706%   |  +10.769%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.714% |  -1.975%   |  +6.682%   |  +8.783%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.918% |  -0.263%   |  +6.116%   |  +10.694%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.764% |  -0.155%   |  +9.052%   |  +11.473%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.614% |  -0.559%   |  +7.427%   |  +9.515%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.527% |  +0.100%   |  +4.386%   |  +8.809%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 3.114% |  -0.237%   |  +2.451%   |  +10.754%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.699% |  -0.440%   |  +8.303%   |  +13.224%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 3.181% |  -0.113%   |  +47.102%  |  +10.520%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.866% |  -0.747%   |  +9.222%   |  +13.840%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.577% |  +0.040%   |  +18.794%  |  +12.035%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 5.412% |  +0.486%   |  +5.847%   |  +13.729%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.347% |  -0.274%   |  +3.948%   |  +5.407%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.990% |  -0.178%   |  -2.120%   |  +2.709%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.756% |  +0.299%   |  +2.990%   |  +6.418%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.610% |  +0.155%   |  +5.654%   |  +9.385%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.292% |  +0.017%   |  +2.006%   |  +23.165%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.376% |  +0.061%   |  +2.557%   |  +19.090%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.801% |  +0.234%   |  +4.895%   |  +18.260%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 5.420% |  -0.458%   |  +11.297%  |  +9.904%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.122% |  -0.032%   |  +0.304%   |  +9.952%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.126% |  +0.089%   |  +9.297%   |  +4.769%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.095% |  +0.122%   |  +1.123%   |  +4.660%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 0.976% |  -0.192%   |  +9.371%   |  +13.306%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.788% |  +0.986%   |  -9.561%   |  +11.050%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 1.331% |  -0.121%   |  +1.489%   |  +9.453%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.000% |  -0.199%   |  +0.786%   |  +2.117%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.161% |  +0.870%   |  +11.464%  |  +3.660%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.228% |  +0.203%   |  +8.297%   |  +13.631%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.556% |  +0.039%   |  +0.644%   |  +2.800%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.602% |  +0.080%   |  +27.140%  |  +7.711%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.001% |  +0.614%   |  +3.398%   |  +5.704%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.780% |  +0.295%   |  +13.186%  |  +9.458%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 0.844% |  +0.423%   |  -0.301%   |  +1.036%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.410% |  -0.021%   |  +5.719%   |  +2.690%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.437% |  +0.232%   |  +5.472%   |  +6.855%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.076% |  +0.621%   |  +5.370%   |  +4.569%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 5.749% |  -0.309%   |  +2.675%   |  +8.967%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.498% |  +0.199%   |  +12.547%  |  +7.729%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.455% |  +0.048%   |  +10.563%  |  +6.151%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.029% |  -1.114%   |  +11.419%  |  +8.890%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 3.585% |  +1.319%   |  +14.443%  |  +7.384%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 3.790% |  -0.644%   |  +23.956%  |  +8.974%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.045% |  +0.193%   |  +5.908%   |  +6.900%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.645% |  +0.121%   |  +0.817%   |  +0.699%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 7.773% |  +0.719%   |  +9.109%   |  +17.856%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 1.186% |  +0.534%   |  -1.800%   |  +19.262%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 3.444% |  -0.893%   |  +6.292%   |  +8.044%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.072% |  +0.364%   |  +6.084%   |  +7.308%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.263% |  -0.059%   |  +2.441%   |  +6.063%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 2.005% |  +0.077%   |  -5.508%   |  +10.582%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.339% |  -0.203%   |  +6.516%   |  +7.722%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-08

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Wed Aug  9 04:48:16 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 09 Aug 2017 08:48:16 -0000
Subject: [Python-checkins] ttk: fix LabeledScale and OptionMenu destroy()
 method (#3025) (#3030)
Message-ID: <mailman.3.1502268498.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/33460fa7e0bd126bee739a66e1228665dc22e70f
commit: 33460fa7e0bd126bee739a66e1228665dc22e70f
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-09T10:48:11+02:00
summary:

ttk: fix LabeledScale and OptionMenu destroy() method (#3025) (#3030)

bpo-31135: Call the parent destroy() method even if the used
attribute doesn't exist.

The LabeledScale.destroy() method now also explicitly clears label
and scale attributes to help the garbage collector to destroy all
widgets.
(cherry picked from commit cd7e9c1b67d3d07ee03e0a79af2791c19031cecb)

files:
A Misc/NEWS.d/next/Library/2017-08-08-14-44-37.bpo-31135.HH94xR.rst
M Lib/tkinter/ttk.py

diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py
index 9cd0c2073a9..2a3e1cec701 100644
--- a/Lib/tkinter/ttk.py
+++ b/Lib/tkinter/ttk.py
@@ -1543,11 +1543,12 @@ def destroy(self):
         try:
             self._variable.trace_vdelete('w', self.__tracecb)
         except AttributeError:
-            # widget has been destroyed already
             pass
         else:
             del self._variable
-            Frame.destroy(self)
+        super().destroy()
+        self.label = None
+        self.scale = None
 
 
     def _adjust(self, *args):
@@ -1647,5 +1648,8 @@ def set_menu(self, default=None, *values):
 
     def destroy(self):
         """Destroy this widget and its associated variable."""
-        del self._variable
-        Menubutton.destroy(self)
+        try:
+            del self._variable
+        except AttributeError:
+            pass
+        super().destroy()
diff --git a/Misc/NEWS.d/next/Library/2017-08-08-14-44-37.bpo-31135.HH94xR.rst b/Misc/NEWS.d/next/Library/2017-08-08-14-44-37.bpo-31135.HH94xR.rst
new file mode 100644
index 00000000000..60068fb648f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-08-14-44-37.bpo-31135.HH94xR.rst
@@ -0,0 +1,4 @@
+ttk: fix the destroy() method of LabeledScale and OptionMenu classes.
+Call the parent destroy() method even if the used attribute doesn't
+exist. The LabeledScale.destroy() method now also explicitly clears label and
+scale attributes to help the garbage collector to destroy all widgets.


From webhook-mailer at python.org  Wed Aug  9 04:51:45 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 09 Aug 2017 08:51:45 -0000
Subject: [Python-checkins] bpo-31150: Wait for child process in
 test_forkinthread to avoid thread reaped warnings (#3032)
Message-ID: <mailman.4.1502268707.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/88eee44a91c991dbbdf284fa220e2928b5de105c
commit: 88eee44a91c991dbbdf284fa220e2928b5de105c
branch: master
author: Ammar Askar <ammar_askar at hotmail.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-08-09T10:51:43+02:00
summary:

bpo-31150: Wait for child process in test_forkinthread to avoid thread reaped warnings (#3032)

files:
M Lib/test/test_thread.py

diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index 3909b75ccd4..2e2655aee7f 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -239,6 +239,8 @@ def thread1():
                     os._exit(0)
             else: # parent
                 os.close(self.write_fd)
+                pid, status = os.waitpid(pid, 0)
+                self.assertEqual(status, 0)
 
         thread.start_new_thread(thread1, ())
         self.assertEqual(os.read(self.read_fd, 2), b"OK",


From solipsis at pitrou.net  Wed Aug  9 05:16:51 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 09 Aug 2017 09:16:51 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=6
Message-ID: <20170809091650.61411.0A59DB38973C2335@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [7, -7, 1] memory blocks, sum=1
test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_forkserver leaked [-1, -1, 2] memory blocks, sum=0
test_multiprocessing_spawn leaked [1, -2, 2] memory blocks, sum=1


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogpLYuGN', '--timeout', '7200']

From webhook-mailer at python.org  Wed Aug  9 07:29:16 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 09 Aug 2017 11:29:16 -0000
Subject: [Python-checkins] bpo-31070: Fix a race condition in importlib
 _get_module_lock(). (#3033)
Message-ID: <mailman.5.1502278157.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/9b0d1d647e3d2ec9d299e5c9f49b02fbbb810a5a
commit: 9b0d1d647e3d2ec9d299e5c9f49b02fbbb810a5a
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-09T14:29:12+03:00
summary:

bpo-31070: Fix a race condition in importlib _get_module_lock(). (#3033)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-08-09-09-40-54.bpo-31070.oDyLiI.rst
M Lib/importlib/_bootstrap.py
M Python/importlib.h

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 493c272afae..fbd9392d418 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -172,8 +172,18 @@ def _get_module_lock(name):
                 lock = _DummyModuleLock(name)
             else:
                 lock = _ModuleLock(name)
-            def cb(_):
-                del _module_locks[name]
+
+            def cb(ref, name=name):
+                _imp.acquire_lock()
+                try:
+                    # bpo-31070: Check if another thread created a new lock
+                    # after the previous lock was destroyed
+                    # but before the weakref callback was called.
+                    if _module_locks.get(name) is ref:
+                        del _module_locks[name]
+                finally:
+                    _imp.release_lock()
+
             _module_locks[name] = _weakref.ref(lock, cb)
     finally:
         _imp.release_lock()
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-09-09-40-54.bpo-31070.oDyLiI.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-09-09-40-54.bpo-31070.oDyLiI.rst
new file mode 100644
index 00000000000..8f9d7b534b5
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-09-09-40-54.bpo-31070.oDyLiI.rst	
@@ -0,0 +1 @@
+Fix a race condition in importlib _get_module_lock().
diff --git a/Python/importlib.h b/Python/importlib.h
index e4b2e9d9f6b..f552616f99b 100644
--- a/Python/importlib.h
+++ b/Python/importlib.h
@@ -301,15 +301,15 @@ const unsigned char _Py_M__importlib[] = {
     0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,
     0,114,42,0,0,0,141,0,0,0,115,6,0,0,0,8,
     2,8,4,8,4,114,42,0,0,0,99,1,0,0,0,0,
-    0,0,0,3,0,0,0,18,0,0,0,3,0,0,0,115,
+    0,0,0,3,0,0,0,18,0,0,0,67,0,0,0,115,
     130,0,0,0,116,0,160,1,161,0,1,0,122,106,121,14,
-    116,2,136,0,25,0,131,0,125,1,87,0,110,24,4,0,
+    116,2,124,0,25,0,131,0,125,1,87,0,110,24,4,0,
     116,3,107,10,114,48,1,0,1,0,1,0,100,1,125,1,
     89,0,110,2,88,0,124,1,100,1,107,8,114,112,116,4,
-    100,1,107,8,114,76,116,5,136,0,131,1,125,1,110,8,
-    116,6,136,0,131,1,125,1,135,0,102,1,100,2,100,3,
-    132,8,125,2,116,7,160,8,124,1,124,2,161,2,116,2,
-    136,0,60,0,87,0,100,1,116,0,160,9,161,0,1,0,
+    100,1,107,8,114,76,116,5,124,0,131,1,125,1,110,8,
+    116,6,124,0,131,1,125,1,124,0,102,1,100,2,100,3,
+    132,1,125,2,116,7,160,8,124,1,124,2,161,2,116,2,
+    124,0,60,0,87,0,100,1,116,0,160,9,161,0,1,0,
     88,0,124,1,83,0,41,4,122,139,71,101,116,32,111,114,
     32,99,114,101,97,116,101,32,116,104,101,32,109,111,100,117,
     108,101,32,108,111,99,107,32,102,111,114,32,97,32,103,105,
@@ -319,753 +319,899 @@ const unsigned char _Py_M__importlib[] = {
     32,116,104,101,32,103,108,111,98,97,108,32,105,109,112,111,
     114,116,32,108,111,99,107,32,116,111,32,112,114,111,116,101,
     99,116,10,32,32,32,32,95,109,111,100,117,108,101,95,108,
-    111,99,107,115,46,78,99,1,0,0,0,0,0,0,0,1,
-    0,0,0,2,0,0,0,19,0,0,0,115,10,0,0,0,
-    116,0,136,0,61,0,100,0,83,0,41,1,78,41,1,218,
-    13,95,109,111,100,117,108,101,95,108,111,99,107,115,41,1,
-    218,1,95,41,1,114,15,0,0,0,114,10,0,0,0,114,
-    11,0,0,0,218,2,99,98,175,0,0,0,115,2,0,0,
-    0,0,1,122,28,95,103,101,116,95,109,111,100,117,108,101,
-    95,108,111,99,107,46,60,108,111,99,97,108,115,62,46,99,
-    98,41,10,218,4,95,105,109,112,218,12,97,99,113,117,105,
-    114,101,95,108,111,99,107,114,49,0,0,0,218,8,75,101,
+    111,99,107,115,46,78,99,2,0,0,0,0,0,0,0,2,
+    0,0,0,11,0,0,0,83,0,0,0,115,48,0,0,0,
+    116,0,160,1,161,0,1,0,122,24,116,2,160,3,124,1,
+    161,1,124,0,107,8,114,30,116,2,124,1,61,0,87,0,
+    100,0,116,0,160,4,161,0,1,0,88,0,100,0,83,0,
+    41,1,78,41,5,218,4,95,105,109,112,218,12,97,99,113,
+    117,105,114,101,95,108,111,99,107,218,13,95,109,111,100,117,
+    108,101,95,108,111,99,107,115,114,30,0,0,0,218,12,114,
+    101,108,101,97,115,101,95,108,111,99,107,41,2,218,3,114,
+    101,102,114,15,0,0,0,114,10,0,0,0,114,10,0,0,
+    0,114,11,0,0,0,218,2,99,98,176,0,0,0,115,10,
+    0,0,0,0,1,8,1,2,4,14,1,10,2,122,28,95,
+    103,101,116,95,109,111,100,117,108,101,95,108,111,99,107,46,
+    60,108,111,99,97,108,115,62,46,99,98,41,10,114,49,0,
+    0,0,114,50,0,0,0,114,51,0,0,0,218,8,75,101,
     121,69,114,114,111,114,114,20,0,0,0,114,41,0,0,0,
-    114,18,0,0,0,218,8,95,119,101,97,107,114,101,102,90,
-    3,114,101,102,218,12,114,101,108,101,97,115,101,95,108,111,
-    99,107,41,3,114,15,0,0,0,114,21,0,0,0,114,51,
-    0,0,0,114,10,0,0,0,41,1,114,15,0,0,0,114,
-    11,0,0,0,114,45,0,0,0,157,0,0,0,115,28,0,
-    0,0,0,6,8,1,2,1,2,1,14,1,14,1,10,2,
-    8,1,8,1,10,2,8,1,12,2,20,2,10,2,114,45,
-    0,0,0,99,1,0,0,0,0,0,0,0,2,0,0,0,
-    11,0,0,0,67,0,0,0,115,54,0,0,0,116,0,124,
-    0,131,1,125,1,121,12,124,1,160,1,161,0,1,0,87,
-    0,110,20,4,0,116,2,107,10,114,40,1,0,1,0,1,
-    0,89,0,110,10,88,0,124,1,160,3,161,0,1,0,100,
-    1,83,0,41,2,122,189,65,99,113,117,105,114,101,115,32,
-    116,104,101,110,32,114,101,108,101,97,115,101,115,32,116,104,
-    101,32,109,111,100,117,108,101,32,108,111,99,107,32,102,111,
-    114,32,97,32,103,105,118,101,110,32,109,111,100,117,108,101,
-    32,110,97,109,101,46,10,10,32,32,32,32,84,104,105,115,
-    32,105,115,32,117,115,101,100,32,116,111,32,101,110,115,117,
-    114,101,32,97,32,109,111,100,117,108,101,32,105,115,32,99,
-    111,109,112,108,101,116,101,108,121,32,105,110,105,116,105,97,
-    108,105,122,101,100,44,32,105,110,32,116,104,101,10,32,32,
-    32,32,101,118,101,110,116,32,105,116,32,105,115,32,98,101,
-    105,110,103,32,105,109,112,111,114,116,101,100,32,98,121,32,
-    97,110,111,116,104,101,114,32,116,104,114,101,97,100,46,10,
-    32,32,32,32,78,41,4,114,45,0,0,0,114,34,0,0,
-    0,114,17,0,0,0,114,35,0,0,0,41,2,114,15,0,
-    0,0,114,21,0,0,0,114,10,0,0,0,114,10,0,0,
-    0,114,11,0,0,0,218,19,95,108,111,99,107,95,117,110,
-    108,111,99,107,95,109,111,100,117,108,101,184,0,0,0,115,
-    12,0,0,0,0,6,8,1,2,1,12,1,14,3,6,2,
-    114,57,0,0,0,99,1,0,0,0,0,0,0,0,3,0,
-    0,0,3,0,0,0,79,0,0,0,115,10,0,0,0,124,
-    0,124,1,124,2,142,1,83,0,41,1,97,46,1,0,0,
-    114,101,109,111,118,101,95,105,109,112,111,114,116,108,105,98,
-    95,102,114,97,109,101,115,32,105,110,32,105,109,112,111,114,
-    116,46,99,32,119,105,108,108,32,97,108,119,97,121,115,32,
-    114,101,109,111,118,101,32,115,101,113,117,101,110,99,101,115,
-    10,32,32,32,32,111,102,32,105,109,112,111,114,116,108,105,
-    98,32,102,114,97,109,101,115,32,116,104,97,116,32,101,110,
-    100,32,119,105,116,104,32,97,32,99,97,108,108,32,116,111,
-    32,116,104,105,115,32,102,117,110,99,116,105,111,110,10,10,
-    32,32,32,32,85,115,101,32,105,116,32,105,110,115,116,101,
-    97,100,32,111,102,32,97,32,110,111,114,109,97,108,32,99,
-    97,108,108,32,105,110,32,112,108,97,99,101,115,32,119,104,
-    101,114,101,32,105,110,99,108,117,100,105,110,103,32,116,104,
-    101,32,105,109,112,111,114,116,108,105,98,10,32,32,32,32,
-    102,114,97,109,101,115,32,105,110,116,114,111,100,117,99,101,
-    115,32,117,110,119,97,110,116,101,100,32,110,111,105,115,101,
-    32,105,110,116,111,32,116,104,101,32,116,114,97,99,101,98,
-    97,99,107,32,40,101,46,103,46,32,119,104,101,110,32,101,
-    120,101,99,117,116,105,110,103,10,32,32,32,32,109,111,100,
-    117,108,101,32,99,111,100,101,41,10,32,32,32,32,114,10,
-    0,0,0,41,3,218,1,102,114,47,0,0,0,90,4,107,
-    119,100,115,114,10,0,0,0,114,10,0,0,0,114,11,0,
-    0,0,218,25,95,99,97,108,108,95,119,105,116,104,95,102,
-    114,97,109,101,115,95,114,101,109,111,118,101,100,201,0,0,
-    0,115,2,0,0,0,0,8,114,59,0,0,0,114,33,0,
-    0,0,41,1,218,9,118,101,114,98,111,115,105,116,121,99,
-    1,0,0,0,1,0,0,0,3,0,0,0,4,0,0,0,
-    71,0,0,0,115,54,0,0,0,116,0,106,1,106,2,124,
-    1,107,5,114,50,124,0,160,3,100,6,161,1,115,30,100,
-    3,124,0,23,0,125,0,116,4,124,0,106,5,124,2,142,
-    0,116,0,106,6,100,4,141,2,1,0,100,5,83,0,41,
-    7,122,61,80,114,105,110,116,32,116,104,101,32,109,101,115,
-    115,97,103,101,32,116,111,32,115,116,100,101,114,114,32,105,
-    102,32,45,118,47,80,89,84,72,79,78,86,69,82,66,79,
-    83,69,32,105,115,32,116,117,114,110,101,100,32,111,110,46,
-    250,1,35,250,7,105,109,112,111,114,116,32,122,2,35,32,
-    41,1,90,4,102,105,108,101,78,41,2,114,61,0,0,0,
-    114,62,0,0,0,41,7,114,14,0,0,0,218,5,102,108,
-    97,103,115,218,7,118,101,114,98,111,115,101,218,10,115,116,
-    97,114,116,115,119,105,116,104,218,5,112,114,105,110,116,114,
-    38,0,0,0,218,6,115,116,100,101,114,114,41,3,218,7,
-    109,101,115,115,97,103,101,114,60,0,0,0,114,47,0,0,
-    0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
-    218,16,95,118,101,114,98,111,115,101,95,109,101,115,115,97,
-    103,101,212,0,0,0,115,8,0,0,0,0,2,12,1,10,
-    1,8,1,114,69,0,0,0,99,1,0,0,0,0,0,0,
-    0,2,0,0,0,3,0,0,0,3,0,0,0,115,26,0,
-    0,0,135,0,102,1,100,1,100,2,132,8,125,1,116,0,
-    124,1,136,0,131,2,1,0,124,1,83,0,41,3,122,49,
-    68,101,99,111,114,97,116,111,114,32,116,111,32,118,101,114,
-    105,102,121,32,116,104,101,32,110,97,109,101,100,32,109,111,
-    100,117,108,101,32,105,115,32,98,117,105,108,116,45,105,110,
-    46,99,2,0,0,0,0,0,0,0,2,0,0,0,4,0,
-    0,0,19,0,0,0,115,38,0,0,0,124,1,116,0,106,
-    1,107,7,114,28,116,2,100,1,160,3,124,1,161,1,124,
-    1,100,2,141,2,130,1,136,0,124,0,124,1,131,2,83,
-    0,41,3,78,122,29,123,33,114,125,32,105,115,32,110,111,
-    116,32,97,32,98,117,105,108,116,45,105,110,32,109,111,100,
-    117,108,101,41,1,114,15,0,0,0,41,4,114,14,0,0,
-    0,218,20,98,117,105,108,116,105,110,95,109,111,100,117,108,
-    101,95,110,97,109,101,115,218,11,73,109,112,111,114,116,69,
-    114,114,111,114,114,38,0,0,0,41,2,114,26,0,0,0,
-    218,8,102,117,108,108,110,97,109,101,41,1,218,3,102,120,
-    110,114,10,0,0,0,114,11,0,0,0,218,25,95,114,101,
-    113,117,105,114,101,115,95,98,117,105,108,116,105,110,95,119,
-    114,97,112,112,101,114,222,0,0,0,115,8,0,0,0,0,
-    1,10,1,10,1,8,1,122,52,95,114,101,113,117,105,114,
-    101,115,95,98,117,105,108,116,105,110,46,60,108,111,99,97,
-    108,115,62,46,95,114,101,113,117,105,114,101,115,95,98,117,
-    105,108,116,105,110,95,119,114,97,112,112,101,114,41,1,114,
-    12,0,0,0,41,2,114,73,0,0,0,114,74,0,0,0,
-    114,10,0,0,0,41,1,114,73,0,0,0,114,11,0,0,
-    0,218,17,95,114,101,113,117,105,114,101,115,95,98,117,105,
-    108,116,105,110,220,0,0,0,115,6,0,0,0,0,2,12,
-    5,10,1,114,75,0,0,0,99,1,0,0,0,0,0,0,
-    0,2,0,0,0,3,0,0,0,3,0,0,0,115,26,0,
-    0,0,135,0,102,1,100,1,100,2,132,8,125,1,116,0,
-    124,1,136,0,131,2,1,0,124,1,83,0,41,3,122,47,
-    68,101,99,111,114,97,116,111,114,32,116,111,32,118,101,114,
-    105,102,121,32,116,104,101,32,110,97,109,101,100,32,109,111,
-    100,117,108,101,32,105,115,32,102,114,111,122,101,110,46,99,
-    2,0,0,0,0,0,0,0,2,0,0,0,4,0,0,0,
-    19,0,0,0,115,38,0,0,0,116,0,160,1,124,1,161,
-    1,115,28,116,2,100,1,160,3,124,1,161,1,124,1,100,
-    2,141,2,130,1,136,0,124,0,124,1,131,2,83,0,41,
-    3,78,122,27,123,33,114,125,32,105,115,32,110,111,116,32,
-    97,32,102,114,111,122,101,110,32,109,111,100,117,108,101,41,
-    1,114,15,0,0,0,41,4,114,52,0,0,0,218,9,105,
-    115,95,102,114,111,122,101,110,114,71,0,0,0,114,38,0,
-    0,0,41,2,114,26,0,0,0,114,72,0,0,0,41,1,
-    114,73,0,0,0,114,10,0,0,0,114,11,0,0,0,218,
-    24,95,114,101,113,117,105,114,101,115,95,102,114,111,122,101,
-    110,95,119,114,97,112,112,101,114,233,0,0,0,115,8,0,
-    0,0,0,1,10,1,10,1,8,1,122,50,95,114,101,113,
-    117,105,114,101,115,95,102,114,111,122,101,110,46,60,108,111,
-    99,97,108,115,62,46,95,114,101,113,117,105,114,101,115,95,
-    102,114,111,122,101,110,95,119,114,97,112,112,101,114,41,1,
-    114,12,0,0,0,41,2,114,73,0,0,0,114,77,0,0,
-    0,114,10,0,0,0,41,1,114,73,0,0,0,114,11,0,
-    0,0,218,16,95,114,101,113,117,105,114,101,115,95,102,114,
-    111,122,101,110,231,0,0,0,115,6,0,0,0,0,2,12,
-    5,10,1,114,78,0,0,0,99,2,0,0,0,0,0,0,
-    0,4,0,0,0,3,0,0,0,67,0,0,0,115,62,0,
-    0,0,116,0,124,1,124,0,131,2,125,2,124,1,116,1,
-    106,2,107,6,114,50,116,1,106,2,124,1,25,0,125,3,
-    116,3,124,2,124,3,131,2,1,0,116,1,106,2,124,1,
-    25,0,83,0,116,4,124,2,131,1,83,0,100,1,83,0,
-    41,2,122,128,76,111,97,100,32,116,104,101,32,115,112,101,
-    99,105,102,105,101,100,32,109,111,100,117,108,101,32,105,110,
-    116,111,32,115,121,115,46,109,111,100,117,108,101,115,32,97,
-    110,100,32,114,101,116,117,114,110,32,105,116,46,10,10,32,
-    32,32,32,84,104,105,115,32,109,101,116,104,111,100,32,105,
-    115,32,100,101,112,114,101,99,97,116,101,100,46,32,32,85,
-    115,101,32,108,111,97,100,101,114,46,101,120,101,99,95,109,
-    111,100,117,108,101,32,105,110,115,116,101,97,100,46,10,10,
-    32,32,32,32,78,41,5,218,16,115,112,101,99,95,102,114,
-    111,109,95,108,111,97,100,101,114,114,14,0,0,0,218,7,
-    109,111,100,117,108,101,115,218,5,95,101,120,101,99,218,5,
-    95,108,111,97,100,41,4,114,26,0,0,0,114,72,0,0,
-    0,218,4,115,112,101,99,218,6,109,111,100,117,108,101,114,
-    10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,17,
-    95,108,111,97,100,95,109,111,100,117,108,101,95,115,104,105,
-    109,243,0,0,0,115,12,0,0,0,0,6,10,1,10,1,
-    10,1,10,1,10,2,114,85,0,0,0,99,1,0,0,0,
-    0,0,0,0,5,0,0,0,36,0,0,0,67,0,0,0,
-    115,216,0,0,0,116,0,124,0,100,1,100,0,131,3,125,
-    1,116,1,124,1,100,2,131,2,114,54,121,10,124,1,160,
-    2,124,0,161,1,83,0,4,0,116,3,107,10,114,52,1,
-    0,1,0,1,0,89,0,110,2,88,0,121,10,124,0,106,
-    4,125,2,87,0,110,20,4,0,116,5,107,10,114,84,1,
-    0,1,0,1,0,89,0,110,18,88,0,124,2,100,0,107,
-    9,114,102,116,6,124,2,131,1,83,0,121,10,124,0,106,
-    7,125,3,87,0,110,24,4,0,116,5,107,10,114,136,1,
-    0,1,0,1,0,100,3,125,3,89,0,110,2,88,0,121,
-    10,124,0,106,8,125,4,87,0,110,50,4,0,116,5,107,
-    10,114,198,1,0,1,0,1,0,124,1,100,0,107,8,114,
-    182,100,4,160,9,124,3,161,1,83,0,100,5,160,9,124,
-    3,124,1,161,2,83,0,89,0,110,14,88,0,100,6,160,
-    9,124,3,124,4,161,2,83,0,100,0,83,0,41,7,78,
-    218,10,95,95,108,111,97,100,101,114,95,95,218,11,109,111,
-    100,117,108,101,95,114,101,112,114,250,1,63,122,13,60,109,
-    111,100,117,108,101,32,123,33,114,125,62,122,20,60,109,111,
-    100,117,108,101,32,123,33,114,125,32,40,123,33,114,125,41,
-    62,122,23,60,109,111,100,117,108,101,32,123,33,114,125,32,
-    102,114,111,109,32,123,33,114,125,62,41,10,114,6,0,0,
-    0,114,4,0,0,0,114,87,0,0,0,218,9,69,120,99,
-    101,112,116,105,111,110,218,8,95,95,115,112,101,99,95,95,
-    218,14,65,116,116,114,105,98,117,116,101,69,114,114,111,114,
-    218,22,95,109,111,100,117,108,101,95,114,101,112,114,95,102,
-    114,111,109,95,115,112,101,99,114,1,0,0,0,218,8,95,
-    95,102,105,108,101,95,95,114,38,0,0,0,41,5,114,84,
-    0,0,0,218,6,108,111,97,100,101,114,114,83,0,0,0,
-    114,15,0,0,0,218,8,102,105,108,101,110,97,109,101,114,
-    10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,12,
-    95,109,111,100,117,108,101,95,114,101,112,114,3,1,0,0,
-    115,46,0,0,0,0,2,12,1,10,4,2,1,10,1,14,
-    1,6,1,2,1,10,1,14,1,6,2,8,1,8,4,2,
-    1,10,1,14,1,10,1,2,1,10,1,14,1,8,1,10,
-    2,18,2,114,96,0,0,0,99,0,0,0,0,0,0,0,
-    0,0,0,0,0,2,0,0,0,64,0,0,0,115,36,0,
-    0,0,101,0,90,1,100,0,90,2,100,1,100,2,132,0,
-    90,3,100,3,100,4,132,0,90,4,100,5,100,6,132,0,
-    90,5,100,7,83,0,41,8,218,17,95,105,110,115,116,97,
-    108,108,101,100,95,115,97,102,101,108,121,99,2,0,0,0,
-    0,0,0,0,2,0,0,0,2,0,0,0,67,0,0,0,
-    115,18,0,0,0,124,1,124,0,95,0,124,1,106,1,124,
-    0,95,2,100,0,83,0,41,1,78,41,3,218,7,95,109,
-    111,100,117,108,101,114,90,0,0,0,218,5,95,115,112,101,
-    99,41,2,114,26,0,0,0,114,84,0,0,0,114,10,0,
-    0,0,114,10,0,0,0,114,11,0,0,0,114,27,0,0,
-    0,41,1,0,0,115,4,0,0,0,0,1,6,1,122,26,
-    95,105,110,115,116,97,108,108,101,100,95,115,97,102,101,108,
-    121,46,95,95,105,110,105,116,95,95,99,1,0,0,0,0,
-    0,0,0,1,0,0,0,3,0,0,0,67,0,0,0,115,
-    28,0,0,0,100,1,124,0,106,0,95,1,124,0,106,2,
-    116,3,106,4,124,0,106,0,106,5,60,0,100,0,83,0,
-    41,2,78,84,41,6,114,99,0,0,0,218,13,95,105,110,
-    105,116,105,97,108,105,122,105,110,103,114,98,0,0,0,114,
-    14,0,0,0,114,80,0,0,0,114,15,0,0,0,41,1,
-    114,26,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
-    11,0,0,0,114,46,0,0,0,45,1,0,0,115,4,0,
-    0,0,0,4,8,1,122,27,95,105,110,115,116,97,108,108,
-    101,100,95,115,97,102,101,108,121,46,95,95,101,110,116,101,
-    114,95,95,99,1,0,0,0,0,0,0,0,3,0,0,0,
-    17,0,0,0,71,0,0,0,115,98,0,0,0,122,82,124,
-    0,106,0,125,2,116,1,100,1,100,2,132,0,124,1,68,
-    0,131,1,131,1,114,64,121,14,116,2,106,3,124,2,106,
-    4,61,0,87,0,113,80,4,0,116,5,107,10,114,60,1,
-    0,1,0,1,0,89,0,113,80,88,0,110,16,116,6,100,
-    3,124,2,106,4,124,2,106,7,131,3,1,0,87,0,100,
-    0,100,4,124,0,106,0,95,8,88,0,100,0,83,0,41,
-    5,78,99,1,0,0,0,0,0,0,0,2,0,0,0,3,
-    0,0,0,115,0,0,0,115,22,0,0,0,124,0,93,14,
-    125,1,124,1,100,0,107,9,86,0,1,0,113,2,100,0,
-    83,0,41,1,78,114,10,0,0,0,41,2,90,2,46,48,
-    90,3,97,114,103,114,10,0,0,0,114,10,0,0,0,114,
-    11,0,0,0,250,9,60,103,101,110,101,120,112,114,62,55,
-    1,0,0,115,2,0,0,0,4,0,122,45,95,105,110,115,
-    116,97,108,108,101,100,95,115,97,102,101,108,121,46,95,95,
-    101,120,105,116,95,95,46,60,108,111,99,97,108,115,62,46,
-    60,103,101,110,101,120,112,114,62,122,18,105,109,112,111,114,
-    116,32,123,33,114,125,32,35,32,123,33,114,125,70,41,9,
-    114,99,0,0,0,218,3,97,110,121,114,14,0,0,0,114,
-    80,0,0,0,114,15,0,0,0,114,54,0,0,0,114,69,
-    0,0,0,114,94,0,0,0,114,100,0,0,0,41,3,114,
-    26,0,0,0,114,47,0,0,0,114,83,0,0,0,114,10,
-    0,0,0,114,10,0,0,0,114,11,0,0,0,114,48,0,
-    0,0,52,1,0,0,115,18,0,0,0,0,1,2,1,6,
-    1,18,1,2,1,14,1,14,1,8,2,20,2,122,26,95,
+    114,18,0,0,0,218,8,95,119,101,97,107,114,101,102,114,
+    53,0,0,0,114,52,0,0,0,41,3,114,15,0,0,0,
+    114,21,0,0,0,114,54,0,0,0,114,10,0,0,0,114,
+    10,0,0,0,114,11,0,0,0,114,45,0,0,0,157,0,
+    0,0,115,28,0,0,0,0,6,8,1,2,1,2,1,14,
+    1,14,1,10,2,8,1,8,1,10,2,8,2,12,11,20,
+    2,10,2,114,45,0,0,0,99,1,0,0,0,0,0,0,
+    0,2,0,0,0,11,0,0,0,67,0,0,0,115,54,0,
+    0,0,116,0,124,0,131,1,125,1,121,12,124,1,160,1,
+    161,0,1,0,87,0,110,20,4,0,116,2,107,10,114,40,
+    1,0,1,0,1,0,89,0,110,10,88,0,124,1,160,3,
+    161,0,1,0,100,1,83,0,41,2,122,189,65,99,113,117,
+    105,114,101,115,32,116,104,101,110,32,114,101,108,101,97,115,
+    101,115,32,116,104,101,32,109,111,100,117,108,101,32,108,111,
+    99,107,32,102,111,114,32,97,32,103,105,118,101,110,32,109,
+    111,100,117,108,101,32,110,97,109,101,46,10,10,32,32,32,
+    32,84,104,105,115,32,105,115,32,117,115,101,100,32,116,111,
+    32,101,110,115,117,114,101,32,97,32,109,111,100,117,108,101,
+    32,105,115,32,99,111,109,112,108,101,116,101,108,121,32,105,
+    110,105,116,105,97,108,105,122,101,100,44,32,105,110,32,116,
+    104,101,10,32,32,32,32,101,118,101,110,116,32,105,116,32,
+    105,115,32,98,101,105,110,103,32,105,109,112,111,114,116,101,
+    100,32,98,121,32,97,110,111,116,104,101,114,32,116,104,114,
+    101,97,100,46,10,32,32,32,32,78,41,4,114,45,0,0,
+    0,114,34,0,0,0,114,17,0,0,0,114,35,0,0,0,
+    41,2,114,15,0,0,0,114,21,0,0,0,114,10,0,0,
+    0,114,10,0,0,0,114,11,0,0,0,218,19,95,108,111,
+    99,107,95,117,110,108,111,99,107,95,109,111,100,117,108,101,
+    194,0,0,0,115,12,0,0,0,0,6,8,1,2,1,12,
+    1,14,3,6,2,114,57,0,0,0,99,1,0,0,0,0,
+    0,0,0,3,0,0,0,3,0,0,0,79,0,0,0,115,
+    10,0,0,0,124,0,124,1,124,2,142,1,83,0,41,1,
+    97,46,1,0,0,114,101,109,111,118,101,95,105,109,112,111,
+    114,116,108,105,98,95,102,114,97,109,101,115,32,105,110,32,
+    105,109,112,111,114,116,46,99,32,119,105,108,108,32,97,108,
+    119,97,121,115,32,114,101,109,111,118,101,32,115,101,113,117,
+    101,110,99,101,115,10,32,32,32,32,111,102,32,105,109,112,
+    111,114,116,108,105,98,32,102,114,97,109,101,115,32,116,104,
+    97,116,32,101,110,100,32,119,105,116,104,32,97,32,99,97,
+    108,108,32,116,111,32,116,104,105,115,32,102,117,110,99,116,
+    105,111,110,10,10,32,32,32,32,85,115,101,32,105,116,32,
+    105,110,115,116,101,97,100,32,111,102,32,97,32,110,111,114,
+    109,97,108,32,99,97,108,108,32,105,110,32,112,108,97,99,
+    101,115,32,119,104,101,114,101,32,105,110,99,108,117,100,105,
+    110,103,32,116,104,101,32,105,109,112,111,114,116,108,105,98,
+    10,32,32,32,32,102,114,97,109,101,115,32,105,110,116,114,
+    111,100,117,99,101,115,32,117,110,119,97,110,116,101,100,32,
+    110,111,105,115,101,32,105,110,116,111,32,116,104,101,32,116,
+    114,97,99,101,98,97,99,107,32,40,101,46,103,46,32,119,
+    104,101,110,32,101,120,101,99,117,116,105,110,103,10,32,32,
+    32,32,109,111,100,117,108,101,32,99,111,100,101,41,10,32,
+    32,32,32,114,10,0,0,0,41,3,218,1,102,114,47,0,
+    0,0,90,4,107,119,100,115,114,10,0,0,0,114,10,0,
+    0,0,114,11,0,0,0,218,25,95,99,97,108,108,95,119,
+    105,116,104,95,102,114,97,109,101,115,95,114,101,109,111,118,
+    101,100,211,0,0,0,115,2,0,0,0,0,8,114,59,0,
+    0,0,114,33,0,0,0,41,1,218,9,118,101,114,98,111,
+    115,105,116,121,99,1,0,0,0,1,0,0,0,3,0,0,
+    0,4,0,0,0,71,0,0,0,115,54,0,0,0,116,0,
+    106,1,106,2,124,1,107,5,114,50,124,0,160,3,100,6,
+    161,1,115,30,100,3,124,0,23,0,125,0,116,4,124,0,
+    106,5,124,2,142,0,116,0,106,6,100,4,141,2,1,0,
+    100,5,83,0,41,7,122,61,80,114,105,110,116,32,116,104,
+    101,32,109,101,115,115,97,103,101,32,116,111,32,115,116,100,
+    101,114,114,32,105,102,32,45,118,47,80,89,84,72,79,78,
+    86,69,82,66,79,83,69,32,105,115,32,116,117,114,110,101,
+    100,32,111,110,46,250,1,35,250,7,105,109,112,111,114,116,
+    32,122,2,35,32,41,1,90,4,102,105,108,101,78,41,2,
+    114,61,0,0,0,114,62,0,0,0,41,7,114,14,0,0,
+    0,218,5,102,108,97,103,115,218,7,118,101,114,98,111,115,
+    101,218,10,115,116,97,114,116,115,119,105,116,104,218,5,112,
+    114,105,110,116,114,38,0,0,0,218,6,115,116,100,101,114,
+    114,41,3,218,7,109,101,115,115,97,103,101,114,60,0,0,
+    0,114,47,0,0,0,114,10,0,0,0,114,10,0,0,0,
+    114,11,0,0,0,218,16,95,118,101,114,98,111,115,101,95,
+    109,101,115,115,97,103,101,222,0,0,0,115,8,0,0,0,
+    0,2,12,1,10,1,8,1,114,69,0,0,0,99,1,0,
+    0,0,0,0,0,0,2,0,0,0,3,0,0,0,3,0,
+    0,0,115,26,0,0,0,135,0,102,1,100,1,100,2,132,
+    8,125,1,116,0,124,1,136,0,131,2,1,0,124,1,83,
+    0,41,3,122,49,68,101,99,111,114,97,116,111,114,32,116,
+    111,32,118,101,114,105,102,121,32,116,104,101,32,110,97,109,
+    101,100,32,109,111,100,117,108,101,32,105,115,32,98,117,105,
+    108,116,45,105,110,46,99,2,0,0,0,0,0,0,0,2,
+    0,0,0,4,0,0,0,19,0,0,0,115,38,0,0,0,
+    124,1,116,0,106,1,107,7,114,28,116,2,100,1,160,3,
+    124,1,161,1,124,1,100,2,141,2,130,1,136,0,124,0,
+    124,1,131,2,83,0,41,3,78,122,29,123,33,114,125,32,
+    105,115,32,110,111,116,32,97,32,98,117,105,108,116,45,105,
+    110,32,109,111,100,117,108,101,41,1,114,15,0,0,0,41,
+    4,114,14,0,0,0,218,20,98,117,105,108,116,105,110,95,
+    109,111,100,117,108,101,95,110,97,109,101,115,218,11,73,109,
+    112,111,114,116,69,114,114,111,114,114,38,0,0,0,41,2,
+    114,26,0,0,0,218,8,102,117,108,108,110,97,109,101,41,
+    1,218,3,102,120,110,114,10,0,0,0,114,11,0,0,0,
+    218,25,95,114,101,113,117,105,114,101,115,95,98,117,105,108,
+    116,105,110,95,119,114,97,112,112,101,114,232,0,0,0,115,
+    8,0,0,0,0,1,10,1,10,1,8,1,122,52,95,114,
+    101,113,117,105,114,101,115,95,98,117,105,108,116,105,110,46,
+    60,108,111,99,97,108,115,62,46,95,114,101,113,117,105,114,
+    101,115,95,98,117,105,108,116,105,110,95,119,114,97,112,112,
+    101,114,41,1,114,12,0,0,0,41,2,114,73,0,0,0,
+    114,74,0,0,0,114,10,0,0,0,41,1,114,73,0,0,
+    0,114,11,0,0,0,218,17,95,114,101,113,117,105,114,101,
+    115,95,98,117,105,108,116,105,110,230,0,0,0,115,6,0,
+    0,0,0,2,12,5,10,1,114,75,0,0,0,99,1,0,
+    0,0,0,0,0,0,2,0,0,0,3,0,0,0,3,0,
+    0,0,115,26,0,0,0,135,0,102,1,100,1,100,2,132,
+    8,125,1,116,0,124,1,136,0,131,2,1,0,124,1,83,
+    0,41,3,122,47,68,101,99,111,114,97,116,111,114,32,116,
+    111,32,118,101,114,105,102,121,32,116,104,101,32,110,97,109,
+    101,100,32,109,111,100,117,108,101,32,105,115,32,102,114,111,
+    122,101,110,46,99,2,0,0,0,0,0,0,0,2,0,0,
+    0,4,0,0,0,19,0,0,0,115,38,0,0,0,116,0,
+    160,1,124,1,161,1,115,28,116,2,100,1,160,3,124,1,
+    161,1,124,1,100,2,141,2,130,1,136,0,124,0,124,1,
+    131,2,83,0,41,3,78,122,27,123,33,114,125,32,105,115,
+    32,110,111,116,32,97,32,102,114,111,122,101,110,32,109,111,
+    100,117,108,101,41,1,114,15,0,0,0,41,4,114,49,0,
+    0,0,218,9,105,115,95,102,114,111,122,101,110,114,71,0,
+    0,0,114,38,0,0,0,41,2,114,26,0,0,0,114,72,
+    0,0,0,41,1,114,73,0,0,0,114,10,0,0,0,114,
+    11,0,0,0,218,24,95,114,101,113,117,105,114,101,115,95,
+    102,114,111,122,101,110,95,119,114,97,112,112,101,114,243,0,
+    0,0,115,8,0,0,0,0,1,10,1,10,1,8,1,122,
+    50,95,114,101,113,117,105,114,101,115,95,102,114,111,122,101,
+    110,46,60,108,111,99,97,108,115,62,46,95,114,101,113,117,
+    105,114,101,115,95,102,114,111,122,101,110,95,119,114,97,112,
+    112,101,114,41,1,114,12,0,0,0,41,2,114,73,0,0,
+    0,114,77,0,0,0,114,10,0,0,0,41,1,114,73,0,
+    0,0,114,11,0,0,0,218,16,95,114,101,113,117,105,114,
+    101,115,95,102,114,111,122,101,110,241,0,0,0,115,6,0,
+    0,0,0,2,12,5,10,1,114,78,0,0,0,99,2,0,
+    0,0,0,0,0,0,4,0,0,0,3,0,0,0,67,0,
+    0,0,115,62,0,0,0,116,0,124,1,124,0,131,2,125,
+    2,124,1,116,1,106,2,107,6,114,50,116,1,106,2,124,
+    1,25,0,125,3,116,3,124,2,124,3,131,2,1,0,116,
+    1,106,2,124,1,25,0,83,0,116,4,124,2,131,1,83,
+    0,100,1,83,0,41,2,122,128,76,111,97,100,32,116,104,
+    101,32,115,112,101,99,105,102,105,101,100,32,109,111,100,117,
+    108,101,32,105,110,116,111,32,115,121,115,46,109,111,100,117,
+    108,101,115,32,97,110,100,32,114,101,116,117,114,110,32,105,
+    116,46,10,10,32,32,32,32,84,104,105,115,32,109,101,116,
+    104,111,100,32,105,115,32,100,101,112,114,101,99,97,116,101,
+    100,46,32,32,85,115,101,32,108,111,97,100,101,114,46,101,
+    120,101,99,95,109,111,100,117,108,101,32,105,110,115,116,101,
+    97,100,46,10,10,32,32,32,32,78,41,5,218,16,115,112,
+    101,99,95,102,114,111,109,95,108,111,97,100,101,114,114,14,
+    0,0,0,218,7,109,111,100,117,108,101,115,218,5,95,101,
+    120,101,99,218,5,95,108,111,97,100,41,4,114,26,0,0,
+    0,114,72,0,0,0,218,4,115,112,101,99,218,6,109,111,
+    100,117,108,101,114,10,0,0,0,114,10,0,0,0,114,11,
+    0,0,0,218,17,95,108,111,97,100,95,109,111,100,117,108,
+    101,95,115,104,105,109,253,0,0,0,115,12,0,0,0,0,
+    6,10,1,10,1,10,1,10,1,10,2,114,85,0,0,0,
+    99,1,0,0,0,0,0,0,0,5,0,0,0,36,0,0,
+    0,67,0,0,0,115,216,0,0,0,116,0,124,0,100,1,
+    100,0,131,3,125,1,116,1,124,1,100,2,131,2,114,54,
+    121,10,124,1,160,2,124,0,161,1,83,0,4,0,116,3,
+    107,10,114,52,1,0,1,0,1,0,89,0,110,2,88,0,
+    121,10,124,0,106,4,125,2,87,0,110,20,4,0,116,5,
+    107,10,114,84,1,0,1,0,1,0,89,0,110,18,88,0,
+    124,2,100,0,107,9,114,102,116,6,124,2,131,1,83,0,
+    121,10,124,0,106,7,125,3,87,0,110,24,4,0,116,5,
+    107,10,114,136,1,0,1,0,1,0,100,3,125,3,89,0,
+    110,2,88,0,121,10,124,0,106,8,125,4,87,0,110,50,
+    4,0,116,5,107,10,114,198,1,0,1,0,1,0,124,1,
+    100,0,107,8,114,182,100,4,160,9,124,3,161,1,83,0,
+    100,5,160,9,124,3,124,1,161,2,83,0,89,0,110,14,
+    88,0,100,6,160,9,124,3,124,4,161,2,83,0,100,0,
+    83,0,41,7,78,218,10,95,95,108,111,97,100,101,114,95,
+    95,218,11,109,111,100,117,108,101,95,114,101,112,114,250,1,
+    63,122,13,60,109,111,100,117,108,101,32,123,33,114,125,62,
+    122,20,60,109,111,100,117,108,101,32,123,33,114,125,32,40,
+    123,33,114,125,41,62,122,23,60,109,111,100,117,108,101,32,
+    123,33,114,125,32,102,114,111,109,32,123,33,114,125,62,41,
+    10,114,6,0,0,0,114,4,0,0,0,114,87,0,0,0,
+    218,9,69,120,99,101,112,116,105,111,110,218,8,95,95,115,
+    112,101,99,95,95,218,14,65,116,116,114,105,98,117,116,101,
+    69,114,114,111,114,218,22,95,109,111,100,117,108,101,95,114,
+    101,112,114,95,102,114,111,109,95,115,112,101,99,114,1,0,
+    0,0,218,8,95,95,102,105,108,101,95,95,114,38,0,0,
+    0,41,5,114,84,0,0,0,218,6,108,111,97,100,101,114,
+    114,83,0,0,0,114,15,0,0,0,218,8,102,105,108,101,
+    110,97,109,101,114,10,0,0,0,114,10,0,0,0,114,11,
+    0,0,0,218,12,95,109,111,100,117,108,101,95,114,101,112,
+    114,13,1,0,0,115,46,0,0,0,0,2,12,1,10,4,
+    2,1,10,1,14,1,6,1,2,1,10,1,14,1,6,2,
+    8,1,8,4,2,1,10,1,14,1,10,1,2,1,10,1,
+    14,1,8,1,10,2,18,2,114,96,0,0,0,99,0,0,
+    0,0,0,0,0,0,0,0,0,0,2,0,0,0,64,0,
+    0,0,115,36,0,0,0,101,0,90,1,100,0,90,2,100,
+    1,100,2,132,0,90,3,100,3,100,4,132,0,90,4,100,
+    5,100,6,132,0,90,5,100,7,83,0,41,8,218,17,95,
     105,110,115,116,97,108,108,101,100,95,115,97,102,101,108,121,
-    46,95,95,101,120,105,116,95,95,78,41,6,114,1,0,0,
-    0,114,0,0,0,0,114,2,0,0,0,114,27,0,0,0,
-    114,46,0,0,0,114,48,0,0,0,114,10,0,0,0,114,
-    10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,97,
-    0,0,0,39,1,0,0,115,6,0,0,0,8,2,8,4,
-    8,7,114,97,0,0,0,99,0,0,0,0,0,0,0,0,
-    0,0,0,0,4,0,0,0,64,0,0,0,115,114,0,0,
-    0,101,0,90,1,100,0,90,2,100,1,90,3,100,2,100,
-    2,100,2,100,3,156,3,100,4,100,5,132,2,90,4,100,
-    6,100,7,132,0,90,5,100,8,100,9,132,0,90,6,101,
-    7,100,10,100,11,132,0,131,1,90,8,101,8,106,9,100,
-    12,100,11,132,0,131,1,90,8,101,7,100,13,100,14,132,
-    0,131,1,90,10,101,7,100,15,100,16,132,0,131,1,90,
-    11,101,11,106,9,100,17,100,16,132,0,131,1,90,11,100,
-    2,83,0,41,18,218,10,77,111,100,117,108,101,83,112,101,
-    99,97,208,5,0,0,84,104,101,32,115,112,101,99,105,102,
-    105,99,97,116,105,111,110,32,102,111,114,32,97,32,109,111,
-    100,117,108,101,44,32,117,115,101,100,32,102,111,114,32,108,
-    111,97,100,105,110,103,46,10,10,32,32,32,32,65,32,109,
-    111,100,117,108,101,39,115,32,115,112,101,99,32,105,115,32,
-    116,104,101,32,115,111,117,114,99,101,32,102,111,114,32,105,
-    110,102,111,114,109,97,116,105,111,110,32,97,98,111,117,116,
-    32,116,104,101,32,109,111,100,117,108,101,46,32,32,70,111,
-    114,10,32,32,32,32,100,97,116,97,32,97,115,115,111,99,
-    105,97,116,101,100,32,119,105,116,104,32,116,104,101,32,109,
-    111,100,117,108,101,44,32,105,110,99,108,117,100,105,110,103,
-    32,115,111,117,114,99,101,44,32,117,115,101,32,116,104,101,
-    32,115,112,101,99,39,115,10,32,32,32,32,108,111,97,100,
-    101,114,46,10,10,32,32,32,32,96,110,97,109,101,96,32,
-    105,115,32,116,104,101,32,97,98,115,111,108,117,116,101,32,
-    110,97,109,101,32,111,102,32,116,104,101,32,109,111,100,117,
-    108,101,46,32,32,96,108,111,97,100,101,114,96,32,105,115,
-    32,116,104,101,32,108,111,97,100,101,114,10,32,32,32,32,
-    116,111,32,117,115,101,32,119,104,101,110,32,108,111,97,100,
-    105,110,103,32,116,104,101,32,109,111,100,117,108,101,46,32,
-    32,96,112,97,114,101,110,116,96,32,105,115,32,116,104,101,
-    32,110,97,109,101,32,111,102,32,116,104,101,10,32,32,32,
-    32,112,97,99,107,97,103,101,32,116,104,101,32,109,111,100,
-    117,108,101,32,105,115,32,105,110,46,32,32,84,104,101,32,
-    112,97,114,101,110,116,32,105,115,32,100,101,114,105,118,101,
-    100,32,102,114,111,109,32,116,104,101,32,110,97,109,101,46,
-    10,10,32,32,32,32,96,105,115,95,112,97,99,107,97,103,
-    101,96,32,100,101,116,101,114,109,105,110,101,115,32,105,102,
-    32,116,104,101,32,109,111,100,117,108,101,32,105,115,32,99,
-    111,110,115,105,100,101,114,101,100,32,97,32,112,97,99,107,
-    97,103,101,32,111,114,10,32,32,32,32,110,111,116,46,32,
-    32,79,110,32,109,111,100,117,108,101,115,32,116,104,105,115,
-    32,105,115,32,114,101,102,108,101,99,116,101,100,32,98,121,
-    32,116,104,101,32,96,95,95,112,97,116,104,95,95,96,32,
-    97,116,116,114,105,98,117,116,101,46,10,10,32,32,32,32,
-    96,111,114,105,103,105,110,96,32,105,115,32,116,104,101,32,
-    115,112,101,99,105,102,105,99,32,108,111,99,97,116,105,111,
-    110,32,117,115,101,100,32,98,121,32,116,104,101,32,108,111,
-    97,100,101,114,32,102,114,111,109,32,119,104,105,99,104,32,
-    116,111,10,32,32,32,32,108,111,97,100,32,116,104,101,32,
-    109,111,100,117,108,101,44,32,105,102,32,116,104,97,116,32,
-    105,110,102,111,114,109,97,116,105,111,110,32,105,115,32,97,
-    118,97,105,108,97,98,108,101,46,32,32,87,104,101,110,32,
-    102,105,108,101,110,97,109,101,32,105,115,10,32,32,32,32,
-    115,101,116,44,32,111,114,105,103,105,110,32,119,105,108,108,
-    32,109,97,116,99,104,46,10,10,32,32,32,32,96,104,97,
-    115,95,108,111,99,97,116,105,111,110,96,32,105,110,100,105,
-    99,97,116,101,115,32,116,104,97,116,32,97,32,115,112,101,
-    99,39,115,32,34,111,114,105,103,105,110,34,32,114,101,102,
-    108,101,99,116,115,32,97,32,108,111,99,97,116,105,111,110,
-    46,10,32,32,32,32,87,104,101,110,32,116,104,105,115,32,
-    105,115,32,84,114,117,101,44,32,96,95,95,102,105,108,101,
-    95,95,96,32,97,116,116,114,105,98,117,116,101,32,111,102,
-    32,116,104,101,32,109,111,100,117,108,101,32,105,115,32,115,
-    101,116,46,10,10,32,32,32,32,96,99,97,99,104,101,100,
-    96,32,105,115,32,116,104,101,32,108,111,99,97,116,105,111,
-    110,32,111,102,32,116,104,101,32,99,97,99,104,101,100,32,
-    98,121,116,101,99,111,100,101,32,102,105,108,101,44,32,105,
-    102,32,97,110,121,46,32,32,73,116,10,32,32,32,32,99,
-    111,114,114,101,115,112,111,110,100,115,32,116,111,32,116,104,
-    101,32,96,95,95,99,97,99,104,101,100,95,95,96,32,97,
-    116,116,114,105,98,117,116,101,46,10,10,32,32,32,32,96,
-    115,117,98,109,111,100,117,108,101,95,115,101,97,114,99,104,
-    95,108,111,99,97,116,105,111,110,115,96,32,105,115,32,116,
-    104,101,32,115,101,113,117,101,110,99,101,32,111,102,32,112,
-    97,116,104,32,101,110,116,114,105,101,115,32,116,111,10,32,
-    32,32,32,115,101,97,114,99,104,32,119,104,101,110,32,105,
-    109,112,111,114,116,105,110,103,32,115,117,98,109,111,100,117,
-    108,101,115,46,32,32,73,102,32,115,101,116,44,32,105,115,
-    95,112,97,99,107,97,103,101,32,115,104,111,117,108,100,32,
-    98,101,10,32,32,32,32,84,114,117,101,45,45,97,110,100,
-    32,70,97,108,115,101,32,111,116,104,101,114,119,105,115,101,
-    46,10,10,32,32,32,32,80,97,99,107,97,103,101,115,32,
-    97,114,101,32,115,105,109,112,108,121,32,109,111,100,117,108,
-    101,115,32,116,104,97,116,32,40,109,97,121,41,32,104,97,
-    118,101,32,115,117,98,109,111,100,117,108,101,115,46,32,32,
-    73,102,32,97,32,115,112,101,99,10,32,32,32,32,104,97,
-    115,32,97,32,110,111,110,45,78,111,110,101,32,118,97,108,
-    117,101,32,105,110,32,96,115,117,98,109,111,100,117,108,101,
-    95,115,101,97,114,99,104,95,108,111,99,97,116,105,111,110,
-    115,96,44,32,116,104,101,32,105,109,112,111,114,116,10,32,
-    32,32,32,115,121,115,116,101,109,32,119,105,108,108,32,99,
-    111,110,115,105,100,101,114,32,109,111,100,117,108,101,115,32,
-    108,111,97,100,101,100,32,102,114,111,109,32,116,104,101,32,
-    115,112,101,99,32,97,115,32,112,97,99,107,97,103,101,115,
-    46,10,10,32,32,32,32,79,110,108,121,32,102,105,110,100,
-    101,114,115,32,40,115,101,101,32,105,109,112,111,114,116,108,
-    105,98,46,97,98,99,46,77,101,116,97,80,97,116,104,70,
-    105,110,100,101,114,32,97,110,100,10,32,32,32,32,105,109,
-    112,111,114,116,108,105,98,46,97,98,99,46,80,97,116,104,
-    69,110,116,114,121,70,105,110,100,101,114,41,32,115,104,111,
-    117,108,100,32,109,111,100,105,102,121,32,77,111,100,117,108,
-    101,83,112,101,99,32,105,110,115,116,97,110,99,101,115,46,
-    10,10,32,32,32,32,78,41,3,218,6,111,114,105,103,105,
-    110,218,12,108,111,97,100,101,114,95,115,116,97,116,101,218,
-    10,105,115,95,112,97,99,107,97,103,101,99,3,0,0,0,
-    3,0,0,0,6,0,0,0,2,0,0,0,67,0,0,0,
-    115,54,0,0,0,124,1,124,0,95,0,124,2,124,0,95,
-    1,124,3,124,0,95,2,124,4,124,0,95,3,124,5,114,
-    32,103,0,110,2,100,0,124,0,95,4,100,1,124,0,95,
-    5,100,0,124,0,95,6,100,0,83,0,41,2,78,70,41,
-    7,114,15,0,0,0,114,94,0,0,0,114,104,0,0,0,
-    114,105,0,0,0,218,26,115,117,98,109,111,100,117,108,101,
-    95,115,101,97,114,99,104,95,108,111,99,97,116,105,111,110,
-    115,218,13,95,115,101,116,95,102,105,108,101,97,116,116,114,
-    218,7,95,99,97,99,104,101,100,41,6,114,26,0,0,0,
-    114,15,0,0,0,114,94,0,0,0,114,104,0,0,0,114,
-    105,0,0,0,114,106,0,0,0,114,10,0,0,0,114,10,
-    0,0,0,114,11,0,0,0,114,27,0,0,0,103,1,0,
-    0,115,14,0,0,0,0,2,6,1,6,1,6,1,6,1,
-    14,3,6,1,122,19,77,111,100,117,108,101,83,112,101,99,
-    46,95,95,105,110,105,116,95,95,99,1,0,0,0,0,0,
-    0,0,2,0,0,0,6,0,0,0,67,0,0,0,115,102,
-    0,0,0,100,1,160,0,124,0,106,1,161,1,100,2,160,
-    0,124,0,106,2,161,1,103,2,125,1,124,0,106,3,100,
-    0,107,9,114,52,124,1,160,4,100,3,160,0,124,0,106,
-    3,161,1,161,1,1,0,124,0,106,5,100,0,107,9,114,
-    80,124,1,160,4,100,4,160,0,124,0,106,5,161,1,161,
-    1,1,0,100,5,160,0,124,0,106,6,106,7,100,6,160,
-    8,124,1,161,1,161,2,83,0,41,7,78,122,9,110,97,
-    109,101,61,123,33,114,125,122,11,108,111,97,100,101,114,61,
-    123,33,114,125,122,11,111,114,105,103,105,110,61,123,33,114,
-    125,122,29,115,117,98,109,111,100,117,108,101,95,115,101,97,
-    114,99,104,95,108,111,99,97,116,105,111,110,115,61,123,125,
-    122,6,123,125,40,123,125,41,122,2,44,32,41,9,114,38,
-    0,0,0,114,15,0,0,0,114,94,0,0,0,114,104,0,
-    0,0,218,6,97,112,112,101,110,100,114,107,0,0,0,218,
-    9,95,95,99,108,97,115,115,95,95,114,1,0,0,0,218,
-    4,106,111,105,110,41,2,114,26,0,0,0,114,47,0,0,
-    0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
-    114,40,0,0,0,115,1,0,0,115,16,0,0,0,0,1,
-    10,1,14,1,10,1,18,1,10,1,8,1,10,1,122,19,
-    77,111,100,117,108,101,83,112,101,99,46,95,95,114,101,112,
-    114,95,95,99,2,0,0,0,0,0,0,0,3,0,0,0,
-    11,0,0,0,67,0,0,0,115,102,0,0,0,124,0,106,
-    0,125,2,121,70,124,0,106,1,124,1,106,1,107,2,111,
-    76,124,0,106,2,124,1,106,2,107,2,111,76,124,0,106,
-    3,124,1,106,3,107,2,111,76,124,2,124,1,106,0,107,
-    2,111,76,124,0,106,4,124,1,106,4,107,2,111,76,124,
-    0,106,5,124,1,106,5,107,2,83,0,4,0,116,6,107,
-    10,114,96,1,0,1,0,1,0,100,1,83,0,88,0,100,
-    0,83,0,41,2,78,70,41,7,114,107,0,0,0,114,15,
-    0,0,0,114,94,0,0,0,114,104,0,0,0,218,6,99,
-    97,99,104,101,100,218,12,104,97,115,95,108,111,99,97,116,
-    105,111,110,114,91,0,0,0,41,3,114,26,0,0,0,90,
-    5,111,116,104,101,114,90,4,115,109,115,108,114,10,0,0,
-    0,114,10,0,0,0,114,11,0,0,0,218,6,95,95,101,
-    113,95,95,125,1,0,0,115,20,0,0,0,0,1,6,1,
-    2,1,12,1,12,1,12,1,10,1,12,1,12,1,14,1,
-    122,17,77,111,100,117,108,101,83,112,101,99,46,95,95,101,
-    113,95,95,99,1,0,0,0,0,0,0,0,1,0,0,0,
-    3,0,0,0,67,0,0,0,115,58,0,0,0,124,0,106,
-    0,100,0,107,8,114,52,124,0,106,1,100,0,107,9,114,
-    52,124,0,106,2,114,52,116,3,100,0,107,8,114,38,116,
-    4,130,1,116,3,160,5,124,0,106,1,161,1,124,0,95,
-    0,124,0,106,0,83,0,41,1,78,41,6,114,109,0,0,
-    0,114,104,0,0,0,114,108,0,0,0,218,19,95,98,111,
-    111,116,115,116,114,97,112,95,101,120,116,101,114,110,97,108,
-    218,19,78,111,116,73,109,112,108,101,109,101,110,116,101,100,
-    69,114,114,111,114,90,11,95,103,101,116,95,99,97,99,104,
-    101,100,41,1,114,26,0,0,0,114,10,0,0,0,114,10,
-    0,0,0,114,11,0,0,0,114,113,0,0,0,137,1,0,
-    0,115,12,0,0,0,0,2,10,1,16,1,8,1,4,1,
-    14,1,122,17,77,111,100,117,108,101,83,112,101,99,46,99,
-    97,99,104,101,100,99,2,0,0,0,0,0,0,0,2,0,
-    0,0,2,0,0,0,67,0,0,0,115,10,0,0,0,124,
-    1,124,0,95,0,100,0,83,0,41,1,78,41,1,114,109,
-    0,0,0,41,2,114,26,0,0,0,114,113,0,0,0,114,
-    10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,113,
-    0,0,0,146,1,0,0,115,2,0,0,0,0,2,99,1,
-    0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,67,
-    0,0,0,115,36,0,0,0,124,0,106,0,100,1,107,8,
-    114,26,124,0,106,1,160,2,100,2,161,1,100,3,25,0,
-    83,0,124,0,106,1,83,0,100,1,83,0,41,4,122,32,
-    84,104,101,32,110,97,109,101,32,111,102,32,116,104,101,32,
-    109,111,100,117,108,101,39,115,32,112,97,114,101,110,116,46,
-    78,218,1,46,114,19,0,0,0,41,3,114,107,0,0,0,
-    114,15,0,0,0,218,10,114,112,97,114,116,105,116,105,111,
-    110,41,1,114,26,0,0,0,114,10,0,0,0,114,10,0,
-    0,0,114,11,0,0,0,218,6,112,97,114,101,110,116,150,
-    1,0,0,115,6,0,0,0,0,3,10,1,16,2,122,17,
-    77,111,100,117,108,101,83,112,101,99,46,112,97,114,101,110,
-    116,99,1,0,0,0,0,0,0,0,1,0,0,0,1,0,
-    0,0,67,0,0,0,115,6,0,0,0,124,0,106,0,83,
-    0,41,1,78,41,1,114,108,0,0,0,41,1,114,26,0,
+    99,2,0,0,0,0,0,0,0,2,0,0,0,2,0,0,
+    0,67,0,0,0,115,18,0,0,0,124,1,124,0,95,0,
+    124,1,106,1,124,0,95,2,100,0,83,0,41,1,78,41,
+    3,218,7,95,109,111,100,117,108,101,114,90,0,0,0,218,
+    5,95,115,112,101,99,41,2,114,26,0,0,0,114,84,0,
     0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,
-    0,114,114,0,0,0,158,1,0,0,115,2,0,0,0,0,
-    2,122,23,77,111,100,117,108,101,83,112,101,99,46,104,97,
-    115,95,108,111,99,97,116,105,111,110,99,2,0,0,0,0,
+    0,114,27,0,0,0,51,1,0,0,115,4,0,0,0,0,
+    1,6,1,122,26,95,105,110,115,116,97,108,108,101,100,95,
+    115,97,102,101,108,121,46,95,95,105,110,105,116,95,95,99,
+    1,0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,
+    67,0,0,0,115,28,0,0,0,100,1,124,0,106,0,95,
+    1,124,0,106,2,116,3,106,4,124,0,106,0,106,5,60,
+    0,100,0,83,0,41,2,78,84,41,6,114,99,0,0,0,
+    218,13,95,105,110,105,116,105,97,108,105,122,105,110,103,114,
+    98,0,0,0,114,14,0,0,0,114,80,0,0,0,114,15,
+    0,0,0,41,1,114,26,0,0,0,114,10,0,0,0,114,
+    10,0,0,0,114,11,0,0,0,114,46,0,0,0,55,1,
+    0,0,115,4,0,0,0,0,4,8,1,122,27,95,105,110,
+    115,116,97,108,108,101,100,95,115,97,102,101,108,121,46,95,
+    95,101,110,116,101,114,95,95,99,1,0,0,0,0,0,0,
+    0,3,0,0,0,17,0,0,0,71,0,0,0,115,98,0,
+    0,0,122,82,124,0,106,0,125,2,116,1,100,1,100,2,
+    132,0,124,1,68,0,131,1,131,1,114,64,121,14,116,2,
+    106,3,124,2,106,4,61,0,87,0,113,80,4,0,116,5,
+    107,10,114,60,1,0,1,0,1,0,89,0,113,80,88,0,
+    110,16,116,6,100,3,124,2,106,4,124,2,106,7,131,3,
+    1,0,87,0,100,0,100,4,124,0,106,0,95,8,88,0,
+    100,0,83,0,41,5,78,99,1,0,0,0,0,0,0,0,
+    2,0,0,0,3,0,0,0,115,0,0,0,115,22,0,0,
+    0,124,0,93,14,125,1,124,1,100,0,107,9,86,0,1,
+    0,113,2,100,0,83,0,41,1,78,114,10,0,0,0,41,
+    2,90,2,46,48,90,3,97,114,103,114,10,0,0,0,114,
+    10,0,0,0,114,11,0,0,0,250,9,60,103,101,110,101,
+    120,112,114,62,65,1,0,0,115,2,0,0,0,4,0,122,
+    45,95,105,110,115,116,97,108,108,101,100,95,115,97,102,101,
+    108,121,46,95,95,101,120,105,116,95,95,46,60,108,111,99,
+    97,108,115,62,46,60,103,101,110,101,120,112,114,62,122,18,
+    105,109,112,111,114,116,32,123,33,114,125,32,35,32,123,33,
+    114,125,70,41,9,114,99,0,0,0,218,3,97,110,121,114,
+    14,0,0,0,114,80,0,0,0,114,15,0,0,0,114,55,
+    0,0,0,114,69,0,0,0,114,94,0,0,0,114,100,0,
+    0,0,41,3,114,26,0,0,0,114,47,0,0,0,114,83,
+    0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,
+    0,0,114,48,0,0,0,62,1,0,0,115,18,0,0,0,
+    0,1,2,1,6,1,18,1,2,1,14,1,14,1,8,2,
+    20,2,122,26,95,105,110,115,116,97,108,108,101,100,95,115,
+    97,102,101,108,121,46,95,95,101,120,105,116,95,95,78,41,
+    6,114,1,0,0,0,114,0,0,0,0,114,2,0,0,0,
+    114,27,0,0,0,114,46,0,0,0,114,48,0,0,0,114,
+    10,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
+    0,0,0,114,97,0,0,0,49,1,0,0,115,6,0,0,
+    0,8,2,8,4,8,7,114,97,0,0,0,99,0,0,0,
+    0,0,0,0,0,0,0,0,0,4,0,0,0,64,0,0,
+    0,115,114,0,0,0,101,0,90,1,100,0,90,2,100,1,
+    90,3,100,2,100,2,100,2,100,3,156,3,100,4,100,5,
+    132,2,90,4,100,6,100,7,132,0,90,5,100,8,100,9,
+    132,0,90,6,101,7,100,10,100,11,132,0,131,1,90,8,
+    101,8,106,9,100,12,100,11,132,0,131,1,90,8,101,7,
+    100,13,100,14,132,0,131,1,90,10,101,7,100,15,100,16,
+    132,0,131,1,90,11,101,11,106,9,100,17,100,16,132,0,
+    131,1,90,11,100,2,83,0,41,18,218,10,77,111,100,117,
+    108,101,83,112,101,99,97,208,5,0,0,84,104,101,32,115,
+    112,101,99,105,102,105,99,97,116,105,111,110,32,102,111,114,
+    32,97,32,109,111,100,117,108,101,44,32,117,115,101,100,32,
+    102,111,114,32,108,111,97,100,105,110,103,46,10,10,32,32,
+    32,32,65,32,109,111,100,117,108,101,39,115,32,115,112,101,
+    99,32,105,115,32,116,104,101,32,115,111,117,114,99,101,32,
+    102,111,114,32,105,110,102,111,114,109,97,116,105,111,110,32,
+    97,98,111,117,116,32,116,104,101,32,109,111,100,117,108,101,
+    46,32,32,70,111,114,10,32,32,32,32,100,97,116,97,32,
+    97,115,115,111,99,105,97,116,101,100,32,119,105,116,104,32,
+    116,104,101,32,109,111,100,117,108,101,44,32,105,110,99,108,
+    117,100,105,110,103,32,115,111,117,114,99,101,44,32,117,115,
+    101,32,116,104,101,32,115,112,101,99,39,115,10,32,32,32,
+    32,108,111,97,100,101,114,46,10,10,32,32,32,32,96,110,
+    97,109,101,96,32,105,115,32,116,104,101,32,97,98,115,111,
+    108,117,116,101,32,110,97,109,101,32,111,102,32,116,104,101,
+    32,109,111,100,117,108,101,46,32,32,96,108,111,97,100,101,
+    114,96,32,105,115,32,116,104,101,32,108,111,97,100,101,114,
+    10,32,32,32,32,116,111,32,117,115,101,32,119,104,101,110,
+    32,108,111,97,100,105,110,103,32,116,104,101,32,109,111,100,
+    117,108,101,46,32,32,96,112,97,114,101,110,116,96,32,105,
+    115,32,116,104,101,32,110,97,109,101,32,111,102,32,116,104,
+    101,10,32,32,32,32,112,97,99,107,97,103,101,32,116,104,
+    101,32,109,111,100,117,108,101,32,105,115,32,105,110,46,32,
+    32,84,104,101,32,112,97,114,101,110,116,32,105,115,32,100,
+    101,114,105,118,101,100,32,102,114,111,109,32,116,104,101,32,
+    110,97,109,101,46,10,10,32,32,32,32,96,105,115,95,112,
+    97,99,107,97,103,101,96,32,100,101,116,101,114,109,105,110,
+    101,115,32,105,102,32,116,104,101,32,109,111,100,117,108,101,
+    32,105,115,32,99,111,110,115,105,100,101,114,101,100,32,97,
+    32,112,97,99,107,97,103,101,32,111,114,10,32,32,32,32,
+    110,111,116,46,32,32,79,110,32,109,111,100,117,108,101,115,
+    32,116,104,105,115,32,105,115,32,114,101,102,108,101,99,116,
+    101,100,32,98,121,32,116,104,101,32,96,95,95,112,97,116,
+    104,95,95,96,32,97,116,116,114,105,98,117,116,101,46,10,
+    10,32,32,32,32,96,111,114,105,103,105,110,96,32,105,115,
+    32,116,104,101,32,115,112,101,99,105,102,105,99,32,108,111,
+    99,97,116,105,111,110,32,117,115,101,100,32,98,121,32,116,
+    104,101,32,108,111,97,100,101,114,32,102,114,111,109,32,119,
+    104,105,99,104,32,116,111,10,32,32,32,32,108,111,97,100,
+    32,116,104,101,32,109,111,100,117,108,101,44,32,105,102,32,
+    116,104,97,116,32,105,110,102,111,114,109,97,116,105,111,110,
+    32,105,115,32,97,118,97,105,108,97,98,108,101,46,32,32,
+    87,104,101,110,32,102,105,108,101,110,97,109,101,32,105,115,
+    10,32,32,32,32,115,101,116,44,32,111,114,105,103,105,110,
+    32,119,105,108,108,32,109,97,116,99,104,46,10,10,32,32,
+    32,32,96,104,97,115,95,108,111,99,97,116,105,111,110,96,
+    32,105,110,100,105,99,97,116,101,115,32,116,104,97,116,32,
+    97,32,115,112,101,99,39,115,32,34,111,114,105,103,105,110,
+    34,32,114,101,102,108,101,99,116,115,32,97,32,108,111,99,
+    97,116,105,111,110,46,10,32,32,32,32,87,104,101,110,32,
+    116,104,105,115,32,105,115,32,84,114,117,101,44,32,96,95,
+    95,102,105,108,101,95,95,96,32,97,116,116,114,105,98,117,
+    116,101,32,111,102,32,116,104,101,32,109,111,100,117,108,101,
+    32,105,115,32,115,101,116,46,10,10,32,32,32,32,96,99,
+    97,99,104,101,100,96,32,105,115,32,116,104,101,32,108,111,
+    99,97,116,105,111,110,32,111,102,32,116,104,101,32,99,97,
+    99,104,101,100,32,98,121,116,101,99,111,100,101,32,102,105,
+    108,101,44,32,105,102,32,97,110,121,46,32,32,73,116,10,
+    32,32,32,32,99,111,114,114,101,115,112,111,110,100,115,32,
+    116,111,32,116,104,101,32,96,95,95,99,97,99,104,101,100,
+    95,95,96,32,97,116,116,114,105,98,117,116,101,46,10,10,
+    32,32,32,32,96,115,117,98,109,111,100,117,108,101,95,115,
+    101,97,114,99,104,95,108,111,99,97,116,105,111,110,115,96,
+    32,105,115,32,116,104,101,32,115,101,113,117,101,110,99,101,
+    32,111,102,32,112,97,116,104,32,101,110,116,114,105,101,115,
+    32,116,111,10,32,32,32,32,115,101,97,114,99,104,32,119,
+    104,101,110,32,105,109,112,111,114,116,105,110,103,32,115,117,
+    98,109,111,100,117,108,101,115,46,32,32,73,102,32,115,101,
+    116,44,32,105,115,95,112,97,99,107,97,103,101,32,115,104,
+    111,117,108,100,32,98,101,10,32,32,32,32,84,114,117,101,
+    45,45,97,110,100,32,70,97,108,115,101,32,111,116,104,101,
+    114,119,105,115,101,46,10,10,32,32,32,32,80,97,99,107,
+    97,103,101,115,32,97,114,101,32,115,105,109,112,108,121,32,
+    109,111,100,117,108,101,115,32,116,104,97,116,32,40,109,97,
+    121,41,32,104,97,118,101,32,115,117,98,109,111,100,117,108,
+    101,115,46,32,32,73,102,32,97,32,115,112,101,99,10,32,
+    32,32,32,104,97,115,32,97,32,110,111,110,45,78,111,110,
+    101,32,118,97,108,117,101,32,105,110,32,96,115,117,98,109,
+    111,100,117,108,101,95,115,101,97,114,99,104,95,108,111,99,
+    97,116,105,111,110,115,96,44,32,116,104,101,32,105,109,112,
+    111,114,116,10,32,32,32,32,115,121,115,116,101,109,32,119,
+    105,108,108,32,99,111,110,115,105,100,101,114,32,109,111,100,
+    117,108,101,115,32,108,111,97,100,101,100,32,102,114,111,109,
+    32,116,104,101,32,115,112,101,99,32,97,115,32,112,97,99,
+    107,97,103,101,115,46,10,10,32,32,32,32,79,110,108,121,
+    32,102,105,110,100,101,114,115,32,40,115,101,101,32,105,109,
+    112,111,114,116,108,105,98,46,97,98,99,46,77,101,116,97,
+    80,97,116,104,70,105,110,100,101,114,32,97,110,100,10,32,
+    32,32,32,105,109,112,111,114,116,108,105,98,46,97,98,99,
+    46,80,97,116,104,69,110,116,114,121,70,105,110,100,101,114,
+    41,32,115,104,111,117,108,100,32,109,111,100,105,102,121,32,
+    77,111,100,117,108,101,83,112,101,99,32,105,110,115,116,97,
+    110,99,101,115,46,10,10,32,32,32,32,78,41,3,218,6,
+    111,114,105,103,105,110,218,12,108,111,97,100,101,114,95,115,
+    116,97,116,101,218,10,105,115,95,112,97,99,107,97,103,101,
+    99,3,0,0,0,3,0,0,0,6,0,0,0,2,0,0,
+    0,67,0,0,0,115,54,0,0,0,124,1,124,0,95,0,
+    124,2,124,0,95,1,124,3,124,0,95,2,124,4,124,0,
+    95,3,124,5,114,32,103,0,110,2,100,0,124,0,95,4,
+    100,1,124,0,95,5,100,0,124,0,95,6,100,0,83,0,
+    41,2,78,70,41,7,114,15,0,0,0,114,94,0,0,0,
+    114,104,0,0,0,114,105,0,0,0,218,26,115,117,98,109,
+    111,100,117,108,101,95,115,101,97,114,99,104,95,108,111,99,
+    97,116,105,111,110,115,218,13,95,115,101,116,95,102,105,108,
+    101,97,116,116,114,218,7,95,99,97,99,104,101,100,41,6,
+    114,26,0,0,0,114,15,0,0,0,114,94,0,0,0,114,
+    104,0,0,0,114,105,0,0,0,114,106,0,0,0,114,10,
+    0,0,0,114,10,0,0,0,114,11,0,0,0,114,27,0,
+    0,0,113,1,0,0,115,14,0,0,0,0,2,6,1,6,
+    1,6,1,6,1,14,3,6,1,122,19,77,111,100,117,108,
+    101,83,112,101,99,46,95,95,105,110,105,116,95,95,99,1,
+    0,0,0,0,0,0,0,2,0,0,0,6,0,0,0,67,
+    0,0,0,115,102,0,0,0,100,1,160,0,124,0,106,1,
+    161,1,100,2,160,0,124,0,106,2,161,1,103,2,125,1,
+    124,0,106,3,100,0,107,9,114,52,124,1,160,4,100,3,
+    160,0,124,0,106,3,161,1,161,1,1,0,124,0,106,5,
+    100,0,107,9,114,80,124,1,160,4,100,4,160,0,124,0,
+    106,5,161,1,161,1,1,0,100,5,160,0,124,0,106,6,
+    106,7,100,6,160,8,124,1,161,1,161,2,83,0,41,7,
+    78,122,9,110,97,109,101,61,123,33,114,125,122,11,108,111,
+    97,100,101,114,61,123,33,114,125,122,11,111,114,105,103,105,
+    110,61,123,33,114,125,122,29,115,117,98,109,111,100,117,108,
+    101,95,115,101,97,114,99,104,95,108,111,99,97,116,105,111,
+    110,115,61,123,125,122,6,123,125,40,123,125,41,122,2,44,
+    32,41,9,114,38,0,0,0,114,15,0,0,0,114,94,0,
+    0,0,114,104,0,0,0,218,6,97,112,112,101,110,100,114,
+    107,0,0,0,218,9,95,95,99,108,97,115,115,95,95,114,
+    1,0,0,0,218,4,106,111,105,110,41,2,114,26,0,0,
+    0,114,47,0,0,0,114,10,0,0,0,114,10,0,0,0,
+    114,11,0,0,0,114,40,0,0,0,125,1,0,0,115,16,
+    0,0,0,0,1,10,1,14,1,10,1,18,1,10,1,8,
+    1,10,1,122,19,77,111,100,117,108,101,83,112,101,99,46,
+    95,95,114,101,112,114,95,95,99,2,0,0,0,0,0,0,
+    0,3,0,0,0,11,0,0,0,67,0,0,0,115,102,0,
+    0,0,124,0,106,0,125,2,121,70,124,0,106,1,124,1,
+    106,1,107,2,111,76,124,0,106,2,124,1,106,2,107,2,
+    111,76,124,0,106,3,124,1,106,3,107,2,111,76,124,2,
+    124,1,106,0,107,2,111,76,124,0,106,4,124,1,106,4,
+    107,2,111,76,124,0,106,5,124,1,106,5,107,2,83,0,
+    4,0,116,6,107,10,114,96,1,0,1,0,1,0,100,1,
+    83,0,88,0,100,0,83,0,41,2,78,70,41,7,114,107,
+    0,0,0,114,15,0,0,0,114,94,0,0,0,114,104,0,
+    0,0,218,6,99,97,99,104,101,100,218,12,104,97,115,95,
+    108,111,99,97,116,105,111,110,114,91,0,0,0,41,3,114,
+    26,0,0,0,90,5,111,116,104,101,114,90,4,115,109,115,
+    108,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
+    218,6,95,95,101,113,95,95,135,1,0,0,115,20,0,0,
+    0,0,1,6,1,2,1,12,1,12,1,12,1,10,1,12,
+    1,12,1,14,1,122,17,77,111,100,117,108,101,83,112,101,
+    99,46,95,95,101,113,95,95,99,1,0,0,0,0,0,0,
+    0,1,0,0,0,3,0,0,0,67,0,0,0,115,58,0,
+    0,0,124,0,106,0,100,0,107,8,114,52,124,0,106,1,
+    100,0,107,9,114,52,124,0,106,2,114,52,116,3,100,0,
+    107,8,114,38,116,4,130,1,116,3,160,5,124,0,106,1,
+    161,1,124,0,95,0,124,0,106,0,83,0,41,1,78,41,
+    6,114,109,0,0,0,114,104,0,0,0,114,108,0,0,0,
+    218,19,95,98,111,111,116,115,116,114,97,112,95,101,120,116,
+    101,114,110,97,108,218,19,78,111,116,73,109,112,108,101,109,
+    101,110,116,101,100,69,114,114,111,114,90,11,95,103,101,116,
+    95,99,97,99,104,101,100,41,1,114,26,0,0,0,114,10,
+    0,0,0,114,10,0,0,0,114,11,0,0,0,114,113,0,
+    0,0,147,1,0,0,115,12,0,0,0,0,2,10,1,16,
+    1,8,1,4,1,14,1,122,17,77,111,100,117,108,101,83,
+    112,101,99,46,99,97,99,104,101,100,99,2,0,0,0,0,
     0,0,0,2,0,0,0,2,0,0,0,67,0,0,0,115,
-    14,0,0,0,116,0,124,1,131,1,124,0,95,1,100,0,
-    83,0,41,1,78,41,2,218,4,98,111,111,108,114,108,0,
-    0,0,41,2,114,26,0,0,0,218,5,118,97,108,117,101,
-    114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,
-    114,0,0,0,162,1,0,0,115,2,0,0,0,0,2,41,
-    12,114,1,0,0,0,114,0,0,0,0,114,2,0,0,0,
-    114,3,0,0,0,114,27,0,0,0,114,40,0,0,0,114,
-    115,0,0,0,218,8,112,114,111,112,101,114,116,121,114,113,
-    0,0,0,218,6,115,101,116,116,101,114,114,120,0,0,0,
-    114,114,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
-    10,0,0,0,114,11,0,0,0,114,103,0,0,0,66,1,
-    0,0,115,18,0,0,0,12,37,4,1,14,11,8,10,8,
-    12,12,9,14,4,12,8,12,4,114,103,0,0,0,41,2,
-    114,104,0,0,0,114,106,0,0,0,99,2,0,0,0,2,
-    0,0,0,6,0,0,0,14,0,0,0,67,0,0,0,115,
-    154,0,0,0,116,0,124,1,100,1,131,2,114,74,116,1,
-    100,2,107,8,114,22,116,2,130,1,116,1,106,3,125,4,
-    124,3,100,2,107,8,114,48,124,4,124,0,124,1,100,3,
-    141,2,83,0,124,3,114,56,103,0,110,2,100,2,125,5,
-    124,4,124,0,124,1,124,5,100,4,141,3,83,0,124,3,
-    100,2,107,8,114,138,116,0,124,1,100,5,131,2,114,134,
-    121,14,124,1,160,4,124,0,161,1,125,3,87,0,113,138,
-    4,0,116,5,107,10,114,130,1,0,1,0,1,0,100,2,
-    125,3,89,0,113,138,88,0,110,4,100,6,125,3,116,6,
-    124,0,124,1,124,2,124,3,100,7,141,4,83,0,41,8,
-    122,53,82,101,116,117,114,110,32,97,32,109,111,100,117,108,
-    101,32,115,112,101,99,32,98,97,115,101,100,32,111,110,32,
-    118,97,114,105,111,117,115,32,108,111,97,100,101,114,32,109,
-    101,116,104,111,100,115,46,90,12,103,101,116,95,102,105,108,
-    101,110,97,109,101,78,41,1,114,94,0,0,0,41,2,114,
-    94,0,0,0,114,107,0,0,0,114,106,0,0,0,70,41,
-    2,114,104,0,0,0,114,106,0,0,0,41,7,114,4,0,
-    0,0,114,116,0,0,0,114,117,0,0,0,218,23,115,112,
-    101,99,95,102,114,111,109,95,102,105,108,101,95,108,111,99,
-    97,116,105,111,110,114,106,0,0,0,114,71,0,0,0,114,
-    103,0,0,0,41,6,114,15,0,0,0,114,94,0,0,0,
-    114,104,0,0,0,114,106,0,0,0,114,125,0,0,0,90,
-    6,115,101,97,114,99,104,114,10,0,0,0,114,10,0,0,
-    0,114,11,0,0,0,114,79,0,0,0,167,1,0,0,115,
-    34,0,0,0,0,2,10,1,8,1,4,1,6,2,8,1,
-    12,1,12,1,6,1,8,2,8,1,10,1,2,1,14,1,
-    14,1,12,3,4,2,114,79,0,0,0,99,3,0,0,0,
-    0,0,0,0,8,0,0,0,53,0,0,0,67,0,0,0,
-    115,56,1,0,0,121,10,124,0,106,0,125,3,87,0,110,
-    20,4,0,116,1,107,10,114,30,1,0,1,0,1,0,89,
-    0,110,14,88,0,124,3,100,0,107,9,114,44,124,3,83,
-    0,124,0,106,2,125,4,124,1,100,0,107,8,114,90,121,
-    10,124,0,106,3,125,1,87,0,110,20,4,0,116,1,107,
-    10,114,88,1,0,1,0,1,0,89,0,110,2,88,0,121,
-    10,124,0,106,4,125,5,87,0,110,24,4,0,116,1,107,
-    10,114,124,1,0,1,0,1,0,100,0,125,5,89,0,110,
-    2,88,0,124,2,100,0,107,8,114,184,124,5,100,0,107,
-    8,114,180,121,10,124,1,106,5,125,2,87,0,113,184,4,
-    0,116,1,107,10,114,176,1,0,1,0,1,0,100,0,125,
-    2,89,0,113,184,88,0,110,4,124,5,125,2,121,10,124,
-    0,106,6,125,6,87,0,110,24,4,0,116,1,107,10,114,
-    218,1,0,1,0,1,0,100,0,125,6,89,0,110,2,88,
-    0,121,14,116,7,124,0,106,8,131,1,125,7,87,0,110,
-    26,4,0,116,1,107,10,144,1,114,4,1,0,1,0,1,
-    0,100,0,125,7,89,0,110,2,88,0,116,9,124,4,124,
-    1,124,2,100,1,141,3,125,3,124,5,100,0,107,8,144,
-    1,114,34,100,2,110,2,100,3,124,3,95,10,124,6,124,
-    3,95,11,124,7,124,3,95,12,124,3,83,0,41,4,78,
-    41,1,114,104,0,0,0,70,84,41,13,114,90,0,0,0,
-    114,91,0,0,0,114,1,0,0,0,114,86,0,0,0,114,
-    93,0,0,0,90,7,95,79,82,73,71,73,78,218,10,95,
-    95,99,97,99,104,101,100,95,95,218,4,108,105,115,116,218,
-    8,95,95,112,97,116,104,95,95,114,103,0,0,0,114,108,
-    0,0,0,114,113,0,0,0,114,107,0,0,0,41,8,114,
-    84,0,0,0,114,94,0,0,0,114,104,0,0,0,114,83,
-    0,0,0,114,15,0,0,0,90,8,108,111,99,97,116,105,
-    111,110,114,113,0,0,0,114,107,0,0,0,114,10,0,0,
-    0,114,10,0,0,0,114,11,0,0,0,218,17,95,115,112,
-    101,99,95,102,114,111,109,95,109,111,100,117,108,101,193,1,
-    0,0,115,72,0,0,0,0,2,2,1,10,1,14,1,6,
-    2,8,1,4,2,6,1,8,1,2,1,10,1,14,2,6,
-    1,2,1,10,1,14,1,10,1,8,1,8,1,2,1,10,
-    1,14,1,12,2,4,1,2,1,10,1,14,1,10,1,2,
-    1,14,1,16,1,10,2,14,1,20,1,6,1,6,1,114,
-    129,0,0,0,70,41,1,218,8,111,118,101,114,114,105,100,
-    101,99,2,0,0,0,1,0,0,0,5,0,0,0,59,0,
-    0,0,67,0,0,0,115,212,1,0,0,124,2,115,20,116,
-    0,124,1,100,1,100,0,131,3,100,0,107,8,114,54,121,
-    12,124,0,106,1,124,1,95,2,87,0,110,20,4,0,116,
-    3,107,10,114,52,1,0,1,0,1,0,89,0,110,2,88,
-    0,124,2,115,74,116,0,124,1,100,2,100,0,131,3,100,
-    0,107,8,114,166,124,0,106,4,125,3,124,3,100,0,107,
-    8,114,134,124,0,106,5,100,0,107,9,114,134,116,6,100,
-    0,107,8,114,110,116,7,130,1,116,6,106,8,125,4,124,
-    4,160,9,124,4,161,1,125,3,124,0,106,5,124,3,95,
-    10,121,10,124,3,124,1,95,11,87,0,110,20,4,0,116,
-    3,107,10,114,164,1,0,1,0,1,0,89,0,110,2,88,
-    0,124,2,115,186,116,0,124,1,100,3,100,0,131,3,100,
-    0,107,8,114,220,121,12,124,0,106,12,124,1,95,13,87,
-    0,110,20,4,0,116,3,107,10,114,218,1,0,1,0,1,
-    0,89,0,110,2,88,0,121,10,124,0,124,1,95,14,87,
-    0,110,20,4,0,116,3,107,10,114,250,1,0,1,0,1,
-    0,89,0,110,2,88,0,124,2,144,1,115,20,116,0,124,
-    1,100,4,100,0,131,3,100,0,107,8,144,1,114,68,124,
-    0,106,5,100,0,107,9,144,1,114,68,121,12,124,0,106,
-    5,124,1,95,15,87,0,110,22,4,0,116,3,107,10,144,
-    1,114,66,1,0,1,0,1,0,89,0,110,2,88,0,124,
-    0,106,16,144,1,114,208,124,2,144,1,115,100,116,0,124,
-    1,100,5,100,0,131,3,100,0,107,8,144,1,114,136,121,
-    12,124,0,106,17,124,1,95,18,87,0,110,22,4,0,116,
-    3,107,10,144,1,114,134,1,0,1,0,1,0,89,0,110,
-    2,88,0,124,2,144,1,115,160,116,0,124,1,100,6,100,
-    0,131,3,100,0,107,8,144,1,114,208,124,0,106,19,100,
-    0,107,9,144,1,114,208,121,12,124,0,106,19,124,1,95,
-    20,87,0,110,22,4,0,116,3,107,10,144,1,114,206,1,
-    0,1,0,1,0,89,0,110,2,88,0,124,1,83,0,41,
-    7,78,114,1,0,0,0,114,86,0,0,0,218,11,95,95,
-    112,97,99,107,97,103,101,95,95,114,128,0,0,0,114,93,
-    0,0,0,114,126,0,0,0,41,21,114,6,0,0,0,114,
-    15,0,0,0,114,1,0,0,0,114,91,0,0,0,114,94,
-    0,0,0,114,107,0,0,0,114,116,0,0,0,114,117,0,
-    0,0,218,16,95,78,97,109,101,115,112,97,99,101,76,111,
-    97,100,101,114,218,7,95,95,110,101,119,95,95,90,5,95,
-    112,97,116,104,114,86,0,0,0,114,120,0,0,0,114,131,
-    0,0,0,114,90,0,0,0,114,128,0,0,0,114,114,0,
-    0,0,114,104,0,0,0,114,93,0,0,0,114,113,0,0,
-    0,114,126,0,0,0,41,5,114,83,0,0,0,114,84,0,
-    0,0,114,130,0,0,0,114,94,0,0,0,114,132,0,0,
+    10,0,0,0,124,1,124,0,95,0,100,0,83,0,41,1,
+    78,41,1,114,109,0,0,0,41,2,114,26,0,0,0,114,
+    113,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
+    0,0,0,114,113,0,0,0,156,1,0,0,115,2,0,0,
+    0,0,2,99,1,0,0,0,0,0,0,0,1,0,0,0,
+    3,0,0,0,67,0,0,0,115,36,0,0,0,124,0,106,
+    0,100,1,107,8,114,26,124,0,106,1,160,2,100,2,161,
+    1,100,3,25,0,83,0,124,0,106,1,83,0,100,1,83,
+    0,41,4,122,32,84,104,101,32,110,97,109,101,32,111,102,
+    32,116,104,101,32,109,111,100,117,108,101,39,115,32,112,97,
+    114,101,110,116,46,78,218,1,46,114,19,0,0,0,41,3,
+    114,107,0,0,0,114,15,0,0,0,218,10,114,112,97,114,
+    116,105,116,105,111,110,41,1,114,26,0,0,0,114,10,0,
+    0,0,114,10,0,0,0,114,11,0,0,0,218,6,112,97,
+    114,101,110,116,160,1,0,0,115,6,0,0,0,0,3,10,
+    1,16,2,122,17,77,111,100,117,108,101,83,112,101,99,46,
+    112,97,114,101,110,116,99,1,0,0,0,0,0,0,0,1,
+    0,0,0,1,0,0,0,67,0,0,0,115,6,0,0,0,
+    124,0,106,0,83,0,41,1,78,41,1,114,108,0,0,0,
+    41,1,114,26,0,0,0,114,10,0,0,0,114,10,0,0,
+    0,114,11,0,0,0,114,114,0,0,0,168,1,0,0,115,
+    2,0,0,0,0,2,122,23,77,111,100,117,108,101,83,112,
+    101,99,46,104,97,115,95,108,111,99,97,116,105,111,110,99,
+    2,0,0,0,0,0,0,0,2,0,0,0,2,0,0,0,
+    67,0,0,0,115,14,0,0,0,116,0,124,1,131,1,124,
+    0,95,1,100,0,83,0,41,1,78,41,2,218,4,98,111,
+    111,108,114,108,0,0,0,41,2,114,26,0,0,0,218,5,
+    118,97,108,117,101,114,10,0,0,0,114,10,0,0,0,114,
+    11,0,0,0,114,114,0,0,0,172,1,0,0,115,2,0,
+    0,0,0,2,41,12,114,1,0,0,0,114,0,0,0,0,
+    114,2,0,0,0,114,3,0,0,0,114,27,0,0,0,114,
+    40,0,0,0,114,115,0,0,0,218,8,112,114,111,112,101,
+    114,116,121,114,113,0,0,0,218,6,115,101,116,116,101,114,
+    114,120,0,0,0,114,114,0,0,0,114,10,0,0,0,114,
+    10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,103,
+    0,0,0,76,1,0,0,115,18,0,0,0,12,37,4,1,
+    14,11,8,10,8,12,12,9,14,4,12,8,12,4,114,103,
+    0,0,0,41,2,114,104,0,0,0,114,106,0,0,0,99,
+    2,0,0,0,2,0,0,0,6,0,0,0,14,0,0,0,
+    67,0,0,0,115,154,0,0,0,116,0,124,1,100,1,131,
+    2,114,74,116,1,100,2,107,8,114,22,116,2,130,1,116,
+    1,106,3,125,4,124,3,100,2,107,8,114,48,124,4,124,
+    0,124,1,100,3,141,2,83,0,124,3,114,56,103,0,110,
+    2,100,2,125,5,124,4,124,0,124,1,124,5,100,4,141,
+    3,83,0,124,3,100,2,107,8,114,138,116,0,124,1,100,
+    5,131,2,114,134,121,14,124,1,160,4,124,0,161,1,125,
+    3,87,0,113,138,4,0,116,5,107,10,114,130,1,0,1,
+    0,1,0,100,2,125,3,89,0,113,138,88,0,110,4,100,
+    6,125,3,116,6,124,0,124,1,124,2,124,3,100,7,141,
+    4,83,0,41,8,122,53,82,101,116,117,114,110,32,97,32,
+    109,111,100,117,108,101,32,115,112,101,99,32,98,97,115,101,
+    100,32,111,110,32,118,97,114,105,111,117,115,32,108,111,97,
+    100,101,114,32,109,101,116,104,111,100,115,46,90,12,103,101,
+    116,95,102,105,108,101,110,97,109,101,78,41,1,114,94,0,
+    0,0,41,2,114,94,0,0,0,114,107,0,0,0,114,106,
+    0,0,0,70,41,2,114,104,0,0,0,114,106,0,0,0,
+    41,7,114,4,0,0,0,114,116,0,0,0,114,117,0,0,
+    0,218,23,115,112,101,99,95,102,114,111,109,95,102,105,108,
+    101,95,108,111,99,97,116,105,111,110,114,106,0,0,0,114,
+    71,0,0,0,114,103,0,0,0,41,6,114,15,0,0,0,
+    114,94,0,0,0,114,104,0,0,0,114,106,0,0,0,114,
+    125,0,0,0,90,6,115,101,97,114,99,104,114,10,0,0,
+    0,114,10,0,0,0,114,11,0,0,0,114,79,0,0,0,
+    177,1,0,0,115,34,0,0,0,0,2,10,1,8,1,4,
+    1,6,2,8,1,12,1,12,1,6,1,8,2,8,1,10,
+    1,2,1,14,1,14,1,12,3,4,2,114,79,0,0,0,
+    99,3,0,0,0,0,0,0,0,8,0,0,0,53,0,0,
+    0,67,0,0,0,115,56,1,0,0,121,10,124,0,106,0,
+    125,3,87,0,110,20,4,0,116,1,107,10,114,30,1,0,
+    1,0,1,0,89,0,110,14,88,0,124,3,100,0,107,9,
+    114,44,124,3,83,0,124,0,106,2,125,4,124,1,100,0,
+    107,8,114,90,121,10,124,0,106,3,125,1,87,0,110,20,
+    4,0,116,1,107,10,114,88,1,0,1,0,1,0,89,0,
+    110,2,88,0,121,10,124,0,106,4,125,5,87,0,110,24,
+    4,0,116,1,107,10,114,124,1,0,1,0,1,0,100,0,
+    125,5,89,0,110,2,88,0,124,2,100,0,107,8,114,184,
+    124,5,100,0,107,8,114,180,121,10,124,1,106,5,125,2,
+    87,0,113,184,4,0,116,1,107,10,114,176,1,0,1,0,
+    1,0,100,0,125,2,89,0,113,184,88,0,110,4,124,5,
+    125,2,121,10,124,0,106,6,125,6,87,0,110,24,4,0,
+    116,1,107,10,114,218,1,0,1,0,1,0,100,0,125,6,
+    89,0,110,2,88,0,121,14,116,7,124,0,106,8,131,1,
+    125,7,87,0,110,26,4,0,116,1,107,10,144,1,114,4,
+    1,0,1,0,1,0,100,0,125,7,89,0,110,2,88,0,
+    116,9,124,4,124,1,124,2,100,1,141,3,125,3,124,5,
+    100,0,107,8,144,1,114,34,100,2,110,2,100,3,124,3,
+    95,10,124,6,124,3,95,11,124,7,124,3,95,12,124,3,
+    83,0,41,4,78,41,1,114,104,0,0,0,70,84,41,13,
+    114,90,0,0,0,114,91,0,0,0,114,1,0,0,0,114,
+    86,0,0,0,114,93,0,0,0,90,7,95,79,82,73,71,
+    73,78,218,10,95,95,99,97,99,104,101,100,95,95,218,4,
+    108,105,115,116,218,8,95,95,112,97,116,104,95,95,114,103,
+    0,0,0,114,108,0,0,0,114,113,0,0,0,114,107,0,
+    0,0,41,8,114,84,0,0,0,114,94,0,0,0,114,104,
+    0,0,0,114,83,0,0,0,114,15,0,0,0,90,8,108,
+    111,99,97,116,105,111,110,114,113,0,0,0,114,107,0,0,
     0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
-    218,18,95,105,110,105,116,95,109,111,100,117,108,101,95,97,
-    116,116,114,115,238,1,0,0,115,92,0,0,0,0,4,20,
-    1,2,1,12,1,14,1,6,2,20,1,6,1,8,2,10,
-    1,8,1,4,1,6,2,10,1,8,1,2,1,10,1,14,
-    1,6,2,20,1,2,1,12,1,14,1,6,2,2,1,10,
-    1,14,1,6,2,24,1,12,1,2,1,12,1,16,1,6,
-    2,8,1,24,1,2,1,12,1,16,1,6,2,24,1,12,
-    1,2,1,12,1,16,1,6,1,114,134,0,0,0,99,1,
-    0,0,0,0,0,0,0,2,0,0,0,3,0,0,0,67,
-    0,0,0,115,82,0,0,0,100,1,125,1,116,0,124,0,
-    106,1,100,2,131,2,114,30,124,0,106,1,160,2,124,0,
-    161,1,125,1,110,20,116,0,124,0,106,1,100,3,131,2,
-    114,50,116,3,100,4,131,1,130,1,124,1,100,1,107,8,
-    114,68,116,4,124,0,106,5,131,1,125,1,116,6,124,0,
-    124,1,131,2,1,0,124,1,83,0,41,5,122,43,67,114,
-    101,97,116,101,32,97,32,109,111,100,117,108,101,32,98,97,
-    115,101,100,32,111,110,32,116,104,101,32,112,114,111,118,105,
-    100,101,100,32,115,112,101,99,46,78,218,13,99,114,101,97,
-    116,101,95,109,111,100,117,108,101,218,11,101,120,101,99,95,
-    109,111,100,117,108,101,122,66,108,111,97,100,101,114,115,32,
-    116,104,97,116,32,100,101,102,105,110,101,32,101,120,101,99,
-    95,109,111,100,117,108,101,40,41,32,109,117,115,116,32,97,
-    108,115,111,32,100,101,102,105,110,101,32,99,114,101,97,116,
-    101,95,109,111,100,117,108,101,40,41,41,7,114,4,0,0,
-    0,114,94,0,0,0,114,135,0,0,0,114,71,0,0,0,
-    114,16,0,0,0,114,15,0,0,0,114,134,0,0,0,41,
-    2,114,83,0,0,0,114,84,0,0,0,114,10,0,0,0,
-    114,10,0,0,0,114,11,0,0,0,218,16,109,111,100,117,
-    108,101,95,102,114,111,109,95,115,112,101,99,42,2,0,0,
-    115,18,0,0,0,0,3,4,1,12,3,14,1,12,1,8,
-    2,8,1,10,1,10,1,114,137,0,0,0,99,1,0,0,
-    0,0,0,0,0,2,0,0,0,4,0,0,0,67,0,0,
-    0,115,106,0,0,0,124,0,106,0,100,1,107,8,114,14,
-    100,2,110,4,124,0,106,0,125,1,124,0,106,1,100,1,
-    107,8,114,66,124,0,106,2,100,1,107,8,114,50,100,3,
-    160,3,124,1,161,1,83,0,100,4,160,3,124,1,124,0,
-    106,2,161,2,83,0,110,36,124,0,106,4,114,86,100,5,
-    160,3,124,1,124,0,106,1,161,2,83,0,100,6,160,3,
-    124,0,106,0,124,0,106,1,161,2,83,0,100,1,83,0,
-    41,7,122,38,82,101,116,117,114,110,32,116,104,101,32,114,
-    101,112,114,32,116,111,32,117,115,101,32,102,111,114,32,116,
-    104,101,32,109,111,100,117,108,101,46,78,114,88,0,0,0,
-    122,13,60,109,111,100,117,108,101,32,123,33,114,125,62,122,
-    20,60,109,111,100,117,108,101,32,123,33,114,125,32,40,123,
-    33,114,125,41,62,122,23,60,109,111,100,117,108,101,32,123,
-    33,114,125,32,102,114,111,109,32,123,33,114,125,62,122,18,
-    60,109,111,100,117,108,101,32,123,33,114,125,32,40,123,125,
-    41,62,41,5,114,15,0,0,0,114,104,0,0,0,114,94,
-    0,0,0,114,38,0,0,0,114,114,0,0,0,41,2,114,
-    83,0,0,0,114,15,0,0,0,114,10,0,0,0,114,10,
-    0,0,0,114,11,0,0,0,114,92,0,0,0,59,2,0,
-    0,115,16,0,0,0,0,3,20,1,10,1,10,1,10,2,
-    16,2,6,1,14,2,114,92,0,0,0,99,2,0,0,0,
-    0,0,0,0,4,0,0,0,12,0,0,0,67,0,0,0,
-    115,178,0,0,0,124,0,106,0,125,2,116,1,124,2,131,
-    1,143,148,1,0,116,2,106,3,160,4,124,2,161,1,124,
-    1,107,9,114,54,100,1,160,5,124,2,161,1,125,3,116,
-    6,124,3,124,2,100,2,141,2,130,1,124,0,106,7,100,
-    3,107,8,114,106,124,0,106,8,100,3,107,8,114,88,116,
-    6,100,4,124,0,106,0,100,2,141,2,130,1,116,9,124,
-    0,124,1,100,5,100,6,141,3,1,0,124,1,83,0,116,
-    9,124,0,124,1,100,5,100,6,141,3,1,0,116,10,124,
-    0,106,7,100,7,131,2,115,146,124,0,106,7,160,11,124,
-    2,161,1,1,0,110,12,124,0,106,7,160,12,124,1,161,
-    1,1,0,87,0,100,3,81,0,82,0,88,0,116,2,106,
-    3,124,2,25,0,83,0,41,8,122,70,69,120,101,99,117,
-    116,101,32,116,104,101,32,115,112,101,99,39,115,32,115,112,
-    101,99,105,102,105,101,100,32,109,111,100,117,108,101,32,105,
-    110,32,97,110,32,101,120,105,115,116,105,110,103,32,109,111,
-    100,117,108,101,39,115,32,110,97,109,101,115,112,97,99,101,
-    46,122,30,109,111,100,117,108,101,32,123,33,114,125,32,110,
-    111,116,32,105,110,32,115,121,115,46,109,111,100,117,108,101,
-    115,41,1,114,15,0,0,0,78,122,14,109,105,115,115,105,
-    110,103,32,108,111,97,100,101,114,84,41,1,114,130,0,0,
-    0,114,136,0,0,0,41,13,114,15,0,0,0,114,42,0,
-    0,0,114,14,0,0,0,114,80,0,0,0,114,30,0,0,
-    0,114,38,0,0,0,114,71,0,0,0,114,94,0,0,0,
-    114,107,0,0,0,114,134,0,0,0,114,4,0,0,0,218,
-    11,108,111,97,100,95,109,111,100,117,108,101,114,136,0,0,
-    0,41,4,114,83,0,0,0,114,84,0,0,0,114,15,0,
-    0,0,218,3,109,115,103,114,10,0,0,0,114,10,0,0,
-    0,114,11,0,0,0,114,81,0,0,0,76,2,0,0,115,
-    30,0,0,0,0,2,6,1,10,1,16,1,10,1,12,1,
-    10,1,10,1,14,2,14,1,4,1,14,1,12,4,14,2,
-    22,1,114,81,0,0,0,99,1,0,0,0,0,0,0,0,
-    2,0,0,0,27,0,0,0,67,0,0,0,115,206,0,0,
-    0,124,0,106,0,160,1,124,0,106,2,161,1,1,0,116,
-    3,106,4,124,0,106,2,25,0,125,1,116,5,124,1,100,
-    1,100,0,131,3,100,0,107,8,114,76,121,12,124,0,106,
-    0,124,1,95,6,87,0,110,20,4,0,116,7,107,10,114,
-    74,1,0,1,0,1,0,89,0,110,2,88,0,116,5,124,
-    1,100,2,100,0,131,3,100,0,107,8,114,154,121,40,124,
-    1,106,8,124,1,95,9,116,10,124,1,100,3,131,2,115,
-    130,124,0,106,2,160,11,100,4,161,1,100,5,25,0,124,
-    1,95,9,87,0,110,20,4,0,116,7,107,10,114,152,1,
-    0,1,0,1,0,89,0,110,2,88,0,116,5,124,1,100,
-    6,100,0,131,3,100,0,107,8,114,202,121,10,124,0,124,
-    1,95,12,87,0,110,20,4,0,116,7,107,10,114,200,1,
-    0,1,0,1,0,89,0,110,2,88,0,124,1,83,0,41,
-    7,78,114,86,0,0,0,114,131,0,0,0,114,128,0,0,
-    0,114,118,0,0,0,114,19,0,0,0,114,90,0,0,0,
-    41,13,114,94,0,0,0,114,138,0,0,0,114,15,0,0,
-    0,114,14,0,0,0,114,80,0,0,0,114,6,0,0,0,
-    114,86,0,0,0,114,91,0,0,0,114,1,0,0,0,114,
-    131,0,0,0,114,4,0,0,0,114,119,0,0,0,114,90,
-    0,0,0,41,2,114,83,0,0,0,114,84,0,0,0,114,
-    10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,25,
-    95,108,111,97,100,95,98,97,99,107,119,97,114,100,95,99,
-    111,109,112,97,116,105,98,108,101,100,2,0,0,115,40,0,
-    0,0,0,4,14,2,12,1,16,1,2,1,12,1,14,1,
-    6,1,16,1,2,4,8,1,10,1,22,1,14,1,6,1,
-    16,1,2,1,10,1,14,1,6,1,114,140,0,0,0,99,
-    1,0,0,0,0,0,0,0,2,0,0,0,11,0,0,0,
-    67,0,0,0,115,118,0,0,0,124,0,106,0,100,0,107,
-    9,114,30,116,1,124,0,106,0,100,1,131,2,115,30,116,
-    2,124,0,131,1,83,0,116,3,124,0,131,1,125,1,116,
-    4,124,1,131,1,143,54,1,0,124,0,106,0,100,0,107,
-    8,114,84,124,0,106,5,100,0,107,8,114,96,116,6,100,
-    2,124,0,106,7,100,3,141,2,130,1,110,12,124,0,106,
-    0,160,8,124,1,161,1,1,0,87,0,100,0,81,0,82,
-    0,88,0,116,9,106,10,124,0,106,7,25,0,83,0,41,
-    4,78,114,136,0,0,0,122,14,109,105,115,115,105,110,103,
-    32,108,111,97,100,101,114,41,1,114,15,0,0,0,41,11,
-    114,94,0,0,0,114,4,0,0,0,114,140,0,0,0,114,
-    137,0,0,0,114,97,0,0,0,114,107,0,0,0,114,71,
-    0,0,0,114,15,0,0,0,114,136,0,0,0,114,14,0,
-    0,0,114,80,0,0,0,41,2,114,83,0,0,0,114,84,
+    218,17,95,115,112,101,99,95,102,114,111,109,95,109,111,100,
+    117,108,101,203,1,0,0,115,72,0,0,0,0,2,2,1,
+    10,1,14,1,6,2,8,1,4,2,6,1,8,1,2,1,
+    10,1,14,2,6,1,2,1,10,1,14,1,10,1,8,1,
+    8,1,2,1,10,1,14,1,12,2,4,1,2,1,10,1,
+    14,1,10,1,2,1,14,1,16,1,10,2,14,1,20,1,
+    6,1,6,1,114,129,0,0,0,70,41,1,218,8,111,118,
+    101,114,114,105,100,101,99,2,0,0,0,1,0,0,0,5,
+    0,0,0,59,0,0,0,67,0,0,0,115,212,1,0,0,
+    124,2,115,20,116,0,124,1,100,1,100,0,131,3,100,0,
+    107,8,114,54,121,12,124,0,106,1,124,1,95,2,87,0,
+    110,20,4,0,116,3,107,10,114,52,1,0,1,0,1,0,
+    89,0,110,2,88,0,124,2,115,74,116,0,124,1,100,2,
+    100,0,131,3,100,0,107,8,114,166,124,0,106,4,125,3,
+    124,3,100,0,107,8,114,134,124,0,106,5,100,0,107,9,
+    114,134,116,6,100,0,107,8,114,110,116,7,130,1,116,6,
+    106,8,125,4,124,4,160,9,124,4,161,1,125,3,124,0,
+    106,5,124,3,95,10,121,10,124,3,124,1,95,11,87,0,
+    110,20,4,0,116,3,107,10,114,164,1,0,1,0,1,0,
+    89,0,110,2,88,0,124,2,115,186,116,0,124,1,100,3,
+    100,0,131,3,100,0,107,8,114,220,121,12,124,0,106,12,
+    124,1,95,13,87,0,110,20,4,0,116,3,107,10,114,218,
+    1,0,1,0,1,0,89,0,110,2,88,0,121,10,124,0,
+    124,1,95,14,87,0,110,20,4,0,116,3,107,10,114,250,
+    1,0,1,0,1,0,89,0,110,2,88,0,124,2,144,1,
+    115,20,116,0,124,1,100,4,100,0,131,3,100,0,107,8,
+    144,1,114,68,124,0,106,5,100,0,107,9,144,1,114,68,
+    121,12,124,0,106,5,124,1,95,15,87,0,110,22,4,0,
+    116,3,107,10,144,1,114,66,1,0,1,0,1,0,89,0,
+    110,2,88,0,124,0,106,16,144,1,114,208,124,2,144,1,
+    115,100,116,0,124,1,100,5,100,0,131,3,100,0,107,8,
+    144,1,114,136,121,12,124,0,106,17,124,1,95,18,87,0,
+    110,22,4,0,116,3,107,10,144,1,114,134,1,0,1,0,
+    1,0,89,0,110,2,88,0,124,2,144,1,115,160,116,0,
+    124,1,100,6,100,0,131,3,100,0,107,8,144,1,114,208,
+    124,0,106,19,100,0,107,9,144,1,114,208,121,12,124,0,
+    106,19,124,1,95,20,87,0,110,22,4,0,116,3,107,10,
+    144,1,114,206,1,0,1,0,1,0,89,0,110,2,88,0,
+    124,1,83,0,41,7,78,114,1,0,0,0,114,86,0,0,
+    0,218,11,95,95,112,97,99,107,97,103,101,95,95,114,128,
+    0,0,0,114,93,0,0,0,114,126,0,0,0,41,21,114,
+    6,0,0,0,114,15,0,0,0,114,1,0,0,0,114,91,
+    0,0,0,114,94,0,0,0,114,107,0,0,0,114,116,0,
+    0,0,114,117,0,0,0,218,16,95,78,97,109,101,115,112,
+    97,99,101,76,111,97,100,101,114,218,7,95,95,110,101,119,
+    95,95,90,5,95,112,97,116,104,114,86,0,0,0,114,120,
+    0,0,0,114,131,0,0,0,114,90,0,0,0,114,128,0,
+    0,0,114,114,0,0,0,114,104,0,0,0,114,93,0,0,
+    0,114,113,0,0,0,114,126,0,0,0,41,5,114,83,0,
+    0,0,114,84,0,0,0,114,130,0,0,0,114,94,0,0,
+    0,114,132,0,0,0,114,10,0,0,0,114,10,0,0,0,
+    114,11,0,0,0,218,18,95,105,110,105,116,95,109,111,100,
+    117,108,101,95,97,116,116,114,115,248,1,0,0,115,92,0,
+    0,0,0,4,20,1,2,1,12,1,14,1,6,2,20,1,
+    6,1,8,2,10,1,8,1,4,1,6,2,10,1,8,1,
+    2,1,10,1,14,1,6,2,20,1,2,1,12,1,14,1,
+    6,2,2,1,10,1,14,1,6,2,24,1,12,1,2,1,
+    12,1,16,1,6,2,8,1,24,1,2,1,12,1,16,1,
+    6,2,24,1,12,1,2,1,12,1,16,1,6,1,114,134,
+    0,0,0,99,1,0,0,0,0,0,0,0,2,0,0,0,
+    3,0,0,0,67,0,0,0,115,82,0,0,0,100,1,125,
+    1,116,0,124,0,106,1,100,2,131,2,114,30,124,0,106,
+    1,160,2,124,0,161,1,125,1,110,20,116,0,124,0,106,
+    1,100,3,131,2,114,50,116,3,100,4,131,1,130,1,124,
+    1,100,1,107,8,114,68,116,4,124,0,106,5,131,1,125,
+    1,116,6,124,0,124,1,131,2,1,0,124,1,83,0,41,
+    5,122,43,67,114,101,97,116,101,32,97,32,109,111,100,117,
+    108,101,32,98,97,115,101,100,32,111,110,32,116,104,101,32,
+    112,114,111,118,105,100,101,100,32,115,112,101,99,46,78,218,
+    13,99,114,101,97,116,101,95,109,111,100,117,108,101,218,11,
+    101,120,101,99,95,109,111,100,117,108,101,122,66,108,111,97,
+    100,101,114,115,32,116,104,97,116,32,100,101,102,105,110,101,
+    32,101,120,101,99,95,109,111,100,117,108,101,40,41,32,109,
+    117,115,116,32,97,108,115,111,32,100,101,102,105,110,101,32,
+    99,114,101,97,116,101,95,109,111,100,117,108,101,40,41,41,
+    7,114,4,0,0,0,114,94,0,0,0,114,135,0,0,0,
+    114,71,0,0,0,114,16,0,0,0,114,15,0,0,0,114,
+    134,0,0,0,41,2,114,83,0,0,0,114,84,0,0,0,
+    114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,
+    16,109,111,100,117,108,101,95,102,114,111,109,95,115,112,101,
+    99,52,2,0,0,115,18,0,0,0,0,3,4,1,12,3,
+    14,1,12,1,8,2,8,1,10,1,10,1,114,137,0,0,
+    0,99,1,0,0,0,0,0,0,0,2,0,0,0,4,0,
+    0,0,67,0,0,0,115,106,0,0,0,124,0,106,0,100,
+    1,107,8,114,14,100,2,110,4,124,0,106,0,125,1,124,
+    0,106,1,100,1,107,8,114,66,124,0,106,2,100,1,107,
+    8,114,50,100,3,160,3,124,1,161,1,83,0,100,4,160,
+    3,124,1,124,0,106,2,161,2,83,0,110,36,124,0,106,
+    4,114,86,100,5,160,3,124,1,124,0,106,1,161,2,83,
+    0,100,6,160,3,124,0,106,0,124,0,106,1,161,2,83,
+    0,100,1,83,0,41,7,122,38,82,101,116,117,114,110,32,
+    116,104,101,32,114,101,112,114,32,116,111,32,117,115,101,32,
+    102,111,114,32,116,104,101,32,109,111,100,117,108,101,46,78,
+    114,88,0,0,0,122,13,60,109,111,100,117,108,101,32,123,
+    33,114,125,62,122,20,60,109,111,100,117,108,101,32,123,33,
+    114,125,32,40,123,33,114,125,41,62,122,23,60,109,111,100,
+    117,108,101,32,123,33,114,125,32,102,114,111,109,32,123,33,
+    114,125,62,122,18,60,109,111,100,117,108,101,32,123,33,114,
+    125,32,40,123,125,41,62,41,5,114,15,0,0,0,114,104,
+    0,0,0,114,94,0,0,0,114,38,0,0,0,114,114,0,
+    0,0,41,2,114,83,0,0,0,114,15,0,0,0,114,10,
+    0,0,0,114,10,0,0,0,114,11,0,0,0,114,92,0,
+    0,0,69,2,0,0,115,16,0,0,0,0,3,20,1,10,
+    1,10,1,10,2,16,2,6,1,14,2,114,92,0,0,0,
+    99,2,0,0,0,0,0,0,0,4,0,0,0,12,0,0,
+    0,67,0,0,0,115,178,0,0,0,124,0,106,0,125,2,
+    116,1,124,2,131,1,143,148,1,0,116,2,106,3,160,4,
+    124,2,161,1,124,1,107,9,114,54,100,1,160,5,124,2,
+    161,1,125,3,116,6,124,3,124,2,100,2,141,2,130,1,
+    124,0,106,7,100,3,107,8,114,106,124,0,106,8,100,3,
+    107,8,114,88,116,6,100,4,124,0,106,0,100,2,141,2,
+    130,1,116,9,124,0,124,1,100,5,100,6,141,3,1,0,
+    124,1,83,0,116,9,124,0,124,1,100,5,100,6,141,3,
+    1,0,116,10,124,0,106,7,100,7,131,2,115,146,124,0,
+    106,7,160,11,124,2,161,1,1,0,110,12,124,0,106,7,
+    160,12,124,1,161,1,1,0,87,0,100,3,81,0,82,0,
+    88,0,116,2,106,3,124,2,25,0,83,0,41,8,122,70,
+    69,120,101,99,117,116,101,32,116,104,101,32,115,112,101,99,
+    39,115,32,115,112,101,99,105,102,105,101,100,32,109,111,100,
+    117,108,101,32,105,110,32,97,110,32,101,120,105,115,116,105,
+    110,103,32,109,111,100,117,108,101,39,115,32,110,97,109,101,
+    115,112,97,99,101,46,122,30,109,111,100,117,108,101,32,123,
+    33,114,125,32,110,111,116,32,105,110,32,115,121,115,46,109,
+    111,100,117,108,101,115,41,1,114,15,0,0,0,78,122,14,
+    109,105,115,115,105,110,103,32,108,111,97,100,101,114,84,41,
+    1,114,130,0,0,0,114,136,0,0,0,41,13,114,15,0,
+    0,0,114,42,0,0,0,114,14,0,0,0,114,80,0,0,
+    0,114,30,0,0,0,114,38,0,0,0,114,71,0,0,0,
+    114,94,0,0,0,114,107,0,0,0,114,134,0,0,0,114,
+    4,0,0,0,218,11,108,111,97,100,95,109,111,100,117,108,
+    101,114,136,0,0,0,41,4,114,83,0,0,0,114,84,0,
+    0,0,114,15,0,0,0,218,3,109,115,103,114,10,0,0,
+    0,114,10,0,0,0,114,11,0,0,0,114,81,0,0,0,
+    86,2,0,0,115,30,0,0,0,0,2,6,1,10,1,16,
+    1,10,1,12,1,10,1,10,1,14,2,14,1,4,1,14,
+    1,12,4,14,2,22,1,114,81,0,0,0,99,1,0,0,
+    0,0,0,0,0,2,0,0,0,27,0,0,0,67,0,0,
+    0,115,206,0,0,0,124,0,106,0,160,1,124,0,106,2,
+    161,1,1,0,116,3,106,4,124,0,106,2,25,0,125,1,
+    116,5,124,1,100,1,100,0,131,3,100,0,107,8,114,76,
+    121,12,124,0,106,0,124,1,95,6,87,0,110,20,4,0,
+    116,7,107,10,114,74,1,0,1,0,1,0,89,0,110,2,
+    88,0,116,5,124,1,100,2,100,0,131,3,100,0,107,8,
+    114,154,121,40,124,1,106,8,124,1,95,9,116,10,124,1,
+    100,3,131,2,115,130,124,0,106,2,160,11,100,4,161,1,
+    100,5,25,0,124,1,95,9,87,0,110,20,4,0,116,7,
+    107,10,114,152,1,0,1,0,1,0,89,0,110,2,88,0,
+    116,5,124,1,100,6,100,0,131,3,100,0,107,8,114,202,
+    121,10,124,0,124,1,95,12,87,0,110,20,4,0,116,7,
+    107,10,114,200,1,0,1,0,1,0,89,0,110,2,88,0,
+    124,1,83,0,41,7,78,114,86,0,0,0,114,131,0,0,
+    0,114,128,0,0,0,114,118,0,0,0,114,19,0,0,0,
+    114,90,0,0,0,41,13,114,94,0,0,0,114,138,0,0,
+    0,114,15,0,0,0,114,14,0,0,0,114,80,0,0,0,
+    114,6,0,0,0,114,86,0,0,0,114,91,0,0,0,114,
+    1,0,0,0,114,131,0,0,0,114,4,0,0,0,114,119,
+    0,0,0,114,90,0,0,0,41,2,114,83,0,0,0,114,
+    84,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
+    0,0,0,218,25,95,108,111,97,100,95,98,97,99,107,119,
+    97,114,100,95,99,111,109,112,97,116,105,98,108,101,110,2,
+    0,0,115,40,0,0,0,0,4,14,2,12,1,16,1,2,
+    1,12,1,14,1,6,1,16,1,2,4,8,1,10,1,22,
+    1,14,1,6,1,16,1,2,1,10,1,14,1,6,1,114,
+    140,0,0,0,99,1,0,0,0,0,0,0,0,2,0,0,
+    0,11,0,0,0,67,0,0,0,115,118,0,0,0,124,0,
+    106,0,100,0,107,9,114,30,116,1,124,0,106,0,100,1,
+    131,2,115,30,116,2,124,0,131,1,83,0,116,3,124,0,
+    131,1,125,1,116,4,124,1,131,1,143,54,1,0,124,0,
+    106,0,100,0,107,8,114,84,124,0,106,5,100,0,107,8,
+    114,96,116,6,100,2,124,0,106,7,100,3,141,2,130,1,
+    110,12,124,0,106,0,160,8,124,1,161,1,1,0,87,0,
+    100,0,81,0,82,0,88,0,116,9,106,10,124,0,106,7,
+    25,0,83,0,41,4,78,114,136,0,0,0,122,14,109,105,
+    115,115,105,110,103,32,108,111,97,100,101,114,41,1,114,15,
+    0,0,0,41,11,114,94,0,0,0,114,4,0,0,0,114,
+    140,0,0,0,114,137,0,0,0,114,97,0,0,0,114,107,
+    0,0,0,114,71,0,0,0,114,15,0,0,0,114,136,0,
+    0,0,114,14,0,0,0,114,80,0,0,0,41,2,114,83,
+    0,0,0,114,84,0,0,0,114,10,0,0,0,114,10,0,
+    0,0,114,11,0,0,0,218,14,95,108,111,97,100,95,117,
+    110,108,111,99,107,101,100,139,2,0,0,115,20,0,0,0,
+    0,2,10,2,12,1,8,2,8,1,10,1,10,1,10,1,
+    16,3,22,5,114,141,0,0,0,99,1,0,0,0,0,0,
+    0,0,1,0,0,0,9,0,0,0,67,0,0,0,115,30,
+    0,0,0,116,0,124,0,106,1,131,1,143,10,1,0,116,
+    2,124,0,131,1,83,0,81,0,82,0,88,0,100,1,83,
+    0,41,2,122,191,82,101,116,117,114,110,32,97,32,110,101,
+    119,32,109,111,100,117,108,101,32,111,98,106,101,99,116,44,
+    32,108,111,97,100,101,100,32,98,121,32,116,104,101,32,115,
+    112,101,99,39,115,32,108,111,97,100,101,114,46,10,10,32,
+    32,32,32,84,104,101,32,109,111,100,117,108,101,32,105,115,
+    32,110,111,116,32,97,100,100,101,100,32,116,111,32,105,116,
+    115,32,112,97,114,101,110,116,46,10,10,32,32,32,32,73,
+    102,32,97,32,109,111,100,117,108,101,32,105,115,32,97,108,
+    114,101,97,100,121,32,105,110,32,115,121,115,46,109,111,100,
+    117,108,101,115,44,32,116,104,97,116,32,101,120,105,115,116,
+    105,110,103,32,109,111,100,117,108,101,32,103,101,116,115,10,
+    32,32,32,32,99,108,111,98,98,101,114,101,100,46,10,10,
+    32,32,32,32,78,41,3,114,42,0,0,0,114,15,0,0,
+    0,114,141,0,0,0,41,1,114,83,0,0,0,114,10,0,
+    0,0,114,10,0,0,0,114,11,0,0,0,114,82,0,0,
+    0,162,2,0,0,115,4,0,0,0,0,9,12,1,114,82,
+    0,0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,
+    4,0,0,0,64,0,0,0,115,136,0,0,0,101,0,90,
+    1,100,0,90,2,100,1,90,3,101,4,100,2,100,3,132,
+    0,131,1,90,5,101,6,100,19,100,5,100,6,132,1,131,
+    1,90,7,101,6,100,20,100,7,100,8,132,1,131,1,90,
+    8,101,6,100,9,100,10,132,0,131,1,90,9,101,6,100,
+    11,100,12,132,0,131,1,90,10,101,6,101,11,100,13,100,
+    14,132,0,131,1,131,1,90,12,101,6,101,11,100,15,100,
+    16,132,0,131,1,131,1,90,13,101,6,101,11,100,17,100,
+    18,132,0,131,1,131,1,90,14,101,6,101,15,131,1,90,
+    16,100,4,83,0,41,21,218,15,66,117,105,108,116,105,110,
+    73,109,112,111,114,116,101,114,122,144,77,101,116,97,32,112,
+    97,116,104,32,105,109,112,111,114,116,32,102,111,114,32,98,
+    117,105,108,116,45,105,110,32,109,111,100,117,108,101,115,46,
+    10,10,32,32,32,32,65,108,108,32,109,101,116,104,111,100,
+    115,32,97,114,101,32,101,105,116,104,101,114,32,99,108,97,
+    115,115,32,111,114,32,115,116,97,116,105,99,32,109,101,116,
+    104,111,100,115,32,116,111,32,97,118,111,105,100,32,116,104,
+    101,32,110,101,101,100,32,116,111,10,32,32,32,32,105,110,
+    115,116,97,110,116,105,97,116,101,32,116,104,101,32,99,108,
+    97,115,115,46,10,10,32,32,32,32,99,1,0,0,0,0,
+    0,0,0,1,0,0,0,3,0,0,0,67,0,0,0,115,
+    12,0,0,0,100,1,160,0,124,0,106,1,161,1,83,0,
+    41,2,122,115,82,101,116,117,114,110,32,114,101,112,114,32,
+    102,111,114,32,116,104,101,32,109,111,100,117,108,101,46,10,
+    10,32,32,32,32,32,32,32,32,84,104,101,32,109,101,116,
+    104,111,100,32,105,115,32,100,101,112,114,101,99,97,116,101,
+    100,46,32,32,84,104,101,32,105,109,112,111,114,116,32,109,
+    97,99,104,105,110,101,114,121,32,100,111,101,115,32,116,104,
+    101,32,106,111,98,32,105,116,115,101,108,102,46,10,10,32,
+    32,32,32,32,32,32,32,122,24,60,109,111,100,117,108,101,
+    32,123,33,114,125,32,40,98,117,105,108,116,45,105,110,41,
+    62,41,2,114,38,0,0,0,114,1,0,0,0,41,1,114,
+    84,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
+    0,0,0,114,87,0,0,0,186,2,0,0,115,2,0,0,
+    0,0,7,122,27,66,117,105,108,116,105,110,73,109,112,111,
+    114,116,101,114,46,109,111,100,117,108,101,95,114,101,112,114,
+    78,99,4,0,0,0,0,0,0,0,4,0,0,0,5,0,
+    0,0,67,0,0,0,115,44,0,0,0,124,2,100,0,107,
+    9,114,12,100,0,83,0,116,0,160,1,124,1,161,1,114,
+    36,116,2,124,1,124,0,100,1,100,2,141,3,83,0,100,
+    0,83,0,100,0,83,0,41,3,78,122,8,98,117,105,108,
+    116,45,105,110,41,1,114,104,0,0,0,41,3,114,49,0,
+    0,0,90,10,105,115,95,98,117,105,108,116,105,110,114,79,
+    0,0,0,41,4,218,3,99,108,115,114,72,0,0,0,218,
+    4,112,97,116,104,218,6,116,97,114,103,101,116,114,10,0,
+    0,0,114,10,0,0,0,114,11,0,0,0,218,9,102,105,
+    110,100,95,115,112,101,99,195,2,0,0,115,10,0,0,0,
+    0,2,8,1,4,1,10,1,14,2,122,25,66,117,105,108,
+    116,105,110,73,109,112,111,114,116,101,114,46,102,105,110,100,
+    95,115,112,101,99,99,3,0,0,0,0,0,0,0,4,0,
+    0,0,4,0,0,0,67,0,0,0,115,30,0,0,0,124,
+    0,160,0,124,1,124,2,161,2,125,3,124,3,100,1,107,
+    9,114,26,124,3,106,1,83,0,100,1,83,0,41,2,122,
+    175,70,105,110,100,32,116,104,101,32,98,117,105,108,116,45,
+    105,110,32,109,111,100,117,108,101,46,10,10,32,32,32,32,
+    32,32,32,32,73,102,32,39,112,97,116,104,39,32,105,115,
+    32,101,118,101,114,32,115,112,101,99,105,102,105,101,100,32,
+    116,104,101,110,32,116,104,101,32,115,101,97,114,99,104,32,
+    105,115,32,99,111,110,115,105,100,101,114,101,100,32,97,32,
+    102,97,105,108,117,114,101,46,10,10,32,32,32,32,32,32,
+    32,32,84,104,105,115,32,109,101,116,104,111,100,32,105,115,
+    32,100,101,112,114,101,99,97,116,101,100,46,32,32,85,115,
+    101,32,102,105,110,100,95,115,112,101,99,40,41,32,105,110,
+    115,116,101,97,100,46,10,10,32,32,32,32,32,32,32,32,
+    78,41,2,114,146,0,0,0,114,94,0,0,0,41,4,114,
+    143,0,0,0,114,72,0,0,0,114,144,0,0,0,114,83,
     0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,
-    0,0,218,14,95,108,111,97,100,95,117,110,108,111,99,107,
-    101,100,129,2,0,0,115,20,0,0,0,0,2,10,2,12,
-    1,8,2,8,1,10,1,10,1,10,1,16,3,22,5,114,
-    141,0,0,0,99,1,0,0,0,0,0,0,0,1,0,0,
-    0,9,0,0,0,67,0,0,0,115,30,0,0,0,116,0,
-    124,0,106,1,131,1,143,10,1,0,116,2,124,0,131,1,
-    83,0,81,0,82,0,88,0,100,1,83,0,41,2,122,191,
-    82,101,116,117,114,110,32,97,32,110,101,119,32,109,111,100,
-    117,108,101,32,111,98,106,101,99,116,44,32,108,111,97,100,
-    101,100,32,98,121,32,116,104,101,32,115,112,101,99,39,115,
-    32,108,111,97,100,101,114,46,10,10,32,32,32,32,84,104,
-    101,32,109,111,100,117,108,101,32,105,115,32,110,111,116,32,
-    97,100,100,101,100,32,116,111,32,105,116,115,32,112,97,114,
-    101,110,116,46,10,10,32,32,32,32,73,102,32,97,32,109,
-    111,100,117,108,101,32,105,115,32,97,108,114,101,97,100,121,
-    32,105,110,32,115,121,115,46,109,111,100,117,108,101,115,44,
-    32,116,104,97,116,32,101,120,105,115,116,105,110,103,32,109,
-    111,100,117,108,101,32,103,101,116,115,10,32,32,32,32,99,
-    108,111,98,98,101,114,101,100,46,10,10,32,32,32,32,78,
-    41,3,114,42,0,0,0,114,15,0,0,0,114,141,0,0,
-    0,41,1,114,83,0,0,0,114,10,0,0,0,114,10,0,
-    0,0,114,11,0,0,0,114,82,0,0,0,152,2,0,0,
-    115,4,0,0,0,0,9,12,1,114,82,0,0,0,99,0,
-    0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,64,
-    0,0,0,115,136,0,0,0,101,0,90,1,100,0,90,2,
-    100,1,90,3,101,4,100,2,100,3,132,0,131,1,90,5,
-    101,6,100,19,100,5,100,6,132,1,131,1,90,7,101,6,
-    100,20,100,7,100,8,132,1,131,1,90,8,101,6,100,9,
-    100,10,132,0,131,1,90,9,101,6,100,11,100,12,132,0,
-    131,1,90,10,101,6,101,11,100,13,100,14,132,0,131,1,
-    131,1,90,12,101,6,101,11,100,15,100,16,132,0,131,1,
-    131,1,90,13,101,6,101,11,100,17,100,18,132,0,131,1,
-    131,1,90,14,101,6,101,15,131,1,90,16,100,4,83,0,
-    41,21,218,15,66,117,105,108,116,105,110,73,109,112,111,114,
-    116,101,114,122,144,77,101,116,97,32,112,97,116,104,32,105,
-    109,112,111,114,116,32,102,111,114,32,98,117,105,108,116,45,
-    105,110,32,109,111,100,117,108,101,115,46,10,10,32,32,32,
+    0,0,218,11,102,105,110,100,95,109,111,100,117,108,101,204,
+    2,0,0,115,4,0,0,0,0,9,12,1,122,27,66,117,
+    105,108,116,105,110,73,109,112,111,114,116,101,114,46,102,105,
+    110,100,95,109,111,100,117,108,101,99,2,0,0,0,0,0,
+    0,0,2,0,0,0,4,0,0,0,67,0,0,0,115,46,
+    0,0,0,124,1,106,0,116,1,106,2,107,7,114,34,116,
+    3,100,1,160,4,124,1,106,0,161,1,124,1,106,0,100,
+    2,141,2,130,1,116,5,116,6,106,7,124,1,131,2,83,
+    0,41,3,122,24,67,114,101,97,116,101,32,97,32,98,117,
+    105,108,116,45,105,110,32,109,111,100,117,108,101,122,29,123,
+    33,114,125,32,105,115,32,110,111,116,32,97,32,98,117,105,
+    108,116,45,105,110,32,109,111,100,117,108,101,41,1,114,15,
+    0,0,0,41,8,114,15,0,0,0,114,14,0,0,0,114,
+    70,0,0,0,114,71,0,0,0,114,38,0,0,0,114,59,
+    0,0,0,114,49,0,0,0,90,14,99,114,101,97,116,101,
+    95,98,117,105,108,116,105,110,41,2,114,26,0,0,0,114,
+    83,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
+    0,0,0,114,135,0,0,0,216,2,0,0,115,8,0,0,
+    0,0,3,12,1,12,1,10,1,122,29,66,117,105,108,116,
+    105,110,73,109,112,111,114,116,101,114,46,99,114,101,97,116,
+    101,95,109,111,100,117,108,101,99,2,0,0,0,0,0,0,
+    0,2,0,0,0,3,0,0,0,67,0,0,0,115,16,0,
+    0,0,116,0,116,1,106,2,124,1,131,2,1,0,100,1,
+    83,0,41,2,122,22,69,120,101,99,32,97,32,98,117,105,
+    108,116,45,105,110,32,109,111,100,117,108,101,78,41,3,114,
+    59,0,0,0,114,49,0,0,0,90,12,101,120,101,99,95,
+    98,117,105,108,116,105,110,41,2,114,26,0,0,0,114,84,
+    0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,
+    0,0,114,136,0,0,0,224,2,0,0,115,2,0,0,0,
+    0,3,122,27,66,117,105,108,116,105,110,73,109,112,111,114,
+    116,101,114,46,101,120,101,99,95,109,111,100,117,108,101,99,
+    2,0,0,0,0,0,0,0,2,0,0,0,1,0,0,0,
+    67,0,0,0,115,4,0,0,0,100,1,83,0,41,2,122,
+    57,82,101,116,117,114,110,32,78,111,110,101,32,97,115,32,
+    98,117,105,108,116,45,105,110,32,109,111,100,117,108,101,115,
+    32,100,111,32,110,111,116,32,104,97,118,101,32,99,111,100,
+    101,32,111,98,106,101,99,116,115,46,78,114,10,0,0,0,
+    41,2,114,143,0,0,0,114,72,0,0,0,114,10,0,0,
+    0,114,10,0,0,0,114,11,0,0,0,218,8,103,101,116,
+    95,99,111,100,101,229,2,0,0,115,2,0,0,0,0,4,
+    122,24,66,117,105,108,116,105,110,73,109,112,111,114,116,101,
+    114,46,103,101,116,95,99,111,100,101,99,2,0,0,0,0,
+    0,0,0,2,0,0,0,1,0,0,0,67,0,0,0,115,
+    4,0,0,0,100,1,83,0,41,2,122,56,82,101,116,117,
+    114,110,32,78,111,110,101,32,97,115,32,98,117,105,108,116,
+    45,105,110,32,109,111,100,117,108,101,115,32,100,111,32,110,
+    111,116,32,104,97,118,101,32,115,111,117,114,99,101,32,99,
+    111,100,101,46,78,114,10,0,0,0,41,2,114,143,0,0,
+    0,114,72,0,0,0,114,10,0,0,0,114,10,0,0,0,
+    114,11,0,0,0,218,10,103,101,116,95,115,111,117,114,99,
+    101,235,2,0,0,115,2,0,0,0,0,4,122,26,66,117,
+    105,108,116,105,110,73,109,112,111,114,116,101,114,46,103,101,
+    116,95,115,111,117,114,99,101,99,2,0,0,0,0,0,0,
+    0,2,0,0,0,1,0,0,0,67,0,0,0,115,4,0,
+    0,0,100,1,83,0,41,2,122,52,82,101,116,117,114,110,
+    32,70,97,108,115,101,32,97,115,32,98,117,105,108,116,45,
+    105,110,32,109,111,100,117,108,101,115,32,97,114,101,32,110,
+    101,118,101,114,32,112,97,99,107,97,103,101,115,46,70,114,
+    10,0,0,0,41,2,114,143,0,0,0,114,72,0,0,0,
+    114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,
+    106,0,0,0,241,2,0,0,115,2,0,0,0,0,4,122,
+    26,66,117,105,108,116,105,110,73,109,112,111,114,116,101,114,
+    46,105,115,95,112,97,99,107,97,103,101,41,2,78,78,41,
+    1,78,41,17,114,1,0,0,0,114,0,0,0,0,114,2,
+    0,0,0,114,3,0,0,0,218,12,115,116,97,116,105,99,
+    109,101,116,104,111,100,114,87,0,0,0,218,11,99,108,97,
+    115,115,109,101,116,104,111,100,114,146,0,0,0,114,147,0,
+    0,0,114,135,0,0,0,114,136,0,0,0,114,75,0,0,
+    0,114,148,0,0,0,114,149,0,0,0,114,106,0,0,0,
+    114,85,0,0,0,114,138,0,0,0,114,10,0,0,0,114,
+    10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,142,
+    0,0,0,177,2,0,0,115,28,0,0,0,12,9,12,9,
+    2,1,12,8,2,1,12,11,12,8,12,5,2,1,14,5,
+    2,1,14,5,2,1,14,5,114,142,0,0,0,99,0,0,
+    0,0,0,0,0,0,0,0,0,0,4,0,0,0,64,0,
+    0,0,115,140,0,0,0,101,0,90,1,100,0,90,2,100,
+    1,90,3,101,4,100,2,100,3,132,0,131,1,90,5,101,
+    6,100,21,100,5,100,6,132,1,131,1,90,7,101,6,100,
+    22,100,7,100,8,132,1,131,1,90,8,101,6,100,9,100,
+    10,132,0,131,1,90,9,101,4,100,11,100,12,132,0,131,
+    1,90,10,101,6,100,13,100,14,132,0,131,1,90,11,101,
+    6,101,12,100,15,100,16,132,0,131,1,131,1,90,13,101,
+    6,101,12,100,17,100,18,132,0,131,1,131,1,90,14,101,
+    6,101,12,100,19,100,20,132,0,131,1,131,1,90,15,100,
+    4,83,0,41,23,218,14,70,114,111,122,101,110,73,109,112,
+    111,114,116,101,114,122,142,77,101,116,97,32,112,97,116,104,
+    32,105,109,112,111,114,116,32,102,111,114,32,102,114,111,122,
+    101,110,32,109,111,100,117,108,101,115,46,10,10,32,32,32,
     32,65,108,108,32,109,101,116,104,111,100,115,32,97,114,101,
     32,101,105,116,104,101,114,32,99,108,97,115,115,32,111,114,
     32,115,116,97,116,105,99,32,109,101,116,104,111,100,115,32,
@@ -1082,733 +1228,592 @@ const unsigned char _Py_M__importlib[] = {
     104,101,32,105,109,112,111,114,116,32,109,97,99,104,105,110,
     101,114,121,32,100,111,101,115,32,116,104,101,32,106,111,98,
     32,105,116,115,101,108,102,46,10,10,32,32,32,32,32,32,
-    32,32,122,24,60,109,111,100,117,108,101,32,123,33,114,125,
-    32,40,98,117,105,108,116,45,105,110,41,62,41,2,114,38,
-    0,0,0,114,1,0,0,0,41,1,114,84,0,0,0,114,
-    10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,87,
-    0,0,0,176,2,0,0,115,2,0,0,0,0,7,122,27,
-    66,117,105,108,116,105,110,73,109,112,111,114,116,101,114,46,
-    109,111,100,117,108,101,95,114,101,112,114,78,99,4,0,0,
-    0,0,0,0,0,4,0,0,0,5,0,0,0,67,0,0,
-    0,115,44,0,0,0,124,2,100,0,107,9,114,12,100,0,
-    83,0,116,0,160,1,124,1,161,1,114,36,116,2,124,1,
-    124,0,100,1,100,2,141,3,83,0,100,0,83,0,100,0,
-    83,0,41,3,78,122,8,98,117,105,108,116,45,105,110,41,
-    1,114,104,0,0,0,41,3,114,52,0,0,0,90,10,105,
-    115,95,98,117,105,108,116,105,110,114,79,0,0,0,41,4,
-    218,3,99,108,115,114,72,0,0,0,218,4,112,97,116,104,
-    218,6,116,97,114,103,101,116,114,10,0,0,0,114,10,0,
-    0,0,114,11,0,0,0,218,9,102,105,110,100,95,115,112,
-    101,99,185,2,0,0,115,10,0,0,0,0,2,8,1,4,
-    1,10,1,14,2,122,25,66,117,105,108,116,105,110,73,109,
-    112,111,114,116,101,114,46,102,105,110,100,95,115,112,101,99,
-    99,3,0,0,0,0,0,0,0,4,0,0,0,4,0,0,
-    0,67,0,0,0,115,30,0,0,0,124,0,160,0,124,1,
-    124,2,161,2,125,3,124,3,100,1,107,9,114,26,124,3,
-    106,1,83,0,100,1,83,0,41,2,122,175,70,105,110,100,
-    32,116,104,101,32,98,117,105,108,116,45,105,110,32,109,111,
-    100,117,108,101,46,10,10,32,32,32,32,32,32,32,32,73,
-    102,32,39,112,97,116,104,39,32,105,115,32,101,118,101,114,
-    32,115,112,101,99,105,102,105,101,100,32,116,104,101,110,32,
-    116,104,101,32,115,101,97,114,99,104,32,105,115,32,99,111,
-    110,115,105,100,101,114,101,100,32,97,32,102,97,105,108,117,
-    114,101,46,10,10,32,32,32,32,32,32,32,32,84,104,105,
-    115,32,109,101,116,104,111,100,32,105,115,32,100,101,112,114,
-    101,99,97,116,101,100,46,32,32,85,115,101,32,102,105,110,
-    100,95,115,112,101,99,40,41,32,105,110,115,116,101,97,100,
-    46,10,10,32,32,32,32,32,32,32,32,78,41,2,114,146,
-    0,0,0,114,94,0,0,0,41,4,114,143,0,0,0,114,
-    72,0,0,0,114,144,0,0,0,114,83,0,0,0,114,10,
-    0,0,0,114,10,0,0,0,114,11,0,0,0,218,11,102,
-    105,110,100,95,109,111,100,117,108,101,194,2,0,0,115,4,
-    0,0,0,0,9,12,1,122,27,66,117,105,108,116,105,110,
-    73,109,112,111,114,116,101,114,46,102,105,110,100,95,109,111,
-    100,117,108,101,99,2,0,0,0,0,0,0,0,2,0,0,
-    0,4,0,0,0,67,0,0,0,115,46,0,0,0,124,1,
-    106,0,116,1,106,2,107,7,114,34,116,3,100,1,160,4,
-    124,1,106,0,161,1,124,1,106,0,100,2,141,2,130,1,
-    116,5,116,6,106,7,124,1,131,2,83,0,41,3,122,24,
-    67,114,101,97,116,101,32,97,32,98,117,105,108,116,45,105,
-    110,32,109,111,100,117,108,101,122,29,123,33,114,125,32,105,
-    115,32,110,111,116,32,97,32,98,117,105,108,116,45,105,110,
-    32,109,111,100,117,108,101,41,1,114,15,0,0,0,41,8,
-    114,15,0,0,0,114,14,0,0,0,114,70,0,0,0,114,
-    71,0,0,0,114,38,0,0,0,114,59,0,0,0,114,52,
-    0,0,0,90,14,99,114,101,97,116,101,95,98,117,105,108,
-    116,105,110,41,2,114,26,0,0,0,114,83,0,0,0,114,
-    10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,135,
-    0,0,0,206,2,0,0,115,8,0,0,0,0,3,12,1,
-    12,1,10,1,122,29,66,117,105,108,116,105,110,73,109,112,
-    111,114,116,101,114,46,99,114,101,97,116,101,95,109,111,100,
-    117,108,101,99,2,0,0,0,0,0,0,0,2,0,0,0,
-    3,0,0,0,67,0,0,0,115,16,0,0,0,116,0,116,
-    1,106,2,124,1,131,2,1,0,100,1,83,0,41,2,122,
-    22,69,120,101,99,32,97,32,98,117,105,108,116,45,105,110,
-    32,109,111,100,117,108,101,78,41,3,114,59,0,0,0,114,
-    52,0,0,0,90,12,101,120,101,99,95,98,117,105,108,116,
-    105,110,41,2,114,26,0,0,0,114,84,0,0,0,114,10,
-    0,0,0,114,10,0,0,0,114,11,0,0,0,114,136,0,
-    0,0,214,2,0,0,115,2,0,0,0,0,3,122,27,66,
-    117,105,108,116,105,110,73,109,112,111,114,116,101,114,46,101,
-    120,101,99,95,109,111,100,117,108,101,99,2,0,0,0,0,
-    0,0,0,2,0,0,0,1,0,0,0,67,0,0,0,115,
-    4,0,0,0,100,1,83,0,41,2,122,57,82,101,116,117,
-    114,110,32,78,111,110,101,32,97,115,32,98,117,105,108,116,
-    45,105,110,32,109,111,100,117,108,101,115,32,100,111,32,110,
-    111,116,32,104,97,118,101,32,99,111,100,101,32,111,98,106,
-    101,99,116,115,46,78,114,10,0,0,0,41,2,114,143,0,
-    0,0,114,72,0,0,0,114,10,0,0,0,114,10,0,0,
-    0,114,11,0,0,0,218,8,103,101,116,95,99,111,100,101,
-    219,2,0,0,115,2,0,0,0,0,4,122,24,66,117,105,
-    108,116,105,110,73,109,112,111,114,116,101,114,46,103,101,116,
-    95,99,111,100,101,99,2,0,0,0,0,0,0,0,2,0,
-    0,0,1,0,0,0,67,0,0,0,115,4,0,0,0,100,
-    1,83,0,41,2,122,56,82,101,116,117,114,110,32,78,111,
-    110,101,32,97,115,32,98,117,105,108,116,45,105,110,32,109,
-    111,100,117,108,101,115,32,100,111,32,110,111,116,32,104,97,
-    118,101,32,115,111,117,114,99,101,32,99,111,100,101,46,78,
-    114,10,0,0,0,41,2,114,143,0,0,0,114,72,0,0,
-    0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
-    218,10,103,101,116,95,115,111,117,114,99,101,225,2,0,0,
-    115,2,0,0,0,0,4,122,26,66,117,105,108,116,105,110,
-    73,109,112,111,114,116,101,114,46,103,101,116,95,115,111,117,
-    114,99,101,99,2,0,0,0,0,0,0,0,2,0,0,0,
-    1,0,0,0,67,0,0,0,115,4,0,0,0,100,1,83,
-    0,41,2,122,52,82,101,116,117,114,110,32,70,97,108,115,
-    101,32,97,115,32,98,117,105,108,116,45,105,110,32,109,111,
-    100,117,108,101,115,32,97,114,101,32,110,101,118,101,114,32,
-    112,97,99,107,97,103,101,115,46,70,114,10,0,0,0,41,
-    2,114,143,0,0,0,114,72,0,0,0,114,10,0,0,0,
-    114,10,0,0,0,114,11,0,0,0,114,106,0,0,0,231,
-    2,0,0,115,2,0,0,0,0,4,122,26,66,117,105,108,
-    116,105,110,73,109,112,111,114,116,101,114,46,105,115,95,112,
-    97,99,107,97,103,101,41,2,78,78,41,1,78,41,17,114,
-    1,0,0,0,114,0,0,0,0,114,2,0,0,0,114,3,
-    0,0,0,218,12,115,116,97,116,105,99,109,101,116,104,111,
-    100,114,87,0,0,0,218,11,99,108,97,115,115,109,101,116,
-    104,111,100,114,146,0,0,0,114,147,0,0,0,114,135,0,
-    0,0,114,136,0,0,0,114,75,0,0,0,114,148,0,0,
-    0,114,149,0,0,0,114,106,0,0,0,114,85,0,0,0,
-    114,138,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
-    10,0,0,0,114,11,0,0,0,114,142,0,0,0,167,2,
-    0,0,115,28,0,0,0,12,9,12,9,2,1,12,8,2,
-    1,12,11,12,8,12,5,2,1,14,5,2,1,14,5,2,
-    1,14,5,114,142,0,0,0,99,0,0,0,0,0,0,0,
-    0,0,0,0,0,4,0,0,0,64,0,0,0,115,140,0,
-    0,0,101,0,90,1,100,0,90,2,100,1,90,3,101,4,
-    100,2,100,3,132,0,131,1,90,5,101,6,100,21,100,5,
-    100,6,132,1,131,1,90,7,101,6,100,22,100,7,100,8,
-    132,1,131,1,90,8,101,6,100,9,100,10,132,0,131,1,
-    90,9,101,4,100,11,100,12,132,0,131,1,90,10,101,6,
-    100,13,100,14,132,0,131,1,90,11,101,6,101,12,100,15,
-    100,16,132,0,131,1,131,1,90,13,101,6,101,12,100,17,
-    100,18,132,0,131,1,131,1,90,14,101,6,101,12,100,19,
-    100,20,132,0,131,1,131,1,90,15,100,4,83,0,41,23,
-    218,14,70,114,111,122,101,110,73,109,112,111,114,116,101,114,
-    122,142,77,101,116,97,32,112,97,116,104,32,105,109,112,111,
-    114,116,32,102,111,114,32,102,114,111,122,101,110,32,109,111,
-    100,117,108,101,115,46,10,10,32,32,32,32,65,108,108,32,
-    109,101,116,104,111,100,115,32,97,114,101,32,101,105,116,104,
-    101,114,32,99,108,97,115,115,32,111,114,32,115,116,97,116,
-    105,99,32,109,101,116,104,111,100,115,32,116,111,32,97,118,
-    111,105,100,32,116,104,101,32,110,101,101,100,32,116,111,10,
-    32,32,32,32,105,110,115,116,97,110,116,105,97,116,101,32,
-    116,104,101,32,99,108,97,115,115,46,10,10,32,32,32,32,
-    99,1,0,0,0,0,0,0,0,1,0,0,0,3,0,0,
-    0,67,0,0,0,115,12,0,0,0,100,1,160,0,124,0,
-    106,1,161,1,83,0,41,2,122,115,82,101,116,117,114,110,
-    32,114,101,112,114,32,102,111,114,32,116,104,101,32,109,111,
-    100,117,108,101,46,10,10,32,32,32,32,32,32,32,32,84,
-    104,101,32,109,101,116,104,111,100,32,105,115,32,100,101,112,
-    114,101,99,97,116,101,100,46,32,32,84,104,101,32,105,109,
-    112,111,114,116,32,109,97,99,104,105,110,101,114,121,32,100,
-    111,101,115,32,116,104,101,32,106,111,98,32,105,116,115,101,
-    108,102,46,10,10,32,32,32,32,32,32,32,32,122,22,60,
-    109,111,100,117,108,101,32,123,33,114,125,32,40,102,114,111,
-    122,101,110,41,62,41,2,114,38,0,0,0,114,1,0,0,
-    0,41,1,218,1,109,114,10,0,0,0,114,10,0,0,0,
-    114,11,0,0,0,114,87,0,0,0,249,2,0,0,115,2,
-    0,0,0,0,7,122,26,70,114,111,122,101,110,73,109,112,
-    111,114,116,101,114,46,109,111,100,117,108,101,95,114,101,112,
-    114,78,99,4,0,0,0,0,0,0,0,4,0,0,0,5,
-    0,0,0,67,0,0,0,115,32,0,0,0,116,0,160,1,
-    124,1,161,1,114,24,116,2,124,1,124,0,100,1,100,2,
-    141,3,83,0,100,0,83,0,100,0,83,0,41,3,78,90,
-    6,102,114,111,122,101,110,41,1,114,104,0,0,0,41,3,
-    114,52,0,0,0,114,76,0,0,0,114,79,0,0,0,41,
-    4,114,143,0,0,0,114,72,0,0,0,114,144,0,0,0,
-    114,145,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
-    11,0,0,0,114,146,0,0,0,2,3,0,0,115,6,0,
-    0,0,0,2,10,1,14,2,122,24,70,114,111,122,101,110,
-    73,109,112,111,114,116,101,114,46,102,105,110,100,95,115,112,
-    101,99,99,3,0,0,0,0,0,0,0,3,0,0,0,3,
-    0,0,0,67,0,0,0,115,18,0,0,0,116,0,160,1,
-    124,1,161,1,114,14,124,0,83,0,100,1,83,0,41,2,
-    122,93,70,105,110,100,32,97,32,102,114,111,122,101,110,32,
-    109,111,100,117,108,101,46,10,10,32,32,32,32,32,32,32,
-    32,84,104,105,115,32,109,101,116,104,111,100,32,105,115,32,
-    100,101,112,114,101,99,97,116,101,100,46,32,32,85,115,101,
-    32,102,105,110,100,95,115,112,101,99,40,41,32,105,110,115,
-    116,101,97,100,46,10,10,32,32,32,32,32,32,32,32,78,
-    41,2,114,52,0,0,0,114,76,0,0,0,41,3,114,143,
-    0,0,0,114,72,0,0,0,114,144,0,0,0,114,10,0,
-    0,0,114,10,0,0,0,114,11,0,0,0,114,147,0,0,
-    0,9,3,0,0,115,2,0,0,0,0,7,122,26,70,114,
-    111,122,101,110,73,109,112,111,114,116,101,114,46,102,105,110,
-    100,95,109,111,100,117,108,101,99,2,0,0,0,0,0,0,
-    0,2,0,0,0,1,0,0,0,67,0,0,0,115,4,0,
-    0,0,100,1,83,0,41,2,122,42,85,115,101,32,100,101,
-    102,97,117,108,116,32,115,101,109,97,110,116,105,99,115,32,
-    102,111,114,32,109,111,100,117,108,101,32,99,114,101,97,116,
-    105,111,110,46,78,114,10,0,0,0,41,2,114,143,0,0,
-    0,114,83,0,0,0,114,10,0,0,0,114,10,0,0,0,
-    114,11,0,0,0,114,135,0,0,0,18,3,0,0,115,0,
-    0,0,0,122,28,70,114,111,122,101,110,73,109,112,111,114,
-    116,101,114,46,99,114,101,97,116,101,95,109,111,100,117,108,
-    101,99,1,0,0,0,0,0,0,0,3,0,0,0,4,0,
-    0,0,67,0,0,0,115,64,0,0,0,124,0,106,0,106,
-    1,125,1,116,2,160,3,124,1,161,1,115,36,116,4,100,
-    1,160,5,124,1,161,1,124,1,100,2,141,2,130,1,116,
-    6,116,2,106,7,124,1,131,2,125,2,116,8,124,2,124,
-    0,106,9,131,2,1,0,100,0,83,0,41,3,78,122,27,
-    123,33,114,125,32,105,115,32,110,111,116,32,97,32,102,114,
-    111,122,101,110,32,109,111,100,117,108,101,41,1,114,15,0,
-    0,0,41,10,114,90,0,0,0,114,15,0,0,0,114,52,
-    0,0,0,114,76,0,0,0,114,71,0,0,0,114,38,0,
-    0,0,114,59,0,0,0,218,17,103,101,116,95,102,114,111,
-    122,101,110,95,111,98,106,101,99,116,218,4,101,120,101,99,
-    114,7,0,0,0,41,3,114,84,0,0,0,114,15,0,0,
-    0,218,4,99,111,100,101,114,10,0,0,0,114,10,0,0,
-    0,114,11,0,0,0,114,136,0,0,0,22,3,0,0,115,
-    12,0,0,0,0,2,8,1,10,1,10,1,8,1,12,1,
-    122,26,70,114,111,122,101,110,73,109,112,111,114,116,101,114,
-    46,101,120,101,99,95,109,111,100,117,108,101,99,2,0,0,
-    0,0,0,0,0,2,0,0,0,3,0,0,0,67,0,0,
-    0,115,10,0,0,0,116,0,124,0,124,1,131,2,83,0,
-    41,1,122,95,76,111,97,100,32,97,32,102,114,111,122,101,
-    110,32,109,111,100,117,108,101,46,10,10,32,32,32,32,32,
-    32,32,32,84,104,105,115,32,109,101,116,104,111,100,32,105,
-    115,32,100,101,112,114,101,99,97,116,101,100,46,32,32,85,
-    115,101,32,101,120,101,99,95,109,111,100,117,108,101,40,41,
-    32,105,110,115,116,101,97,100,46,10,10,32,32,32,32,32,
-    32,32,32,41,1,114,85,0,0,0,41,2,114,143,0,0,
-    0,114,72,0,0,0,114,10,0,0,0,114,10,0,0,0,
-    114,11,0,0,0,114,138,0,0,0,31,3,0,0,115,2,
-    0,0,0,0,7,122,26,70,114,111,122,101,110,73,109,112,
-    111,114,116,101,114,46,108,111,97,100,95,109,111,100,117,108,
-    101,99,2,0,0,0,0,0,0,0,2,0,0,0,3,0,
-    0,0,67,0,0,0,115,10,0,0,0,116,0,160,1,124,
-    1,161,1,83,0,41,1,122,45,82,101,116,117,114,110,32,
-    116,104,101,32,99,111,100,101,32,111,98,106,101,99,116,32,
-    102,111,114,32,116,104,101,32,102,114,111,122,101,110,32,109,
-    111,100,117,108,101,46,41,2,114,52,0,0,0,114,154,0,
-    0,0,41,2,114,143,0,0,0,114,72,0,0,0,114,10,
-    0,0,0,114,10,0,0,0,114,11,0,0,0,114,148,0,
-    0,0,40,3,0,0,115,2,0,0,0,0,4,122,23,70,
-    114,111,122,101,110,73,109,112,111,114,116,101,114,46,103,101,
-    116,95,99,111,100,101,99,2,0,0,0,0,0,0,0,2,
-    0,0,0,1,0,0,0,67,0,0,0,115,4,0,0,0,
-    100,1,83,0,41,2,122,54,82,101,116,117,114,110,32,78,
-    111,110,101,32,97,115,32,102,114,111,122,101,110,32,109,111,
-    100,117,108,101,115,32,100,111,32,110,111,116,32,104,97,118,
-    101,32,115,111,117,114,99,101,32,99,111,100,101,46,78,114,
-    10,0,0,0,41,2,114,143,0,0,0,114,72,0,0,0,
-    114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,
-    149,0,0,0,46,3,0,0,115,2,0,0,0,0,4,122,
-    25,70,114,111,122,101,110,73,109,112,111,114,116,101,114,46,
-    103,101,116,95,115,111,117,114,99,101,99,2,0,0,0,0,
-    0,0,0,2,0,0,0,3,0,0,0,67,0,0,0,115,
-    10,0,0,0,116,0,160,1,124,1,161,1,83,0,41,1,
-    122,46,82,101,116,117,114,110,32,84,114,117,101,32,105,102,
-    32,116,104,101,32,102,114,111,122,101,110,32,109,111,100,117,
-    108,101,32,105,115,32,97,32,112,97,99,107,97,103,101,46,
-    41,2,114,52,0,0,0,90,17,105,115,95,102,114,111,122,
-    101,110,95,112,97,99,107,97,103,101,41,2,114,143,0,0,
-    0,114,72,0,0,0,114,10,0,0,0,114,10,0,0,0,
-    114,11,0,0,0,114,106,0,0,0,52,3,0,0,115,2,
-    0,0,0,0,4,122,25,70,114,111,122,101,110,73,109,112,
-    111,114,116,101,114,46,105,115,95,112,97,99,107,97,103,101,
-    41,2,78,78,41,1,78,41,16,114,1,0,0,0,114,0,
-    0,0,0,114,2,0,0,0,114,3,0,0,0,114,150,0,
-    0,0,114,87,0,0,0,114,151,0,0,0,114,146,0,0,
-    0,114,147,0,0,0,114,135,0,0,0,114,136,0,0,0,
-    114,138,0,0,0,114,78,0,0,0,114,148,0,0,0,114,
-    149,0,0,0,114,106,0,0,0,114,10,0,0,0,114,10,
-    0,0,0,114,10,0,0,0,114,11,0,0,0,114,152,0,
-    0,0,240,2,0,0,115,28,0,0,0,12,9,12,9,2,
-    1,12,6,2,1,12,8,12,4,12,9,12,9,2,1,14,
-    5,2,1,14,5,2,1,114,152,0,0,0,99,0,0,0,
-    0,0,0,0,0,0,0,0,0,2,0,0,0,64,0,0,
-    0,115,32,0,0,0,101,0,90,1,100,0,90,2,100,1,
-    90,3,100,2,100,3,132,0,90,4,100,4,100,5,132,0,
-    90,5,100,6,83,0,41,7,218,18,95,73,109,112,111,114,
-    116,76,111,99,107,67,111,110,116,101,120,116,122,36,67,111,
-    110,116,101,120,116,32,109,97,110,97,103,101,114,32,102,111,
-    114,32,116,104,101,32,105,109,112,111,114,116,32,108,111,99,
-    107,46,99,1,0,0,0,0,0,0,0,1,0,0,0,2,
-    0,0,0,67,0,0,0,115,12,0,0,0,116,0,160,1,
-    161,0,1,0,100,1,83,0,41,2,122,24,65,99,113,117,
-    105,114,101,32,116,104,101,32,105,109,112,111,114,116,32,108,
-    111,99,107,46,78,41,2,114,52,0,0,0,114,53,0,0,
-    0,41,1,114,26,0,0,0,114,10,0,0,0,114,10,0,
-    0,0,114,11,0,0,0,114,46,0,0,0,65,3,0,0,
-    115,2,0,0,0,0,2,122,28,95,73,109,112,111,114,116,
-    76,111,99,107,67,111,110,116,101,120,116,46,95,95,101,110,
-    116,101,114,95,95,99,4,0,0,0,0,0,0,0,4,0,
-    0,0,2,0,0,0,67,0,0,0,115,12,0,0,0,116,
-    0,160,1,161,0,1,0,100,1,83,0,41,2,122,60,82,
-    101,108,101,97,115,101,32,116,104,101,32,105,109,112,111,114,
-    116,32,108,111,99,107,32,114,101,103,97,114,100,108,101,115,
-    115,32,111,102,32,97,110,121,32,114,97,105,115,101,100,32,
-    101,120,99,101,112,116,105,111,110,115,46,78,41,2,114,52,
-    0,0,0,114,56,0,0,0,41,4,114,26,0,0,0,90,
-    8,101,120,99,95,116,121,112,101,90,9,101,120,99,95,118,
-    97,108,117,101,90,13,101,120,99,95,116,114,97,99,101,98,
-    97,99,107,114,10,0,0,0,114,10,0,0,0,114,11,0,
-    0,0,114,48,0,0,0,69,3,0,0,115,2,0,0,0,
-    0,2,122,27,95,73,109,112,111,114,116,76,111,99,107,67,
-    111,110,116,101,120,116,46,95,95,101,120,105,116,95,95,78,
-    41,6,114,1,0,0,0,114,0,0,0,0,114,2,0,0,
-    0,114,3,0,0,0,114,46,0,0,0,114,48,0,0,0,
-    114,10,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
-    11,0,0,0,114,157,0,0,0,61,3,0,0,115,4,0,
-    0,0,12,4,8,4,114,157,0,0,0,99,3,0,0,0,
-    0,0,0,0,5,0,0,0,5,0,0,0,67,0,0,0,
-    115,64,0,0,0,124,1,160,0,100,1,124,2,100,2,24,
-    0,161,2,125,3,116,1,124,3,131,1,124,2,107,0,114,
-    36,116,2,100,3,131,1,130,1,124,3,100,4,25,0,125,
-    4,124,0,114,60,100,5,160,3,124,4,124,0,161,2,83,
-    0,124,4,83,0,41,6,122,50,82,101,115,111,108,118,101,
-    32,97,32,114,101,108,97,116,105,118,101,32,109,111,100,117,
-    108,101,32,110,97,109,101,32,116,111,32,97,110,32,97,98,
-    115,111,108,117,116,101,32,111,110,101,46,114,118,0,0,0,
-    114,33,0,0,0,122,50,97,116,116,101,109,112,116,101,100,
-    32,114,101,108,97,116,105,118,101,32,105,109,112,111,114,116,
-    32,98,101,121,111,110,100,32,116,111,112,45,108,101,118,101,
-    108,32,112,97,99,107,97,103,101,114,19,0,0,0,122,5,
-    123,125,46,123,125,41,4,218,6,114,115,112,108,105,116,218,
-    3,108,101,110,218,10,86,97,108,117,101,69,114,114,111,114,
-    114,38,0,0,0,41,5,114,15,0,0,0,218,7,112,97,
-    99,107,97,103,101,218,5,108,101,118,101,108,90,4,98,105,
-    116,115,90,4,98,97,115,101,114,10,0,0,0,114,10,0,
-    0,0,114,11,0,0,0,218,13,95,114,101,115,111,108,118,
-    101,95,110,97,109,101,74,3,0,0,115,10,0,0,0,0,
-    2,16,1,12,1,8,1,8,1,114,163,0,0,0,99,3,
-    0,0,0,0,0,0,0,4,0,0,0,4,0,0,0,67,
-    0,0,0,115,34,0,0,0,124,0,160,0,124,1,124,2,
-    161,2,125,3,124,3,100,0,107,8,114,24,100,0,83,0,
-    116,1,124,1,124,3,131,2,83,0,41,1,78,41,2,114,
-    147,0,0,0,114,79,0,0,0,41,4,218,6,102,105,110,
-    100,101,114,114,15,0,0,0,114,144,0,0,0,114,94,0,
+    32,32,122,22,60,109,111,100,117,108,101,32,123,33,114,125,
+    32,40,102,114,111,122,101,110,41,62,41,2,114,38,0,0,
+    0,114,1,0,0,0,41,1,218,1,109,114,10,0,0,0,
+    114,10,0,0,0,114,11,0,0,0,114,87,0,0,0,3,
+    3,0,0,115,2,0,0,0,0,7,122,26,70,114,111,122,
+    101,110,73,109,112,111,114,116,101,114,46,109,111,100,117,108,
+    101,95,114,101,112,114,78,99,4,0,0,0,0,0,0,0,
+    4,0,0,0,5,0,0,0,67,0,0,0,115,32,0,0,
+    0,116,0,160,1,124,1,161,1,114,24,116,2,124,1,124,
+    0,100,1,100,2,141,3,83,0,100,0,83,0,100,0,83,
+    0,41,3,78,90,6,102,114,111,122,101,110,41,1,114,104,
+    0,0,0,41,3,114,49,0,0,0,114,76,0,0,0,114,
+    79,0,0,0,41,4,114,143,0,0,0,114,72,0,0,0,
+    114,144,0,0,0,114,145,0,0,0,114,10,0,0,0,114,
+    10,0,0,0,114,11,0,0,0,114,146,0,0,0,12,3,
+    0,0,115,6,0,0,0,0,2,10,1,14,2,122,24,70,
+    114,111,122,101,110,73,109,112,111,114,116,101,114,46,102,105,
+    110,100,95,115,112,101,99,99,3,0,0,0,0,0,0,0,
+    3,0,0,0,3,0,0,0,67,0,0,0,115,18,0,0,
+    0,116,0,160,1,124,1,161,1,114,14,124,0,83,0,100,
+    1,83,0,41,2,122,93,70,105,110,100,32,97,32,102,114,
+    111,122,101,110,32,109,111,100,117,108,101,46,10,10,32,32,
+    32,32,32,32,32,32,84,104,105,115,32,109,101,116,104,111,
+    100,32,105,115,32,100,101,112,114,101,99,97,116,101,100,46,
+    32,32,85,115,101,32,102,105,110,100,95,115,112,101,99,40,
+    41,32,105,110,115,116,101,97,100,46,10,10,32,32,32,32,
+    32,32,32,32,78,41,2,114,49,0,0,0,114,76,0,0,
+    0,41,3,114,143,0,0,0,114,72,0,0,0,114,144,0,
     0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,
-    0,218,17,95,102,105,110,100,95,115,112,101,99,95,108,101,
-    103,97,99,121,83,3,0,0,115,8,0,0,0,0,3,12,
-    1,8,1,4,1,114,165,0,0,0,99,3,0,0,0,0,
-    0,0,0,10,0,0,0,27,0,0,0,67,0,0,0,115,
-    240,0,0,0,116,0,106,1,125,3,124,3,100,1,107,8,
-    114,22,116,2,100,2,131,1,130,1,124,3,115,38,116,3,
-    160,4,100,3,116,5,161,2,1,0,124,0,116,0,106,6,
-    107,6,125,4,120,186,124,3,68,0,93,174,125,5,116,7,
-    131,0,143,72,1,0,121,10,124,5,106,8,125,6,87,0,
-    110,42,4,0,116,9,107,10,114,118,1,0,1,0,1,0,
-    116,10,124,5,124,0,124,1,131,3,125,7,124,7,100,1,
-    107,8,114,114,119,54,89,0,110,14,88,0,124,6,124,0,
-    124,1,124,2,131,3,125,7,87,0,100,1,81,0,82,0,
-    88,0,124,7,100,1,107,9,114,54,124,4,115,224,124,0,
-    116,0,106,6,107,6,114,224,116,0,106,6,124,0,25,0,
-    125,8,121,10,124,8,106,11,125,9,87,0,110,20,4,0,
-    116,9,107,10,114,204,1,0,1,0,1,0,124,7,83,0,
-    88,0,124,9,100,1,107,8,114,218,124,7,83,0,124,9,
-    83,0,113,54,124,7,83,0,113,54,87,0,100,1,83,0,
-    100,1,83,0,41,4,122,21,70,105,110,100,32,97,32,109,
-    111,100,117,108,101,39,115,32,115,112,101,99,46,78,122,53,
-    115,121,115,46,109,101,116,97,95,112,97,116,104,32,105,115,
-    32,78,111,110,101,44,32,80,121,116,104,111,110,32,105,115,
-    32,108,105,107,101,108,121,32,115,104,117,116,116,105,110,103,
-    32,100,111,119,110,122,22,115,121,115,46,109,101,116,97,95,
-    112,97,116,104,32,105,115,32,101,109,112,116,121,41,12,114,
-    14,0,0,0,218,9,109,101,116,97,95,112,97,116,104,114,
-    71,0,0,0,218,9,95,119,97,114,110,105,110,103,115,218,
-    4,119,97,114,110,218,13,73,109,112,111,114,116,87,97,114,
-    110,105,110,103,114,80,0,0,0,114,157,0,0,0,114,146,
-    0,0,0,114,91,0,0,0,114,165,0,0,0,114,90,0,
-    0,0,41,10,114,15,0,0,0,114,144,0,0,0,114,145,
-    0,0,0,114,166,0,0,0,90,9,105,115,95,114,101,108,
-    111,97,100,114,164,0,0,0,114,146,0,0,0,114,83,0,
-    0,0,114,84,0,0,0,114,90,0,0,0,114,10,0,0,
-    0,114,10,0,0,0,114,11,0,0,0,218,10,95,102,105,
-    110,100,95,115,112,101,99,92,3,0,0,115,54,0,0,0,
-    0,2,6,1,8,2,8,3,4,1,12,5,10,1,10,1,
-    8,1,2,1,10,1,14,1,12,1,8,1,8,2,22,1,
-    8,2,14,1,10,1,2,1,10,1,14,4,6,2,8,1,
-    4,2,6,2,8,2,114,170,0,0,0,99,3,0,0,0,
-    0,0,0,0,3,0,0,0,5,0,0,0,67,0,0,0,
-    115,108,0,0,0,116,0,124,0,116,1,131,2,115,28,116,
-    2,100,1,160,3,116,4,124,0,131,1,161,1,131,1,130,
-    1,124,2,100,2,107,0,114,44,116,5,100,3,131,1,130,
-    1,124,2,100,2,107,4,114,84,116,0,124,1,116,1,131,
-    2,115,72,116,2,100,4,131,1,130,1,110,12,124,1,115,
-    84,116,6,100,5,131,1,130,1,124,0,115,104,124,2,100,
-    2,107,2,114,104,116,5,100,6,131,1,130,1,100,7,83,
-    0,41,8,122,28,86,101,114,105,102,121,32,97,114,103,117,
-    109,101,110,116,115,32,97,114,101,32,34,115,97,110,101,34,
-    46,122,31,109,111,100,117,108,101,32,110,97,109,101,32,109,
-    117,115,116,32,98,101,32,115,116,114,44,32,110,111,116,32,
-    123,125,114,19,0,0,0,122,18,108,101,118,101,108,32,109,
-    117,115,116,32,98,101,32,62,61,32,48,122,31,95,95,112,
-    97,99,107,97,103,101,95,95,32,110,111,116,32,115,101,116,
-    32,116,111,32,97,32,115,116,114,105,110,103,122,54,97,116,
-    116,101,109,112,116,101,100,32,114,101,108,97,116,105,118,101,
-    32,105,109,112,111,114,116,32,119,105,116,104,32,110,111,32,
-    107,110,111,119,110,32,112,97,114,101,110,116,32,112,97,99,
-    107,97,103,101,122,17,69,109,112,116,121,32,109,111,100,117,
-    108,101,32,110,97,109,101,78,41,7,218,10,105,115,105,110,
-    115,116,97,110,99,101,218,3,115,116,114,218,9,84,121,112,
-    101,69,114,114,111,114,114,38,0,0,0,114,13,0,0,0,
-    114,160,0,0,0,114,71,0,0,0,41,3,114,15,0,0,
+    0,114,147,0,0,0,19,3,0,0,115,2,0,0,0,0,
+    7,122,26,70,114,111,122,101,110,73,109,112,111,114,116,101,
+    114,46,102,105,110,100,95,109,111,100,117,108,101,99,2,0,
+    0,0,0,0,0,0,2,0,0,0,1,0,0,0,67,0,
+    0,0,115,4,0,0,0,100,1,83,0,41,2,122,42,85,
+    115,101,32,100,101,102,97,117,108,116,32,115,101,109,97,110,
+    116,105,99,115,32,102,111,114,32,109,111,100,117,108,101,32,
+    99,114,101,97,116,105,111,110,46,78,114,10,0,0,0,41,
+    2,114,143,0,0,0,114,83,0,0,0,114,10,0,0,0,
+    114,10,0,0,0,114,11,0,0,0,114,135,0,0,0,28,
+    3,0,0,115,0,0,0,0,122,28,70,114,111,122,101,110,
+    73,109,112,111,114,116,101,114,46,99,114,101,97,116,101,95,
+    109,111,100,117,108,101,99,1,0,0,0,0,0,0,0,3,
+    0,0,0,4,0,0,0,67,0,0,0,115,64,0,0,0,
+    124,0,106,0,106,1,125,1,116,2,160,3,124,1,161,1,
+    115,36,116,4,100,1,160,5,124,1,161,1,124,1,100,2,
+    141,2,130,1,116,6,116,2,106,7,124,1,131,2,125,2,
+    116,8,124,2,124,0,106,9,131,2,1,0,100,0,83,0,
+    41,3,78,122,27,123,33,114,125,32,105,115,32,110,111,116,
+    32,97,32,102,114,111,122,101,110,32,109,111,100,117,108,101,
+    41,1,114,15,0,0,0,41,10,114,90,0,0,0,114,15,
+    0,0,0,114,49,0,0,0,114,76,0,0,0,114,71,0,
+    0,0,114,38,0,0,0,114,59,0,0,0,218,17,103,101,
+    116,95,102,114,111,122,101,110,95,111,98,106,101,99,116,218,
+    4,101,120,101,99,114,7,0,0,0,41,3,114,84,0,0,
+    0,114,15,0,0,0,218,4,99,111,100,101,114,10,0,0,
+    0,114,10,0,0,0,114,11,0,0,0,114,136,0,0,0,
+    32,3,0,0,115,12,0,0,0,0,2,8,1,10,1,10,
+    1,8,1,12,1,122,26,70,114,111,122,101,110,73,109,112,
+    111,114,116,101,114,46,101,120,101,99,95,109,111,100,117,108,
+    101,99,2,0,0,0,0,0,0,0,2,0,0,0,3,0,
+    0,0,67,0,0,0,115,10,0,0,0,116,0,124,0,124,
+    1,131,2,83,0,41,1,122,95,76,111,97,100,32,97,32,
+    102,114,111,122,101,110,32,109,111,100,117,108,101,46,10,10,
+    32,32,32,32,32,32,32,32,84,104,105,115,32,109,101,116,
+    104,111,100,32,105,115,32,100,101,112,114,101,99,97,116,101,
+    100,46,32,32,85,115,101,32,101,120,101,99,95,109,111,100,
+    117,108,101,40,41,32,105,110,115,116,101,97,100,46,10,10,
+    32,32,32,32,32,32,32,32,41,1,114,85,0,0,0,41,
+    2,114,143,0,0,0,114,72,0,0,0,114,10,0,0,0,
+    114,10,0,0,0,114,11,0,0,0,114,138,0,0,0,41,
+    3,0,0,115,2,0,0,0,0,7,122,26,70,114,111,122,
+    101,110,73,109,112,111,114,116,101,114,46,108,111,97,100,95,
+    109,111,100,117,108,101,99,2,0,0,0,0,0,0,0,2,
+    0,0,0,3,0,0,0,67,0,0,0,115,10,0,0,0,
+    116,0,160,1,124,1,161,1,83,0,41,1,122,45,82,101,
+    116,117,114,110,32,116,104,101,32,99,111,100,101,32,111,98,
+    106,101,99,116,32,102,111,114,32,116,104,101,32,102,114,111,
+    122,101,110,32,109,111,100,117,108,101,46,41,2,114,49,0,
+    0,0,114,154,0,0,0,41,2,114,143,0,0,0,114,72,
+    0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,
+    0,0,114,148,0,0,0,50,3,0,0,115,2,0,0,0,
+    0,4,122,23,70,114,111,122,101,110,73,109,112,111,114,116,
+    101,114,46,103,101,116,95,99,111,100,101,99,2,0,0,0,
+    0,0,0,0,2,0,0,0,1,0,0,0,67,0,0,0,
+    115,4,0,0,0,100,1,83,0,41,2,122,54,82,101,116,
+    117,114,110,32,78,111,110,101,32,97,115,32,102,114,111,122,
+    101,110,32,109,111,100,117,108,101,115,32,100,111,32,110,111,
+    116,32,104,97,118,101,32,115,111,117,114,99,101,32,99,111,
+    100,101,46,78,114,10,0,0,0,41,2,114,143,0,0,0,
+    114,72,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
+    11,0,0,0,114,149,0,0,0,56,3,0,0,115,2,0,
+    0,0,0,4,122,25,70,114,111,122,101,110,73,109,112,111,
+    114,116,101,114,46,103,101,116,95,115,111,117,114,99,101,99,
+    2,0,0,0,0,0,0,0,2,0,0,0,3,0,0,0,
+    67,0,0,0,115,10,0,0,0,116,0,160,1,124,1,161,
+    1,83,0,41,1,122,46,82,101,116,117,114,110,32,84,114,
+    117,101,32,105,102,32,116,104,101,32,102,114,111,122,101,110,
+    32,109,111,100,117,108,101,32,105,115,32,97,32,112,97,99,
+    107,97,103,101,46,41,2,114,49,0,0,0,90,17,105,115,
+    95,102,114,111,122,101,110,95,112,97,99,107,97,103,101,41,
+    2,114,143,0,0,0,114,72,0,0,0,114,10,0,0,0,
+    114,10,0,0,0,114,11,0,0,0,114,106,0,0,0,62,
+    3,0,0,115,2,0,0,0,0,4,122,25,70,114,111,122,
+    101,110,73,109,112,111,114,116,101,114,46,105,115,95,112,97,
+    99,107,97,103,101,41,2,78,78,41,1,78,41,16,114,1,
+    0,0,0,114,0,0,0,0,114,2,0,0,0,114,3,0,
+    0,0,114,150,0,0,0,114,87,0,0,0,114,151,0,0,
+    0,114,146,0,0,0,114,147,0,0,0,114,135,0,0,0,
+    114,136,0,0,0,114,138,0,0,0,114,78,0,0,0,114,
+    148,0,0,0,114,149,0,0,0,114,106,0,0,0,114,10,
+    0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,
+    0,0,114,152,0,0,0,250,2,0,0,115,28,0,0,0,
+    12,9,12,9,2,1,12,6,2,1,12,8,12,4,12,9,
+    12,9,2,1,14,5,2,1,14,5,2,1,114,152,0,0,
+    0,99,0,0,0,0,0,0,0,0,0,0,0,0,2,0,
+    0,0,64,0,0,0,115,32,0,0,0,101,0,90,1,100,
+    0,90,2,100,1,90,3,100,2,100,3,132,0,90,4,100,
+    4,100,5,132,0,90,5,100,6,83,0,41,7,218,18,95,
+    73,109,112,111,114,116,76,111,99,107,67,111,110,116,101,120,
+    116,122,36,67,111,110,116,101,120,116,32,109,97,110,97,103,
+    101,114,32,102,111,114,32,116,104,101,32,105,109,112,111,114,
+    116,32,108,111,99,107,46,99,1,0,0,0,0,0,0,0,
+    1,0,0,0,2,0,0,0,67,0,0,0,115,12,0,0,
+    0,116,0,160,1,161,0,1,0,100,1,83,0,41,2,122,
+    24,65,99,113,117,105,114,101,32,116,104,101,32,105,109,112,
+    111,114,116,32,108,111,99,107,46,78,41,2,114,49,0,0,
+    0,114,50,0,0,0,41,1,114,26,0,0,0,114,10,0,
+    0,0,114,10,0,0,0,114,11,0,0,0,114,46,0,0,
+    0,75,3,0,0,115,2,0,0,0,0,2,122,28,95,73,
+    109,112,111,114,116,76,111,99,107,67,111,110,116,101,120,116,
+    46,95,95,101,110,116,101,114,95,95,99,4,0,0,0,0,
+    0,0,0,4,0,0,0,2,0,0,0,67,0,0,0,115,
+    12,0,0,0,116,0,160,1,161,0,1,0,100,1,83,0,
+    41,2,122,60,82,101,108,101,97,115,101,32,116,104,101,32,
+    105,109,112,111,114,116,32,108,111,99,107,32,114,101,103,97,
+    114,100,108,101,115,115,32,111,102,32,97,110,121,32,114,97,
+    105,115,101,100,32,101,120,99,101,112,116,105,111,110,115,46,
+    78,41,2,114,49,0,0,0,114,52,0,0,0,41,4,114,
+    26,0,0,0,90,8,101,120,99,95,116,121,112,101,90,9,
+    101,120,99,95,118,97,108,117,101,90,13,101,120,99,95,116,
+    114,97,99,101,98,97,99,107,114,10,0,0,0,114,10,0,
+    0,0,114,11,0,0,0,114,48,0,0,0,79,3,0,0,
+    115,2,0,0,0,0,2,122,27,95,73,109,112,111,114,116,
+    76,111,99,107,67,111,110,116,101,120,116,46,95,95,101,120,
+    105,116,95,95,78,41,6,114,1,0,0,0,114,0,0,0,
+    0,114,2,0,0,0,114,3,0,0,0,114,46,0,0,0,
+    114,48,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
+    10,0,0,0,114,11,0,0,0,114,157,0,0,0,71,3,
+    0,0,115,4,0,0,0,12,4,8,4,114,157,0,0,0,
+    99,3,0,0,0,0,0,0,0,5,0,0,0,5,0,0,
+    0,67,0,0,0,115,64,0,0,0,124,1,160,0,100,1,
+    124,2,100,2,24,0,161,2,125,3,116,1,124,3,131,1,
+    124,2,107,0,114,36,116,2,100,3,131,1,130,1,124,3,
+    100,4,25,0,125,4,124,0,114,60,100,5,160,3,124,4,
+    124,0,161,2,83,0,124,4,83,0,41,6,122,50,82,101,
+    115,111,108,118,101,32,97,32,114,101,108,97,116,105,118,101,
+    32,109,111,100,117,108,101,32,110,97,109,101,32,116,111,32,
+    97,110,32,97,98,115,111,108,117,116,101,32,111,110,101,46,
+    114,118,0,0,0,114,33,0,0,0,122,50,97,116,116,101,
+    109,112,116,101,100,32,114,101,108,97,116,105,118,101,32,105,
+    109,112,111,114,116,32,98,101,121,111,110,100,32,116,111,112,
+    45,108,101,118,101,108,32,112,97,99,107,97,103,101,114,19,
+    0,0,0,122,5,123,125,46,123,125,41,4,218,6,114,115,
+    112,108,105,116,218,3,108,101,110,218,10,86,97,108,117,101,
+    69,114,114,111,114,114,38,0,0,0,41,5,114,15,0,0,
+    0,218,7,112,97,99,107,97,103,101,218,5,108,101,118,101,
+    108,90,4,98,105,116,115,90,4,98,97,115,101,114,10,0,
+    0,0,114,10,0,0,0,114,11,0,0,0,218,13,95,114,
+    101,115,111,108,118,101,95,110,97,109,101,84,3,0,0,115,
+    10,0,0,0,0,2,16,1,12,1,8,1,8,1,114,163,
+    0,0,0,99,3,0,0,0,0,0,0,0,4,0,0,0,
+    4,0,0,0,67,0,0,0,115,34,0,0,0,124,0,160,
+    0,124,1,124,2,161,2,125,3,124,3,100,0,107,8,114,
+    24,100,0,83,0,116,1,124,1,124,3,131,2,83,0,41,
+    1,78,41,2,114,147,0,0,0,114,79,0,0,0,41,4,
+    218,6,102,105,110,100,101,114,114,15,0,0,0,114,144,0,
+    0,0,114,94,0,0,0,114,10,0,0,0,114,10,0,0,
+    0,114,11,0,0,0,218,17,95,102,105,110,100,95,115,112,
+    101,99,95,108,101,103,97,99,121,93,3,0,0,115,8,0,
+    0,0,0,3,12,1,8,1,4,1,114,165,0,0,0,99,
+    3,0,0,0,0,0,0,0,10,0,0,0,27,0,0,0,
+    67,0,0,0,115,240,0,0,0,116,0,106,1,125,3,124,
+    3,100,1,107,8,114,22,116,2,100,2,131,1,130,1,124,
+    3,115,38,116,3,160,4,100,3,116,5,161,2,1,0,124,
+    0,116,0,106,6,107,6,125,4,120,186,124,3,68,0,93,
+    174,125,5,116,7,131,0,143,72,1,0,121,10,124,5,106,
+    8,125,6,87,0,110,42,4,0,116,9,107,10,114,118,1,
+    0,1,0,1,0,116,10,124,5,124,0,124,1,131,3,125,
+    7,124,7,100,1,107,8,114,114,119,54,89,0,110,14,88,
+    0,124,6,124,0,124,1,124,2,131,3,125,7,87,0,100,
+    1,81,0,82,0,88,0,124,7,100,1,107,9,114,54,124,
+    4,115,224,124,0,116,0,106,6,107,6,114,224,116,0,106,
+    6,124,0,25,0,125,8,121,10,124,8,106,11,125,9,87,
+    0,110,20,4,0,116,9,107,10,114,204,1,0,1,0,1,
+    0,124,7,83,0,88,0,124,9,100,1,107,8,114,218,124,
+    7,83,0,124,9,83,0,113,54,124,7,83,0,113,54,87,
+    0,100,1,83,0,100,1,83,0,41,4,122,21,70,105,110,
+    100,32,97,32,109,111,100,117,108,101,39,115,32,115,112,101,
+    99,46,78,122,53,115,121,115,46,109,101,116,97,95,112,97,
+    116,104,32,105,115,32,78,111,110,101,44,32,80,121,116,104,
+    111,110,32,105,115,32,108,105,107,101,108,121,32,115,104,117,
+    116,116,105,110,103,32,100,111,119,110,122,22,115,121,115,46,
+    109,101,116,97,95,112,97,116,104,32,105,115,32,101,109,112,
+    116,121,41,12,114,14,0,0,0,218,9,109,101,116,97,95,
+    112,97,116,104,114,71,0,0,0,218,9,95,119,97,114,110,
+    105,110,103,115,218,4,119,97,114,110,218,13,73,109,112,111,
+    114,116,87,97,114,110,105,110,103,114,80,0,0,0,114,157,
+    0,0,0,114,146,0,0,0,114,91,0,0,0,114,165,0,
+    0,0,114,90,0,0,0,41,10,114,15,0,0,0,114,144,
+    0,0,0,114,145,0,0,0,114,166,0,0,0,90,9,105,
+    115,95,114,101,108,111,97,100,114,164,0,0,0,114,146,0,
+    0,0,114,83,0,0,0,114,84,0,0,0,114,90,0,0,
+    0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
+    218,10,95,102,105,110,100,95,115,112,101,99,102,3,0,0,
+    115,54,0,0,0,0,2,6,1,8,2,8,3,4,1,12,
+    5,10,1,10,1,8,1,2,1,10,1,14,1,12,1,8,
+    1,8,2,22,1,8,2,14,1,10,1,2,1,10,1,14,
+    4,6,2,8,1,4,2,6,2,8,2,114,170,0,0,0,
+    99,3,0,0,0,0,0,0,0,3,0,0,0,5,0,0,
+    0,67,0,0,0,115,108,0,0,0,116,0,124,0,116,1,
+    131,2,115,28,116,2,100,1,160,3,116,4,124,0,131,1,
+    161,1,131,1,130,1,124,2,100,2,107,0,114,44,116,5,
+    100,3,131,1,130,1,124,2,100,2,107,4,114,84,116,0,
+    124,1,116,1,131,2,115,72,116,2,100,4,131,1,130,1,
+    110,12,124,1,115,84,116,6,100,5,131,1,130,1,124,0,
+    115,104,124,2,100,2,107,2,114,104,116,5,100,6,131,1,
+    130,1,100,7,83,0,41,8,122,28,86,101,114,105,102,121,
+    32,97,114,103,117,109,101,110,116,115,32,97,114,101,32,34,
+    115,97,110,101,34,46,122,31,109,111,100,117,108,101,32,110,
+    97,109,101,32,109,117,115,116,32,98,101,32,115,116,114,44,
+    32,110,111,116,32,123,125,114,19,0,0,0,122,18,108,101,
+    118,101,108,32,109,117,115,116,32,98,101,32,62,61,32,48,
+    122,31,95,95,112,97,99,107,97,103,101,95,95,32,110,111,
+    116,32,115,101,116,32,116,111,32,97,32,115,116,114,105,110,
+    103,122,54,97,116,116,101,109,112,116,101,100,32,114,101,108,
+    97,116,105,118,101,32,105,109,112,111,114,116,32,119,105,116,
+    104,32,110,111,32,107,110,111,119,110,32,112,97,114,101,110,
+    116,32,112,97,99,107,97,103,101,122,17,69,109,112,116,121,
+    32,109,111,100,117,108,101,32,110,97,109,101,78,41,7,218,
+    10,105,115,105,110,115,116,97,110,99,101,218,3,115,116,114,
+    218,9,84,121,112,101,69,114,114,111,114,114,38,0,0,0,
+    114,13,0,0,0,114,160,0,0,0,114,71,0,0,0,41,
+    3,114,15,0,0,0,114,161,0,0,0,114,162,0,0,0,
+    114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,
+    13,95,115,97,110,105,116,121,95,99,104,101,99,107,149,3,
+    0,0,115,22,0,0,0,0,2,10,1,18,1,8,1,8,
+    1,8,1,10,1,10,1,4,1,8,2,12,1,114,174,0,
+    0,0,122,16,78,111,32,109,111,100,117,108,101,32,110,97,
+    109,101,100,32,122,4,123,33,114,125,99,2,0,0,0,0,
+    0,0,0,8,0,0,0,13,0,0,0,67,0,0,0,115,
+    220,0,0,0,100,0,125,2,124,0,160,0,100,1,161,1,
+    100,2,25,0,125,3,124,3,114,134,124,3,116,1,106,2,
+    107,7,114,42,116,3,124,1,124,3,131,2,1,0,124,0,
+    116,1,106,2,107,6,114,62,116,1,106,2,124,0,25,0,
+    83,0,116,1,106,2,124,3,25,0,125,4,121,10,124,4,
+    106,4,125,2,87,0,110,50,4,0,116,5,107,10,114,132,
+    1,0,1,0,1,0,116,6,100,3,23,0,160,7,124,0,
+    124,3,161,2,125,5,116,8,124,5,124,0,100,4,141,2,
+    100,0,130,2,89,0,110,2,88,0,116,9,124,0,124,2,
+    131,2,125,6,124,6,100,0,107,8,114,172,116,8,116,6,
+    160,7,124,0,161,1,124,0,100,4,141,2,130,1,110,8,
+    116,10,124,6,131,1,125,7,124,3,114,216,116,1,106,2,
+    124,3,25,0,125,4,116,11,124,4,124,0,160,0,100,1,
+    161,1,100,5,25,0,124,7,131,3,1,0,124,7,83,0,
+    41,6,78,114,118,0,0,0,114,19,0,0,0,122,23,59,
+    32,123,33,114,125,32,105,115,32,110,111,116,32,97,32,112,
+    97,99,107,97,103,101,41,1,114,15,0,0,0,233,2,0,
+    0,0,41,12,114,119,0,0,0,114,14,0,0,0,114,80,
+    0,0,0,114,59,0,0,0,114,128,0,0,0,114,91,0,
+    0,0,218,8,95,69,82,82,95,77,83,71,114,38,0,0,
+    0,218,19,77,111,100,117,108,101,78,111,116,70,111,117,110,
+    100,69,114,114,111,114,114,170,0,0,0,114,141,0,0,0,
+    114,5,0,0,0,41,8,114,15,0,0,0,218,7,105,109,
+    112,111,114,116,95,114,144,0,0,0,114,120,0,0,0,90,
+    13,112,97,114,101,110,116,95,109,111,100,117,108,101,114,139,
+    0,0,0,114,83,0,0,0,114,84,0,0,0,114,10,0,
+    0,0,114,10,0,0,0,114,11,0,0,0,218,23,95,102,
+    105,110,100,95,97,110,100,95,108,111,97,100,95,117,110,108,
+    111,99,107,101,100,168,3,0,0,115,42,0,0,0,0,1,
+    4,1,14,1,4,1,10,1,10,2,10,1,10,1,10,1,
+    2,1,10,1,14,1,16,1,20,1,10,1,8,1,20,2,
+    8,1,4,2,10,1,22,1,114,179,0,0,0,99,2,0,
+    0,0,0,0,0,0,4,0,0,0,11,0,0,0,67,0,
+    0,0,115,94,0,0,0,116,0,124,0,131,1,143,38,1,
+    0,116,1,106,2,160,3,124,0,116,4,161,2,125,2,124,
+    2,116,4,107,8,114,42,116,5,124,0,124,1,131,2,83,
+    0,87,0,100,1,81,0,82,0,88,0,124,2,100,1,107,
+    8,114,82,100,2,160,6,124,0,161,1,125,3,116,7,124,
+    3,124,0,100,3,141,2,130,1,116,8,124,0,131,1,1,
+    0,124,2,83,0,41,4,122,25,70,105,110,100,32,97,110,
+    100,32,108,111,97,100,32,116,104,101,32,109,111,100,117,108,
+    101,46,78,122,40,105,109,112,111,114,116,32,111,102,32,123,
+    125,32,104,97,108,116,101,100,59,32,78,111,110,101,32,105,
+    110,32,115,121,115,46,109,111,100,117,108,101,115,41,1,114,
+    15,0,0,0,41,9,114,42,0,0,0,114,14,0,0,0,
+    114,80,0,0,0,114,30,0,0,0,218,14,95,78,69,69,
+    68,83,95,76,79,65,68,73,78,71,114,179,0,0,0,114,
+    38,0,0,0,114,177,0,0,0,114,57,0,0,0,41,4,
+    114,15,0,0,0,114,178,0,0,0,114,84,0,0,0,114,
+    68,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
+    0,0,0,218,14,95,102,105,110,100,95,97,110,100,95,108,
+    111,97,100,198,3,0,0,115,20,0,0,0,0,2,10,1,
+    14,1,8,1,20,2,8,1,4,1,6,1,12,2,8,1,
+    114,181,0,0,0,114,19,0,0,0,99,3,0,0,0,0,
+    0,0,0,3,0,0,0,4,0,0,0,67,0,0,0,115,
+    42,0,0,0,116,0,124,0,124,1,124,2,131,3,1,0,
+    124,2,100,1,107,4,114,32,116,1,124,0,124,1,124,2,
+    131,3,125,0,116,2,124,0,116,3,131,2,83,0,41,2,
+    97,50,1,0,0,73,109,112,111,114,116,32,97,110,100,32,
+    114,101,116,117,114,110,32,116,104,101,32,109,111,100,117,108,
+    101,32,98,97,115,101,100,32,111,110,32,105,116,115,32,110,
+    97,109,101,44,32,116,104,101,32,112,97,99,107,97,103,101,
+    32,116,104,101,32,99,97,108,108,32,105,115,10,32,32,32,
+    32,98,101,105,110,103,32,109,97,100,101,32,102,114,111,109,
+    44,32,97,110,100,32,116,104,101,32,108,101,118,101,108,32,
+    97,100,106,117,115,116,109,101,110,116,46,10,10,32,32,32,
+    32,84,104,105,115,32,102,117,110,99,116,105,111,110,32,114,
+    101,112,114,101,115,101,110,116,115,32,116,104,101,32,103,114,
+    101,97,116,101,115,116,32,99,111,109,109,111,110,32,100,101,
+    110,111,109,105,110,97,116,111,114,32,111,102,32,102,117,110,
+    99,116,105,111,110,97,108,105,116,121,10,32,32,32,32,98,
+    101,116,119,101,101,110,32,105,109,112,111,114,116,95,109,111,
+    100,117,108,101,32,97,110,100,32,95,95,105,109,112,111,114,
+    116,95,95,46,32,84,104,105,115,32,105,110,99,108,117,100,
+    101,115,32,115,101,116,116,105,110,103,32,95,95,112,97,99,
+    107,97,103,101,95,95,32,105,102,10,32,32,32,32,116,104,
+    101,32,108,111,97,100,101,114,32,100,105,100,32,110,111,116,
+    46,10,10,32,32,32,32,114,19,0,0,0,41,4,114,174,
+    0,0,0,114,163,0,0,0,114,181,0,0,0,218,11,95,
+    103,99,100,95,105,109,112,111,114,116,41,3,114,15,0,0,
     0,114,161,0,0,0,114,162,0,0,0,114,10,0,0,0,
-    114,10,0,0,0,114,11,0,0,0,218,13,95,115,97,110,
-    105,116,121,95,99,104,101,99,107,139,3,0,0,115,22,0,
-    0,0,0,2,10,1,18,1,8,1,8,1,8,1,10,1,
-    10,1,4,1,8,2,12,1,114,174,0,0,0,122,16,78,
-    111,32,109,111,100,117,108,101,32,110,97,109,101,100,32,122,
-    4,123,33,114,125,99,2,0,0,0,0,0,0,0,8,0,
-    0,0,13,0,0,0,67,0,0,0,115,220,0,0,0,100,
-    0,125,2,124,0,160,0,100,1,161,1,100,2,25,0,125,
-    3,124,3,114,134,124,3,116,1,106,2,107,7,114,42,116,
-    3,124,1,124,3,131,2,1,0,124,0,116,1,106,2,107,
-    6,114,62,116,1,106,2,124,0,25,0,83,0,116,1,106,
-    2,124,3,25,0,125,4,121,10,124,4,106,4,125,2,87,
-    0,110,50,4,0,116,5,107,10,114,132,1,0,1,0,1,
-    0,116,6,100,3,23,0,160,7,124,0,124,3,161,2,125,
-    5,116,8,124,5,124,0,100,4,141,2,100,0,130,2,89,
-    0,110,2,88,0,116,9,124,0,124,2,131,2,125,6,124,
-    6,100,0,107,8,114,172,116,8,116,6,160,7,124,0,161,
-    1,124,0,100,4,141,2,130,1,110,8,116,10,124,6,131,
-    1,125,7,124,3,114,216,116,1,106,2,124,3,25,0,125,
-    4,116,11,124,4,124,0,160,0,100,1,161,1,100,5,25,
-    0,124,7,131,3,1,0,124,7,83,0,41,6,78,114,118,
-    0,0,0,114,19,0,0,0,122,23,59,32,123,33,114,125,
-    32,105,115,32,110,111,116,32,97,32,112,97,99,107,97,103,
-    101,41,1,114,15,0,0,0,233,2,0,0,0,41,12,114,
-    119,0,0,0,114,14,0,0,0,114,80,0,0,0,114,59,
-    0,0,0,114,128,0,0,0,114,91,0,0,0,218,8,95,
-    69,82,82,95,77,83,71,114,38,0,0,0,218,19,77,111,
-    100,117,108,101,78,111,116,70,111,117,110,100,69,114,114,111,
-    114,114,170,0,0,0,114,141,0,0,0,114,5,0,0,0,
-    41,8,114,15,0,0,0,218,7,105,109,112,111,114,116,95,
-    114,144,0,0,0,114,120,0,0,0,90,13,112,97,114,101,
-    110,116,95,109,111,100,117,108,101,114,139,0,0,0,114,83,
-    0,0,0,114,84,0,0,0,114,10,0,0,0,114,10,0,
-    0,0,114,11,0,0,0,218,23,95,102,105,110,100,95,97,
-    110,100,95,108,111,97,100,95,117,110,108,111,99,107,101,100,
-    158,3,0,0,115,42,0,0,0,0,1,4,1,14,1,4,
-    1,10,1,10,2,10,1,10,1,10,1,2,1,10,1,14,
-    1,16,1,20,1,10,1,8,1,20,2,8,1,4,2,10,
-    1,22,1,114,179,0,0,0,99,2,0,0,0,0,0,0,
-    0,4,0,0,0,11,0,0,0,67,0,0,0,115,94,0,
-    0,0,116,0,124,0,131,1,143,38,1,0,116,1,106,2,
-    160,3,124,0,116,4,161,2,125,2,124,2,116,4,107,8,
-    114,42,116,5,124,0,124,1,131,2,83,0,87,0,100,1,
-    81,0,82,0,88,0,124,2,100,1,107,8,114,82,100,2,
-    160,6,124,0,161,1,125,3,116,7,124,3,124,0,100,3,
-    141,2,130,1,116,8,124,0,131,1,1,0,124,2,83,0,
-    41,4,122,25,70,105,110,100,32,97,110,100,32,108,111,97,
-    100,32,116,104,101,32,109,111,100,117,108,101,46,78,122,40,
-    105,109,112,111,114,116,32,111,102,32,123,125,32,104,97,108,
-    116,101,100,59,32,78,111,110,101,32,105,110,32,115,121,115,
-    46,109,111,100,117,108,101,115,41,1,114,15,0,0,0,41,
-    9,114,42,0,0,0,114,14,0,0,0,114,80,0,0,0,
-    114,30,0,0,0,218,14,95,78,69,69,68,83,95,76,79,
-    65,68,73,78,71,114,179,0,0,0,114,38,0,0,0,114,
-    177,0,0,0,114,57,0,0,0,41,4,114,15,0,0,0,
-    114,178,0,0,0,114,84,0,0,0,114,68,0,0,0,114,
-    10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,14,
-    95,102,105,110,100,95,97,110,100,95,108,111,97,100,188,3,
-    0,0,115,20,0,0,0,0,2,10,1,14,1,8,1,20,
-    2,8,1,4,1,6,1,12,2,8,1,114,181,0,0,0,
-    114,19,0,0,0,99,3,0,0,0,0,0,0,0,3,0,
-    0,0,4,0,0,0,67,0,0,0,115,42,0,0,0,116,
-    0,124,0,124,1,124,2,131,3,1,0,124,2,100,1,107,
-    4,114,32,116,1,124,0,124,1,124,2,131,3,125,0,116,
-    2,124,0,116,3,131,2,83,0,41,2,97,50,1,0,0,
-    73,109,112,111,114,116,32,97,110,100,32,114,101,116,117,114,
-    110,32,116,104,101,32,109,111,100,117,108,101,32,98,97,115,
-    101,100,32,111,110,32,105,116,115,32,110,97,109,101,44,32,
-    116,104,101,32,112,97,99,107,97,103,101,32,116,104,101,32,
-    99,97,108,108,32,105,115,10,32,32,32,32,98,101,105,110,
-    103,32,109,97,100,101,32,102,114,111,109,44,32,97,110,100,
-    32,116,104,101,32,108,101,118,101,108,32,97,100,106,117,115,
-    116,109,101,110,116,46,10,10,32,32,32,32,84,104,105,115,
-    32,102,117,110,99,116,105,111,110,32,114,101,112,114,101,115,
-    101,110,116,115,32,116,104,101,32,103,114,101,97,116,101,115,
-    116,32,99,111,109,109,111,110,32,100,101,110,111,109,105,110,
-    97,116,111,114,32,111,102,32,102,117,110,99,116,105,111,110,
-    97,108,105,116,121,10,32,32,32,32,98,101,116,119,101,101,
-    110,32,105,109,112,111,114,116,95,109,111,100,117,108,101,32,
-    97,110,100,32,95,95,105,109,112,111,114,116,95,95,46,32,
-    84,104,105,115,32,105,110,99,108,117,100,101,115,32,115,101,
-    116,116,105,110,103,32,95,95,112,97,99,107,97,103,101,95,
-    95,32,105,102,10,32,32,32,32,116,104,101,32,108,111,97,
-    100,101,114,32,100,105,100,32,110,111,116,46,10,10,32,32,
-    32,32,114,19,0,0,0,41,4,114,174,0,0,0,114,163,
-    0,0,0,114,181,0,0,0,218,11,95,103,99,100,95,105,
-    109,112,111,114,116,41,3,114,15,0,0,0,114,161,0,0,
-    0,114,162,0,0,0,114,10,0,0,0,114,10,0,0,0,
-    114,11,0,0,0,114,182,0,0,0,204,3,0,0,115,8,
-    0,0,0,0,9,12,1,8,1,12,1,114,182,0,0,0,
-    99,3,0,0,0,0,0,0,0,6,0,0,0,17,0,0,
-    0,67,0,0,0,115,164,0,0,0,116,0,124,0,100,1,
-    131,2,114,160,100,2,124,1,107,6,114,58,116,1,124,1,
-    131,1,125,1,124,1,160,2,100,2,161,1,1,0,116,0,
-    124,0,100,3,131,2,114,58,124,1,160,3,124,0,106,4,
-    161,1,1,0,120,100,124,1,68,0,93,92,125,3,116,0,
-    124,0,124,3,131,2,115,64,100,4,160,5,124,0,106,6,
-    124,3,161,2,125,4,121,14,116,7,124,2,124,4,131,2,
-    1,0,87,0,113,64,4,0,116,8,107,10,114,154,1,0,
-    125,5,1,0,122,20,124,5,106,9,124,4,107,2,114,136,
-    119,64,130,0,87,0,89,0,100,5,100,5,125,5,126,5,
-    88,0,113,64,88,0,113,64,87,0,124,0,83,0,41,6,
-    122,238,70,105,103,117,114,101,32,111,117,116,32,119,104,97,
-    116,32,95,95,105,109,112,111,114,116,95,95,32,115,104,111,
-    117,108,100,32,114,101,116,117,114,110,46,10,10,32,32,32,
-    32,84,104,101,32,105,109,112,111,114,116,95,32,112,97,114,
-    97,109,101,116,101,114,32,105,115,32,97,32,99,97,108,108,
-    97,98,108,101,32,119,104,105,99,104,32,116,97,107,101,115,
-    32,116,104,101,32,110,97,109,101,32,111,102,32,109,111,100,
-    117,108,101,32,116,111,10,32,32,32,32,105,109,112,111,114,
-    116,46,32,73,116,32,105,115,32,114,101,113,117,105,114,101,
-    100,32,116,111,32,100,101,99,111,117,112,108,101,32,116,104,
-    101,32,102,117,110,99,116,105,111,110,32,102,114,111,109,32,
-    97,115,115,117,109,105,110,103,32,105,109,112,111,114,116,108,
-    105,98,39,115,10,32,32,32,32,105,109,112,111,114,116,32,
-    105,109,112,108,101,109,101,110,116,97,116,105,111,110,32,105,
-    115,32,100,101,115,105,114,101,100,46,10,10,32,32,32,32,
-    114,128,0,0,0,250,1,42,218,7,95,95,97,108,108,95,
-    95,122,5,123,125,46,123,125,78,41,10,114,4,0,0,0,
-    114,127,0,0,0,218,6,114,101,109,111,118,101,218,6,101,
-    120,116,101,110,100,114,184,0,0,0,114,38,0,0,0,114,
-    1,0,0,0,114,59,0,0,0,114,177,0,0,0,114,15,
-    0,0,0,41,6,114,84,0,0,0,218,8,102,114,111,109,
-    108,105,115,116,114,178,0,0,0,218,1,120,90,9,102,114,
-    111,109,95,110,97,109,101,90,3,101,120,99,114,10,0,0,
-    0,114,10,0,0,0,114,11,0,0,0,218,16,95,104,97,
-    110,100,108,101,95,102,114,111,109,108,105,115,116,219,3,0,
-    0,115,32,0,0,0,0,10,10,1,8,1,8,1,10,1,
-    10,1,12,1,10,1,10,1,14,1,2,1,14,1,16,4,
-    10,1,2,1,24,1,114,189,0,0,0,99,1,0,0,0,
-    0,0,0,0,3,0,0,0,6,0,0,0,67,0,0,0,
-    115,146,0,0,0,124,0,160,0,100,1,161,1,125,1,124,
-    0,160,0,100,2,161,1,125,2,124,1,100,3,107,9,114,
-    82,124,2,100,3,107,9,114,78,124,1,124,2,106,1,107,
-    3,114,78,116,2,106,3,100,4,124,1,155,2,100,5,124,
-    2,106,1,155,2,100,6,157,5,116,4,100,7,100,8,141,
-    3,1,0,124,1,83,0,124,2,100,3,107,9,114,96,124,
-    2,106,1,83,0,116,2,106,3,100,9,116,4,100,7,100,
-    8,141,3,1,0,124,0,100,10,25,0,125,1,100,11,124,
-    0,107,7,114,142,124,1,160,5,100,12,161,1,100,13,25,
-    0,125,1,124,1,83,0,41,14,122,167,67,97,108,99,117,
-    108,97,116,101,32,119,104,97,116,32,95,95,112,97,99,107,
-    97,103,101,95,95,32,115,104,111,117,108,100,32,98,101,46,
-    10,10,32,32,32,32,95,95,112,97,99,107,97,103,101,95,
-    95,32,105,115,32,110,111,116,32,103,117,97,114,97,110,116,
-    101,101,100,32,116,111,32,98,101,32,100,101,102,105,110,101,
-    100,32,111,114,32,99,111,117,108,100,32,98,101,32,115,101,
-    116,32,116,111,32,78,111,110,101,10,32,32,32,32,116,111,
-    32,114,101,112,114,101,115,101,110,116,32,116,104,97,116,32,
-    105,116,115,32,112,114,111,112,101,114,32,118,97,108,117,101,
-    32,105,115,32,117,110,107,110,111,119,110,46,10,10,32,32,
-    32,32,114,131,0,0,0,114,90,0,0,0,78,122,32,95,
-    95,112,97,99,107,97,103,101,95,95,32,33,61,32,95,95,
-    115,112,101,99,95,95,46,112,97,114,101,110,116,32,40,122,
-    4,32,33,61,32,250,1,41,233,3,0,0,0,41,1,90,
-    10,115,116,97,99,107,108,101,118,101,108,122,89,99,97,110,
-    39,116,32,114,101,115,111,108,118,101,32,112,97,99,107,97,
-    103,101,32,102,114,111,109,32,95,95,115,112,101,99,95,95,
-    32,111,114,32,95,95,112,97,99,107,97,103,101,95,95,44,
-    32,102,97,108,108,105,110,103,32,98,97,99,107,32,111,110,
-    32,95,95,110,97,109,101,95,95,32,97,110,100,32,95,95,
-    112,97,116,104,95,95,114,1,0,0,0,114,128,0,0,0,
-    114,118,0,0,0,114,19,0,0,0,41,6,114,30,0,0,
-    0,114,120,0,0,0,114,167,0,0,0,114,168,0,0,0,
-    114,169,0,0,0,114,119,0,0,0,41,3,218,7,103,108,
-    111,98,97,108,115,114,161,0,0,0,114,83,0,0,0,114,
-    10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,17,
-    95,99,97,108,99,95,95,95,112,97,99,107,97,103,101,95,
-    95,250,3,0,0,115,30,0,0,0,0,7,10,1,10,1,
-    8,1,18,1,22,2,10,1,4,1,8,1,6,2,6,2,
-    10,1,8,1,8,1,14,1,114,193,0,0,0,99,5,0,
-    0,0,0,0,0,0,9,0,0,0,5,0,0,0,67,0,
-    0,0,115,166,0,0,0,124,4,100,1,107,2,114,18,116,
-    0,124,0,131,1,125,5,110,36,124,1,100,2,107,9,114,
-    30,124,1,110,2,105,0,125,6,116,1,124,6,131,1,125,
-    7,116,0,124,0,124,7,124,4,131,3,125,5,124,3,115,
-    150,124,4,100,1,107,2,114,84,116,0,124,0,160,2,100,
-    3,161,1,100,1,25,0,131,1,83,0,124,0,115,92,124,
-    5,83,0,116,3,124,0,131,1,116,3,124,0,160,2,100,
-    3,161,1,100,1,25,0,131,1,24,0,125,8,116,4,106,
-    5,124,5,106,6,100,2,116,3,124,5,106,6,131,1,124,
-    8,24,0,133,2,25,0,25,0,83,0,110,12,116,7,124,
-    5,124,3,116,0,131,3,83,0,100,2,83,0,41,4,97,
-    215,1,0,0,73,109,112,111,114,116,32,97,32,109,111,100,
-    117,108,101,46,10,10,32,32,32,32,84,104,101,32,39,103,
-    108,111,98,97,108,115,39,32,97,114,103,117,109,101,110,116,
-    32,105,115,32,117,115,101,100,32,116,111,32,105,110,102,101,
-    114,32,119,104,101,114,101,32,116,104,101,32,105,109,112,111,
-    114,116,32,105,115,32,111,99,99,117,114,114,105,110,103,32,
-    102,114,111,109,10,32,32,32,32,116,111,32,104,97,110,100,
-    108,101,32,114,101,108,97,116,105,118,101,32,105,109,112,111,
-    114,116,115,46,32,84,104,101,32,39,108,111,99,97,108,115,
-    39,32,97,114,103,117,109,101,110,116,32,105,115,32,105,103,
-    110,111,114,101,100,46,32,84,104,101,10,32,32,32,32,39,
-    102,114,111,109,108,105,115,116,39,32,97,114,103,117,109,101,
-    110,116,32,115,112,101,99,105,102,105,101,115,32,119,104,97,
-    116,32,115,104,111,117,108,100,32,101,120,105,115,116,32,97,
-    115,32,97,116,116,114,105,98,117,116,101,115,32,111,110,32,
-    116,104,101,32,109,111,100,117,108,101,10,32,32,32,32,98,
-    101,105,110,103,32,105,109,112,111,114,116,101,100,32,40,101,
-    46,103,46,32,96,96,102,114,111,109,32,109,111,100,117,108,
-    101,32,105,109,112,111,114,116,32,60,102,114,111,109,108,105,
-    115,116,62,96,96,41,46,32,32,84,104,101,32,39,108,101,
-    118,101,108,39,10,32,32,32,32,97,114,103,117,109,101,110,
-    116,32,114,101,112,114,101,115,101,110,116,115,32,116,104,101,
-    32,112,97,99,107,97,103,101,32,108,111,99,97,116,105,111,
-    110,32,116,111,32,105,109,112,111,114,116,32,102,114,111,109,
-    32,105,110,32,97,32,114,101,108,97,116,105,118,101,10,32,
-    32,32,32,105,109,112,111,114,116,32,40,101,46,103,46,32,
-    96,96,102,114,111,109,32,46,46,112,107,103,32,105,109,112,
-    111,114,116,32,109,111,100,96,96,32,119,111,117,108,100,32,
-    104,97,118,101,32,97,32,39,108,101,118,101,108,39,32,111,
-    102,32,50,41,46,10,10,32,32,32,32,114,19,0,0,0,
-    78,114,118,0,0,0,41,8,114,182,0,0,0,114,193,0,
-    0,0,218,9,112,97,114,116,105,116,105,111,110,114,159,0,
-    0,0,114,14,0,0,0,114,80,0,0,0,114,1,0,0,
-    0,114,189,0,0,0,41,9,114,15,0,0,0,114,192,0,
-    0,0,218,6,108,111,99,97,108,115,114,187,0,0,0,114,
-    162,0,0,0,114,84,0,0,0,90,8,103,108,111,98,97,
-    108,115,95,114,161,0,0,0,90,7,99,117,116,95,111,102,
-    102,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
-    218,10,95,95,105,109,112,111,114,116,95,95,21,4,0,0,
-    115,26,0,0,0,0,11,8,1,10,2,16,1,8,1,12,
-    1,4,3,8,1,18,1,4,1,4,4,26,3,32,2,114,
-    196,0,0,0,99,1,0,0,0,0,0,0,0,2,0,0,
-    0,3,0,0,0,67,0,0,0,115,38,0,0,0,116,0,
-    160,1,124,0,161,1,125,1,124,1,100,0,107,8,114,30,
-    116,2,100,1,124,0,23,0,131,1,130,1,116,3,124,1,
-    131,1,83,0,41,2,78,122,25,110,111,32,98,117,105,108,
-    116,45,105,110,32,109,111,100,117,108,101,32,110,97,109,101,
-    100,32,41,4,114,142,0,0,0,114,146,0,0,0,114,71,
-    0,0,0,114,141,0,0,0,41,2,114,15,0,0,0,114,
+    114,10,0,0,0,114,11,0,0,0,114,182,0,0,0,214,
+    3,0,0,115,8,0,0,0,0,9,12,1,8,1,12,1,
+    114,182,0,0,0,99,3,0,0,0,0,0,0,0,6,0,
+    0,0,17,0,0,0,67,0,0,0,115,164,0,0,0,116,
+    0,124,0,100,1,131,2,114,160,100,2,124,1,107,6,114,
+    58,116,1,124,1,131,1,125,1,124,1,160,2,100,2,161,
+    1,1,0,116,0,124,0,100,3,131,2,114,58,124,1,160,
+    3,124,0,106,4,161,1,1,0,120,100,124,1,68,0,93,
+    92,125,3,116,0,124,0,124,3,131,2,115,64,100,4,160,
+    5,124,0,106,6,124,3,161,2,125,4,121,14,116,7,124,
+    2,124,4,131,2,1,0,87,0,113,64,4,0,116,8,107,
+    10,114,154,1,0,125,5,1,0,122,20,124,5,106,9,124,
+    4,107,2,114,136,119,64,130,0,87,0,89,0,100,5,100,
+    5,125,5,126,5,88,0,113,64,88,0,113,64,87,0,124,
+    0,83,0,41,6,122,238,70,105,103,117,114,101,32,111,117,
+    116,32,119,104,97,116,32,95,95,105,109,112,111,114,116,95,
+    95,32,115,104,111,117,108,100,32,114,101,116,117,114,110,46,
+    10,10,32,32,32,32,84,104,101,32,105,109,112,111,114,116,
+    95,32,112,97,114,97,109,101,116,101,114,32,105,115,32,97,
+    32,99,97,108,108,97,98,108,101,32,119,104,105,99,104,32,
+    116,97,107,101,115,32,116,104,101,32,110,97,109,101,32,111,
+    102,32,109,111,100,117,108,101,32,116,111,10,32,32,32,32,
+    105,109,112,111,114,116,46,32,73,116,32,105,115,32,114,101,
+    113,117,105,114,101,100,32,116,111,32,100,101,99,111,117,112,
+    108,101,32,116,104,101,32,102,117,110,99,116,105,111,110,32,
+    102,114,111,109,32,97,115,115,117,109,105,110,103,32,105,109,
+    112,111,114,116,108,105,98,39,115,10,32,32,32,32,105,109,
+    112,111,114,116,32,105,109,112,108,101,109,101,110,116,97,116,
+    105,111,110,32,105,115,32,100,101,115,105,114,101,100,46,10,
+    10,32,32,32,32,114,128,0,0,0,250,1,42,218,7,95,
+    95,97,108,108,95,95,122,5,123,125,46,123,125,78,41,10,
+    114,4,0,0,0,114,127,0,0,0,218,6,114,101,109,111,
+    118,101,218,6,101,120,116,101,110,100,114,184,0,0,0,114,
+    38,0,0,0,114,1,0,0,0,114,59,0,0,0,114,177,
+    0,0,0,114,15,0,0,0,41,6,114,84,0,0,0,218,
+    8,102,114,111,109,108,105,115,116,114,178,0,0,0,218,1,
+    120,90,9,102,114,111,109,95,110,97,109,101,90,3,101,120,
+    99,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
+    218,16,95,104,97,110,100,108,101,95,102,114,111,109,108,105,
+    115,116,229,3,0,0,115,32,0,0,0,0,10,10,1,8,
+    1,8,1,10,1,10,1,12,1,10,1,10,1,14,1,2,
+    1,14,1,16,4,10,1,2,1,24,1,114,189,0,0,0,
+    99,1,0,0,0,0,0,0,0,3,0,0,0,6,0,0,
+    0,67,0,0,0,115,146,0,0,0,124,0,160,0,100,1,
+    161,1,125,1,124,0,160,0,100,2,161,1,125,2,124,1,
+    100,3,107,9,114,82,124,2,100,3,107,9,114,78,124,1,
+    124,2,106,1,107,3,114,78,116,2,106,3,100,4,124,1,
+    155,2,100,5,124,2,106,1,155,2,100,6,157,5,116,4,
+    100,7,100,8,141,3,1,0,124,1,83,0,124,2,100,3,
+    107,9,114,96,124,2,106,1,83,0,116,2,106,3,100,9,
+    116,4,100,7,100,8,141,3,1,0,124,0,100,10,25,0,
+    125,1,100,11,124,0,107,7,114,142,124,1,160,5,100,12,
+    161,1,100,13,25,0,125,1,124,1,83,0,41,14,122,167,
+    67,97,108,99,117,108,97,116,101,32,119,104,97,116,32,95,
+    95,112,97,99,107,97,103,101,95,95,32,115,104,111,117,108,
+    100,32,98,101,46,10,10,32,32,32,32,95,95,112,97,99,
+    107,97,103,101,95,95,32,105,115,32,110,111,116,32,103,117,
+    97,114,97,110,116,101,101,100,32,116,111,32,98,101,32,100,
+    101,102,105,110,101,100,32,111,114,32,99,111,117,108,100,32,
+    98,101,32,115,101,116,32,116,111,32,78,111,110,101,10,32,
+    32,32,32,116,111,32,114,101,112,114,101,115,101,110,116,32,
+    116,104,97,116,32,105,116,115,32,112,114,111,112,101,114,32,
+    118,97,108,117,101,32,105,115,32,117,110,107,110,111,119,110,
+    46,10,10,32,32,32,32,114,131,0,0,0,114,90,0,0,
+    0,78,122,32,95,95,112,97,99,107,97,103,101,95,95,32,
+    33,61,32,95,95,115,112,101,99,95,95,46,112,97,114,101,
+    110,116,32,40,122,4,32,33,61,32,250,1,41,233,3,0,
+    0,0,41,1,90,10,115,116,97,99,107,108,101,118,101,108,
+    122,89,99,97,110,39,116,32,114,101,115,111,108,118,101,32,
+    112,97,99,107,97,103,101,32,102,114,111,109,32,95,95,115,
+    112,101,99,95,95,32,111,114,32,95,95,112,97,99,107,97,
+    103,101,95,95,44,32,102,97,108,108,105,110,103,32,98,97,
+    99,107,32,111,110,32,95,95,110,97,109,101,95,95,32,97,
+    110,100,32,95,95,112,97,116,104,95,95,114,1,0,0,0,
+    114,128,0,0,0,114,118,0,0,0,114,19,0,0,0,41,
+    6,114,30,0,0,0,114,120,0,0,0,114,167,0,0,0,
+    114,168,0,0,0,114,169,0,0,0,114,119,0,0,0,41,
+    3,218,7,103,108,111,98,97,108,115,114,161,0,0,0,114,
     83,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
-    0,0,0,218,18,95,98,117,105,108,116,105,110,95,102,114,
-    111,109,95,110,97,109,101,56,4,0,0,115,8,0,0,0,
-    0,1,10,1,8,1,12,1,114,197,0,0,0,99,2,0,
-    0,0,0,0,0,0,12,0,0,0,12,0,0,0,67,0,
-    0,0,115,244,0,0,0,124,1,97,0,124,0,97,1,116,
-    2,116,1,131,1,125,2,120,86,116,1,106,3,160,4,161,
-    0,68,0,93,72,92,2,125,3,125,4,116,5,124,4,124,
-    2,131,2,114,28,124,3,116,1,106,6,107,6,114,62,116,
-    7,125,5,110,18,116,0,160,8,124,3,161,1,114,28,116,
-    9,125,5,110,2,113,28,116,10,124,4,124,5,131,2,125,
-    6,116,11,124,6,124,4,131,2,1,0,113,28,87,0,116,
-    1,106,3,116,12,25,0,125,7,120,54,100,5,68,0,93,
-    46,125,8,124,8,116,1,106,3,107,7,114,144,116,13,124,
-    8,131,1,125,9,110,10,116,1,106,3,124,8,25,0,125,
-    9,116,14,124,7,124,8,124,9,131,3,1,0,113,120,87,
-    0,121,12,116,13,100,2,131,1,125,10,87,0,110,24,4,
-    0,116,15,107,10,114,206,1,0,1,0,1,0,100,3,125,
-    10,89,0,110,2,88,0,116,14,124,7,100,2,124,10,131,
-    3,1,0,116,13,100,4,131,1,125,11,116,14,124,7,100,
-    4,124,11,131,3,1,0,100,3,83,0,41,6,122,250,83,
-    101,116,117,112,32,105,109,112,111,114,116,108,105,98,32,98,
-    121,32,105,109,112,111,114,116,105,110,103,32,110,101,101,100,
-    101,100,32,98,117,105,108,116,45,105,110,32,109,111,100,117,
-    108,101,115,32,97,110,100,32,105,110,106,101,99,116,105,110,
-    103,32,116,104,101,109,10,32,32,32,32,105,110,116,111,32,
-    116,104,101,32,103,108,111,98,97,108,32,110,97,109,101,115,
-    112,97,99,101,46,10,10,32,32,32,32,65,115,32,115,121,
-    115,32,105,115,32,110,101,101,100,101,100,32,102,111,114,32,
-    115,121,115,46,109,111,100,117,108,101,115,32,97,99,99,101,
-    115,115,32,97,110,100,32,95,105,109,112,32,105,115,32,110,
-    101,101,100,101,100,32,116,111,32,108,111,97,100,32,98,117,
-    105,108,116,45,105,110,10,32,32,32,32,109,111,100,117,108,
-    101,115,44,32,116,104,111,115,101,32,116,119,111,32,109,111,
-    100,117,108,101,115,32,109,117,115,116,32,98,101,32,101,120,
-    112,108,105,99,105,116,108,121,32,112,97,115,115,101,100,32,
-    105,110,46,10,10,32,32,32,32,114,167,0,0,0,114,20,
-    0,0,0,78,114,55,0,0,0,41,1,114,167,0,0,0,
-    41,16,114,52,0,0,0,114,14,0,0,0,114,13,0,0,
-    0,114,80,0,0,0,218,5,105,116,101,109,115,114,171,0,
-    0,0,114,70,0,0,0,114,142,0,0,0,114,76,0,0,
-    0,114,152,0,0,0,114,129,0,0,0,114,134,0,0,0,
-    114,1,0,0,0,114,197,0,0,0,114,5,0,0,0,114,
-    71,0,0,0,41,12,218,10,115,121,115,95,109,111,100,117,
-    108,101,218,11,95,105,109,112,95,109,111,100,117,108,101,90,
-    11,109,111,100,117,108,101,95,116,121,112,101,114,15,0,0,
-    0,114,84,0,0,0,114,94,0,0,0,114,83,0,0,0,
-    90,11,115,101,108,102,95,109,111,100,117,108,101,90,12,98,
-    117,105,108,116,105,110,95,110,97,109,101,90,14,98,117,105,
-    108,116,105,110,95,109,111,100,117,108,101,90,13,116,104,114,
-    101,97,100,95,109,111,100,117,108,101,90,14,119,101,97,107,
-    114,101,102,95,109,111,100,117,108,101,114,10,0,0,0,114,
-    10,0,0,0,114,11,0,0,0,218,6,95,115,101,116,117,
-    112,63,4,0,0,115,50,0,0,0,0,9,4,1,4,3,
-    8,1,20,1,10,1,10,1,6,1,10,1,6,2,2,1,
-    10,1,14,3,10,1,10,1,10,1,10,2,10,1,16,3,
-    2,1,12,1,14,2,10,1,12,3,8,1,114,201,0,0,
-    0,99,2,0,0,0,0,0,0,0,2,0,0,0,3,0,
-    0,0,67,0,0,0,115,38,0,0,0,116,0,124,0,124,
-    1,131,2,1,0,116,1,106,2,160,3,116,4,161,1,1,
-    0,116,1,106,2,160,3,116,5,161,1,1,0,100,1,83,
-    0,41,2,122,48,73,110,115,116,97,108,108,32,105,109,112,
-    111,114,116,101,114,115,32,102,111,114,32,98,117,105,108,116,
-    105,110,32,97,110,100,32,102,114,111,122,101,110,32,109,111,
-    100,117,108,101,115,78,41,6,114,201,0,0,0,114,14,0,
-    0,0,114,166,0,0,0,114,110,0,0,0,114,142,0,0,
-    0,114,152,0,0,0,41,2,114,199,0,0,0,114,200,0,
-    0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,
-    0,218,8,95,105,110,115,116,97,108,108,110,4,0,0,115,
-    6,0,0,0,0,2,10,2,12,1,114,202,0,0,0,99,
-    0,0,0,0,0,0,0,0,1,0,0,0,4,0,0,0,
-    67,0,0,0,115,32,0,0,0,100,1,100,2,108,0,125,
-    0,124,0,97,1,124,0,160,2,116,3,106,4,116,5,25,
-    0,161,1,1,0,100,2,83,0,41,3,122,57,73,110,115,
-    116,97,108,108,32,105,109,112,111,114,116,101,114,115,32,116,
-    104,97,116,32,114,101,113,117,105,114,101,32,101,120,116,101,
-    114,110,97,108,32,102,105,108,101,115,121,115,116,101,109,32,
-    97,99,99,101,115,115,114,19,0,0,0,78,41,6,218,26,
-    95,102,114,111,122,101,110,95,105,109,112,111,114,116,108,105,
-    98,95,101,120,116,101,114,110,97,108,114,116,0,0,0,114,
-    202,0,0,0,114,14,0,0,0,114,80,0,0,0,114,1,
-    0,0,0,41,1,114,203,0,0,0,114,10,0,0,0,114,
-    10,0,0,0,114,11,0,0,0,218,27,95,105,110,115,116,
-    97,108,108,95,101,120,116,101,114,110,97,108,95,105,109,112,
-    111,114,116,101,114,115,118,4,0,0,115,6,0,0,0,0,
-    3,8,1,4,1,114,204,0,0,0,41,2,78,78,41,1,
-    78,41,2,78,114,19,0,0,0,41,51,114,3,0,0,0,
-    114,116,0,0,0,114,12,0,0,0,114,16,0,0,0,114,
-    49,0,0,0,114,29,0,0,0,114,36,0,0,0,114,17,
-    0,0,0,114,18,0,0,0,114,41,0,0,0,114,42,0,
-    0,0,114,45,0,0,0,114,57,0,0,0,114,59,0,0,
-    0,114,69,0,0,0,114,75,0,0,0,114,78,0,0,0,
-    114,85,0,0,0,114,96,0,0,0,114,97,0,0,0,114,
-    103,0,0,0,114,79,0,0,0,114,129,0,0,0,114,134,
-    0,0,0,114,137,0,0,0,114,92,0,0,0,114,81,0,
-    0,0,114,140,0,0,0,114,141,0,0,0,114,82,0,0,
-    0,114,142,0,0,0,114,152,0,0,0,114,157,0,0,0,
-    114,163,0,0,0,114,165,0,0,0,114,170,0,0,0,114,
-    174,0,0,0,90,15,95,69,82,82,95,77,83,71,95,80,
-    82,69,70,73,88,114,176,0,0,0,114,179,0,0,0,218,
-    6,111,98,106,101,99,116,114,180,0,0,0,114,181,0,0,
-    0,114,182,0,0,0,114,189,0,0,0,114,193,0,0,0,
-    114,196,0,0,0,114,197,0,0,0,114,201,0,0,0,114,
-    202,0,0,0,114,204,0,0,0,114,10,0,0,0,114,10,
-    0,0,0,114,10,0,0,0,114,11,0,0,0,218,8,60,
-    109,111,100,117,108,101,62,25,0,0,0,115,96,0,0,0,
-    4,0,4,2,8,8,8,8,4,2,4,3,16,4,14,68,
-    14,21,14,16,8,27,8,17,8,11,14,8,8,11,8,12,
-    8,16,8,36,14,27,14,101,16,26,10,45,14,60,8,17,
-    8,17,8,24,8,29,8,23,8,15,14,73,14,77,14,13,
-    8,9,8,9,10,47,8,16,4,1,8,2,8,27,6,3,
-    8,16,10,15,8,31,8,27,18,35,8,7,8,47,8,8,
+    0,0,0,218,17,95,99,97,108,99,95,95,95,112,97,99,
+    107,97,103,101,95,95,4,4,0,0,115,30,0,0,0,0,
+    7,10,1,10,1,8,1,18,1,22,2,10,1,4,1,8,
+    1,6,2,6,2,10,1,8,1,8,1,14,1,114,193,0,
+    0,0,99,5,0,0,0,0,0,0,0,9,0,0,0,5,
+    0,0,0,67,0,0,0,115,166,0,0,0,124,4,100,1,
+    107,2,114,18,116,0,124,0,131,1,125,5,110,36,124,1,
+    100,2,107,9,114,30,124,1,110,2,105,0,125,6,116,1,
+    124,6,131,1,125,7,116,0,124,0,124,7,124,4,131,3,
+    125,5,124,3,115,150,124,4,100,1,107,2,114,84,116,0,
+    124,0,160,2,100,3,161,1,100,1,25,0,131,1,83,0,
+    124,0,115,92,124,5,83,0,116,3,124,0,131,1,116,3,
+    124,0,160,2,100,3,161,1,100,1,25,0,131,1,24,0,
+    125,8,116,4,106,5,124,5,106,6,100,2,116,3,124,5,
+    106,6,131,1,124,8,24,0,133,2,25,0,25,0,83,0,
+    110,12,116,7,124,5,124,3,116,0,131,3,83,0,100,2,
+    83,0,41,4,97,215,1,0,0,73,109,112,111,114,116,32,
+    97,32,109,111,100,117,108,101,46,10,10,32,32,32,32,84,
+    104,101,32,39,103,108,111,98,97,108,115,39,32,97,114,103,
+    117,109,101,110,116,32,105,115,32,117,115,101,100,32,116,111,
+    32,105,110,102,101,114,32,119,104,101,114,101,32,116,104,101,
+    32,105,109,112,111,114,116,32,105,115,32,111,99,99,117,114,
+    114,105,110,103,32,102,114,111,109,10,32,32,32,32,116,111,
+    32,104,97,110,100,108,101,32,114,101,108,97,116,105,118,101,
+    32,105,109,112,111,114,116,115,46,32,84,104,101,32,39,108,
+    111,99,97,108,115,39,32,97,114,103,117,109,101,110,116,32,
+    105,115,32,105,103,110,111,114,101,100,46,32,84,104,101,10,
+    32,32,32,32,39,102,114,111,109,108,105,115,116,39,32,97,
+    114,103,117,109,101,110,116,32,115,112,101,99,105,102,105,101,
+    115,32,119,104,97,116,32,115,104,111,117,108,100,32,101,120,
+    105,115,116,32,97,115,32,97,116,116,114,105,98,117,116,101,
+    115,32,111,110,32,116,104,101,32,109,111,100,117,108,101,10,
+    32,32,32,32,98,101,105,110,103,32,105,109,112,111,114,116,
+    101,100,32,40,101,46,103,46,32,96,96,102,114,111,109,32,
+    109,111,100,117,108,101,32,105,109,112,111,114,116,32,60,102,
+    114,111,109,108,105,115,116,62,96,96,41,46,32,32,84,104,
+    101,32,39,108,101,118,101,108,39,10,32,32,32,32,97,114,
+    103,117,109,101,110,116,32,114,101,112,114,101,115,101,110,116,
+    115,32,116,104,101,32,112,97,99,107,97,103,101,32,108,111,
+    99,97,116,105,111,110,32,116,111,32,105,109,112,111,114,116,
+    32,102,114,111,109,32,105,110,32,97,32,114,101,108,97,116,
+    105,118,101,10,32,32,32,32,105,109,112,111,114,116,32,40,
+    101,46,103,46,32,96,96,102,114,111,109,32,46,46,112,107,
+    103,32,105,109,112,111,114,116,32,109,111,100,96,96,32,119,
+    111,117,108,100,32,104,97,118,101,32,97,32,39,108,101,118,
+    101,108,39,32,111,102,32,50,41,46,10,10,32,32,32,32,
+    114,19,0,0,0,78,114,118,0,0,0,41,8,114,182,0,
+    0,0,114,193,0,0,0,218,9,112,97,114,116,105,116,105,
+    111,110,114,159,0,0,0,114,14,0,0,0,114,80,0,0,
+    0,114,1,0,0,0,114,189,0,0,0,41,9,114,15,0,
+    0,0,114,192,0,0,0,218,6,108,111,99,97,108,115,114,
+    187,0,0,0,114,162,0,0,0,114,84,0,0,0,90,8,
+    103,108,111,98,97,108,115,95,114,161,0,0,0,90,7,99,
+    117,116,95,111,102,102,114,10,0,0,0,114,10,0,0,0,
+    114,11,0,0,0,218,10,95,95,105,109,112,111,114,116,95,
+    95,31,4,0,0,115,26,0,0,0,0,11,8,1,10,2,
+    16,1,8,1,12,1,4,3,8,1,18,1,4,1,4,4,
+    26,3,32,2,114,196,0,0,0,99,1,0,0,0,0,0,
+    0,0,2,0,0,0,3,0,0,0,67,0,0,0,115,38,
+    0,0,0,116,0,160,1,124,0,161,1,125,1,124,1,100,
+    0,107,8,114,30,116,2,100,1,124,0,23,0,131,1,130,
+    1,116,3,124,1,131,1,83,0,41,2,78,122,25,110,111,
+    32,98,117,105,108,116,45,105,110,32,109,111,100,117,108,101,
+    32,110,97,109,101,100,32,41,4,114,142,0,0,0,114,146,
+    0,0,0,114,71,0,0,0,114,141,0,0,0,41,2,114,
+    15,0,0,0,114,83,0,0,0,114,10,0,0,0,114,10,
+    0,0,0,114,11,0,0,0,218,18,95,98,117,105,108,116,
+    105,110,95,102,114,111,109,95,110,97,109,101,66,4,0,0,
+    115,8,0,0,0,0,1,10,1,8,1,12,1,114,197,0,
+    0,0,99,2,0,0,0,0,0,0,0,12,0,0,0,12,
+    0,0,0,67,0,0,0,115,244,0,0,0,124,1,97,0,
+    124,0,97,1,116,2,116,1,131,1,125,2,120,86,116,1,
+    106,3,160,4,161,0,68,0,93,72,92,2,125,3,125,4,
+    116,5,124,4,124,2,131,2,114,28,124,3,116,1,106,6,
+    107,6,114,62,116,7,125,5,110,18,116,0,160,8,124,3,
+    161,1,114,28,116,9,125,5,110,2,113,28,116,10,124,4,
+    124,5,131,2,125,6,116,11,124,6,124,4,131,2,1,0,
+    113,28,87,0,116,1,106,3,116,12,25,0,125,7,120,54,
+    100,5,68,0,93,46,125,8,124,8,116,1,106,3,107,7,
+    114,144,116,13,124,8,131,1,125,9,110,10,116,1,106,3,
+    124,8,25,0,125,9,116,14,124,7,124,8,124,9,131,3,
+    1,0,113,120,87,0,121,12,116,13,100,2,131,1,125,10,
+    87,0,110,24,4,0,116,15,107,10,114,206,1,0,1,0,
+    1,0,100,3,125,10,89,0,110,2,88,0,116,14,124,7,
+    100,2,124,10,131,3,1,0,116,13,100,4,131,1,125,11,
+    116,14,124,7,100,4,124,11,131,3,1,0,100,3,83,0,
+    41,6,122,250,83,101,116,117,112,32,105,109,112,111,114,116,
+    108,105,98,32,98,121,32,105,109,112,111,114,116,105,110,103,
+    32,110,101,101,100,101,100,32,98,117,105,108,116,45,105,110,
+    32,109,111,100,117,108,101,115,32,97,110,100,32,105,110,106,
+    101,99,116,105,110,103,32,116,104,101,109,10,32,32,32,32,
+    105,110,116,111,32,116,104,101,32,103,108,111,98,97,108,32,
+    110,97,109,101,115,112,97,99,101,46,10,10,32,32,32,32,
+    65,115,32,115,121,115,32,105,115,32,110,101,101,100,101,100,
+    32,102,111,114,32,115,121,115,46,109,111,100,117,108,101,115,
+    32,97,99,99,101,115,115,32,97,110,100,32,95,105,109,112,
+    32,105,115,32,110,101,101,100,101,100,32,116,111,32,108,111,
+    97,100,32,98,117,105,108,116,45,105,110,10,32,32,32,32,
+    109,111,100,117,108,101,115,44,32,116,104,111,115,101,32,116,
+    119,111,32,109,111,100,117,108,101,115,32,109,117,115,116,32,
+    98,101,32,101,120,112,108,105,99,105,116,108,121,32,112,97,
+    115,115,101,100,32,105,110,46,10,10,32,32,32,32,114,167,
+    0,0,0,114,20,0,0,0,78,114,56,0,0,0,41,1,
+    114,167,0,0,0,41,16,114,49,0,0,0,114,14,0,0,
+    0,114,13,0,0,0,114,80,0,0,0,218,5,105,116,101,
+    109,115,114,171,0,0,0,114,70,0,0,0,114,142,0,0,
+    0,114,76,0,0,0,114,152,0,0,0,114,129,0,0,0,
+    114,134,0,0,0,114,1,0,0,0,114,197,0,0,0,114,
+    5,0,0,0,114,71,0,0,0,41,12,218,10,115,121,115,
+    95,109,111,100,117,108,101,218,11,95,105,109,112,95,109,111,
+    100,117,108,101,90,11,109,111,100,117,108,101,95,116,121,112,
+    101,114,15,0,0,0,114,84,0,0,0,114,94,0,0,0,
+    114,83,0,0,0,90,11,115,101,108,102,95,109,111,100,117,
+    108,101,90,12,98,117,105,108,116,105,110,95,110,97,109,101,
+    90,14,98,117,105,108,116,105,110,95,109,111,100,117,108,101,
+    90,13,116,104,114,101,97,100,95,109,111,100,117,108,101,90,
+    14,119,101,97,107,114,101,102,95,109,111,100,117,108,101,114,
+    10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,6,
+    95,115,101,116,117,112,73,4,0,0,115,50,0,0,0,0,
+    9,4,1,4,3,8,1,20,1,10,1,10,1,6,1,10,
+    1,6,2,2,1,10,1,14,3,10,1,10,1,10,1,10,
+    2,10,1,16,3,2,1,12,1,14,2,10,1,12,3,8,
+    1,114,201,0,0,0,99,2,0,0,0,0,0,0,0,2,
+    0,0,0,3,0,0,0,67,0,0,0,115,38,0,0,0,
+    116,0,124,0,124,1,131,2,1,0,116,1,106,2,160,3,
+    116,4,161,1,1,0,116,1,106,2,160,3,116,5,161,1,
+    1,0,100,1,83,0,41,2,122,48,73,110,115,116,97,108,
+    108,32,105,109,112,111,114,116,101,114,115,32,102,111,114,32,
+    98,117,105,108,116,105,110,32,97,110,100,32,102,114,111,122,
+    101,110,32,109,111,100,117,108,101,115,78,41,6,114,201,0,
+    0,0,114,14,0,0,0,114,166,0,0,0,114,110,0,0,
+    0,114,142,0,0,0,114,152,0,0,0,41,2,114,199,0,
+    0,0,114,200,0,0,0,114,10,0,0,0,114,10,0,0,
+    0,114,11,0,0,0,218,8,95,105,110,115,116,97,108,108,
+    120,4,0,0,115,6,0,0,0,0,2,10,2,12,1,114,
+    202,0,0,0,99,0,0,0,0,0,0,0,0,1,0,0,
+    0,4,0,0,0,67,0,0,0,115,32,0,0,0,100,1,
+    100,2,108,0,125,0,124,0,97,1,124,0,160,2,116,3,
+    106,4,116,5,25,0,161,1,1,0,100,2,83,0,41,3,
+    122,57,73,110,115,116,97,108,108,32,105,109,112,111,114,116,
+    101,114,115,32,116,104,97,116,32,114,101,113,117,105,114,101,
+    32,101,120,116,101,114,110,97,108,32,102,105,108,101,115,121,
+    115,116,101,109,32,97,99,99,101,115,115,114,19,0,0,0,
+    78,41,6,218,26,95,102,114,111,122,101,110,95,105,109,112,
+    111,114,116,108,105,98,95,101,120,116,101,114,110,97,108,114,
+    116,0,0,0,114,202,0,0,0,114,14,0,0,0,114,80,
+    0,0,0,114,1,0,0,0,41,1,114,203,0,0,0,114,
+    10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,27,
+    95,105,110,115,116,97,108,108,95,101,120,116,101,114,110,97,
+    108,95,105,109,112,111,114,116,101,114,115,128,4,0,0,115,
+    6,0,0,0,0,3,8,1,4,1,114,204,0,0,0,41,
+    2,78,78,41,1,78,41,2,78,114,19,0,0,0,41,51,
+    114,3,0,0,0,114,116,0,0,0,114,12,0,0,0,114,
+    16,0,0,0,114,51,0,0,0,114,29,0,0,0,114,36,
+    0,0,0,114,17,0,0,0,114,18,0,0,0,114,41,0,
+    0,0,114,42,0,0,0,114,45,0,0,0,114,57,0,0,
+    0,114,59,0,0,0,114,69,0,0,0,114,75,0,0,0,
+    114,78,0,0,0,114,85,0,0,0,114,96,0,0,0,114,
+    97,0,0,0,114,103,0,0,0,114,79,0,0,0,114,129,
+    0,0,0,114,134,0,0,0,114,137,0,0,0,114,92,0,
+    0,0,114,81,0,0,0,114,140,0,0,0,114,141,0,0,
+    0,114,82,0,0,0,114,142,0,0,0,114,152,0,0,0,
+    114,157,0,0,0,114,163,0,0,0,114,165,0,0,0,114,
+    170,0,0,0,114,174,0,0,0,90,15,95,69,82,82,95,
+    77,83,71,95,80,82,69,70,73,88,114,176,0,0,0,114,
+    179,0,0,0,218,6,111,98,106,101,99,116,114,180,0,0,
+    0,114,181,0,0,0,114,182,0,0,0,114,189,0,0,0,
+    114,193,0,0,0,114,196,0,0,0,114,197,0,0,0,114,
+    201,0,0,0,114,202,0,0,0,114,204,0,0,0,114,10,
+    0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,
+    0,0,218,8,60,109,111,100,117,108,101,62,25,0,0,0,
+    115,96,0,0,0,4,0,4,2,8,8,8,8,4,2,4,
+    3,16,4,14,68,14,21,14,16,8,37,8,17,8,11,14,
+    8,8,11,8,12,8,16,8,36,14,27,14,101,16,26,10,
+    45,14,60,8,17,8,17,8,24,8,29,8,23,8,15,14,
+    73,14,77,14,13,8,9,8,9,10,47,8,16,4,1,8,
+    2,8,27,6,3,8,16,10,15,8,31,8,27,18,35,8,
+    7,8,47,8,8,
 };


From webhook-mailer at python.org  Wed Aug  9 07:56:17 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 09 Aug 2017 11:56:17 -0000
Subject: [Python-checkins] [3.6] bpo-31070: Fix a race condition in
 importlib _get_module_lock(). (GH-3033). (#3038)
Message-ID: <mailman.6.1502279778.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/f3b891718e104b6e7018b58bbcd86421a2837fb8
commit: f3b891718e104b6e7018b58bbcd86421a2837fb8
branch: 3.6
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-09T14:56:13+03:00
summary:

[3.6] bpo-31070: Fix a race condition in importlib _get_module_lock(). (GH-3033). (#3038)

(cherry picked from commit 9b0d1d647e3d2ec9d299e5c9f49b02fbbb810a5a)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-08-09-09-40-54.bpo-31070.oDyLiI.rst
M Lib/importlib/_bootstrap.py
M Python/importlib.h

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 92cf14f9504..4cf8aec1b2a 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -172,8 +172,18 @@ def _get_module_lock(name):
                 lock = _DummyModuleLock(name)
             else:
                 lock = _ModuleLock(name)
-            def cb(_):
-                del _module_locks[name]
+
+            def cb(ref, name=name):
+                _imp.acquire_lock()
+                try:
+                    # bpo-31070: Check if another thread created a new lock
+                    # after the previous lock was destroyed
+                    # but before the weakref callback was called.
+                    if _module_locks.get(name) is ref:
+                        del _module_locks[name]
+                finally:
+                    _imp.release_lock()
+
             _module_locks[name] = _weakref.ref(lock, cb)
     finally:
         _imp.release_lock()
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-09-09-40-54.bpo-31070.oDyLiI.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-09-09-40-54.bpo-31070.oDyLiI.rst
new file mode 100644
index 00000000000..8f9d7b534b5
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-09-09-40-54.bpo-31070.oDyLiI.rst	
@@ -0,0 +1 @@
+Fix a race condition in importlib _get_module_lock().
diff --git a/Python/importlib.h b/Python/importlib.h
index eef1fababe9..18eb1e1225d 100644
--- a/Python/importlib.h
+++ b/Python/importlib.h
@@ -301,14 +301,14 @@ const unsigned char _Py_M__importlib[] = {
     0,0,0,114,10,0,0,0,114,11,0,0,0,114,42,0,
     0,0,141,0,0,0,115,6,0,0,0,8,2,8,4,8,
     4,114,42,0,0,0,99,1,0,0,0,0,0,0,0,3,
-    0,0,0,17,0,0,0,3,0,0,0,115,130,0,0,0,
-    116,0,106,1,131,0,1,0,122,106,121,14,116,2,136,0,
+    0,0,0,17,0,0,0,67,0,0,0,115,130,0,0,0,
+    116,0,106,1,131,0,1,0,122,106,121,14,116,2,124,0,
     25,0,131,0,125,1,87,0,110,24,4,0,116,3,107,10,
     114,48,1,0,1,0,1,0,100,1,125,1,89,0,110,2,
     88,0,124,1,100,1,107,8,114,112,116,4,100,1,107,8,
-    114,76,116,5,136,0,131,1,125,1,110,8,116,6,136,0,
-    131,1,125,1,135,0,102,1,100,2,100,3,132,8,125,2,
-    116,7,106,8,124,1,124,2,131,2,116,2,136,0,60,0,
+    114,76,116,5,124,0,131,1,125,1,110,8,116,6,124,0,
+    131,1,125,1,124,0,102,1,100,2,100,3,132,1,125,2,
+    116,7,106,8,124,1,124,2,131,2,116,2,124,0,60,0,
     87,0,100,1,116,0,106,9,131,0,1,0,88,0,124,1,
     83,0,41,4,122,139,71,101,116,32,111,114,32,99,114,101,
     97,116,101,32,116,104,101,32,109,111,100,117,108,101,32,108,
@@ -319,1487 +319,1491 @@ const unsigned char _Py_M__importlib[] = {
     32,103,108,111,98,97,108,32,105,109,112,111,114,116,32,108,
     111,99,107,32,116,111,32,112,114,111,116,101,99,116,10,32,
     32,32,32,95,109,111,100,117,108,101,95,108,111,99,107,115,
-    46,78,99,1,0,0,0,0,0,0,0,1,0,0,0,2,
-    0,0,0,19,0,0,0,115,10,0,0,0,116,0,136,0,
-    61,0,100,0,83,0,41,1,78,41,1,218,13,95,109,111,
-    100,117,108,101,95,108,111,99,107,115,41,1,218,1,95,41,
-    1,114,15,0,0,0,114,10,0,0,0,114,11,0,0,0,
-    218,2,99,98,175,0,0,0,115,2,0,0,0,0,1,122,
-    28,95,103,101,116,95,109,111,100,117,108,101,95,108,111,99,
-    107,46,60,108,111,99,97,108,115,62,46,99,98,41,10,218,
-    4,95,105,109,112,218,12,97,99,113,117,105,114,101,95,108,
-    111,99,107,114,49,0,0,0,218,8,75,101,121,69,114,114,
-    111,114,114,20,0,0,0,114,41,0,0,0,114,18,0,0,
-    0,218,8,95,119,101,97,107,114,101,102,90,3,114,101,102,
-    218,12,114,101,108,101,97,115,101,95,108,111,99,107,41,3,
-    114,15,0,0,0,114,21,0,0,0,114,51,0,0,0,114,
-    10,0,0,0,41,1,114,15,0,0,0,114,11,0,0,0,
-    114,45,0,0,0,157,0,0,0,115,28,0,0,0,0,6,
-    8,1,2,1,2,1,14,1,14,1,10,2,8,1,8,1,
-    10,2,8,1,12,2,20,2,10,2,114,45,0,0,0,99,
-    1,0,0,0,0,0,0,0,2,0,0,0,11,0,0,0,
-    67,0,0,0,115,54,0,0,0,116,0,124,0,131,1,125,
-    1,121,12,124,1,106,1,131,0,1,0,87,0,110,20,4,
-    0,116,2,107,10,114,40,1,0,1,0,1,0,89,0,110,
-    10,88,0,124,1,106,3,131,0,1,0,100,1,83,0,41,
-    2,122,189,65,99,113,117,105,114,101,115,32,116,104,101,110,
-    32,114,101,108,101,97,115,101,115,32,116,104,101,32,109,111,
-    100,117,108,101,32,108,111,99,107,32,102,111,114,32,97,32,
-    103,105,118,101,110,32,109,111,100,117,108,101,32,110,97,109,
-    101,46,10,10,32,32,32,32,84,104,105,115,32,105,115,32,
-    117,115,101,100,32,116,111,32,101,110,115,117,114,101,32,97,
-    32,109,111,100,117,108,101,32,105,115,32,99,111,109,112,108,
-    101,116,101,108,121,32,105,110,105,116,105,97,108,105,122,101,
-    100,44,32,105,110,32,116,104,101,10,32,32,32,32,101,118,
-    101,110,116,32,105,116,32,105,115,32,98,101,105,110,103,32,
-    105,109,112,111,114,116,101,100,32,98,121,32,97,110,111,116,
-    104,101,114,32,116,104,114,101,97,100,46,10,32,32,32,32,
-    78,41,4,114,45,0,0,0,114,34,0,0,0,114,17,0,
-    0,0,114,35,0,0,0,41,2,114,15,0,0,0,114,21,
+    46,78,99,2,0,0,0,0,0,0,0,2,0,0,0,10,
+    0,0,0,83,0,0,0,115,48,0,0,0,116,0,106,1,
+    131,0,1,0,122,24,116,2,106,3,124,1,131,1,124,0,
+    107,8,114,30,116,2,124,1,61,0,87,0,100,0,116,0,
+    106,4,131,0,1,0,88,0,100,0,83,0,41,1,78,41,
+    5,218,4,95,105,109,112,218,12,97,99,113,117,105,114,101,
+    95,108,111,99,107,218,13,95,109,111,100,117,108,101,95,108,
+    111,99,107,115,114,30,0,0,0,218,12,114,101,108,101,97,
+    115,101,95,108,111,99,107,41,2,218,3,114,101,102,114,15,
     0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,
-    0,0,218,19,95,108,111,99,107,95,117,110,108,111,99,107,
-    95,109,111,100,117,108,101,184,0,0,0,115,12,0,0,0,
-    0,6,8,1,2,1,12,1,14,3,6,2,114,57,0,0,
-    0,99,1,0,0,0,0,0,0,0,3,0,0,0,3,0,
-    0,0,79,0,0,0,115,10,0,0,0,124,0,124,1,124,
-    2,142,1,83,0,41,1,97,46,1,0,0,114,101,109,111,
-    118,101,95,105,109,112,111,114,116,108,105,98,95,102,114,97,
-    109,101,115,32,105,110,32,105,109,112,111,114,116,46,99,32,
-    119,105,108,108,32,97,108,119,97,121,115,32,114,101,109,111,
-    118,101,32,115,101,113,117,101,110,99,101,115,10,32,32,32,
-    32,111,102,32,105,109,112,111,114,116,108,105,98,32,102,114,
-    97,109,101,115,32,116,104,97,116,32,101,110,100,32,119,105,
-    116,104,32,97,32,99,97,108,108,32,116,111,32,116,104,105,
-    115,32,102,117,110,99,116,105,111,110,10,10,32,32,32,32,
-    85,115,101,32,105,116,32,105,110,115,116,101,97,100,32,111,
-    102,32,97,32,110,111,114,109,97,108,32,99,97,108,108,32,
-    105,110,32,112,108,97,99,101,115,32,119,104,101,114,101,32,
-    105,110,99,108,117,100,105,110,103,32,116,104,101,32,105,109,
-    112,111,114,116,108,105,98,10,32,32,32,32,102,114,97,109,
-    101,115,32,105,110,116,114,111,100,117,99,101,115,32,117,110,
-    119,97,110,116,101,100,32,110,111,105,115,101,32,105,110,116,
-    111,32,116,104,101,32,116,114,97,99,101,98,97,99,107,32,
-    40,101,46,103,46,32,119,104,101,110,32,101,120,101,99,117,
-    116,105,110,103,10,32,32,32,32,109,111,100,117,108,101,32,
-    99,111,100,101,41,10,32,32,32,32,114,10,0,0,0,41,
-    3,218,1,102,114,47,0,0,0,90,4,107,119,100,115,114,
-    10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,25,
-    95,99,97,108,108,95,119,105,116,104,95,102,114,97,109,101,
-    115,95,114,101,109,111,118,101,100,201,0,0,0,115,2,0,
-    0,0,0,8,114,59,0,0,0,114,33,0,0,0,41,1,
-    218,9,118,101,114,98,111,115,105,116,121,99,1,0,0,0,
-    1,0,0,0,3,0,0,0,4,0,0,0,71,0,0,0,
-    115,54,0,0,0,116,0,106,1,106,2,124,1,107,5,114,
-    50,124,0,106,3,100,6,131,1,115,30,100,3,124,0,23,
-    0,125,0,116,4,124,0,106,5,124,2,142,0,116,0,106,
-    6,100,4,141,2,1,0,100,5,83,0,41,7,122,61,80,
-    114,105,110,116,32,116,104,101,32,109,101,115,115,97,103,101,
-    32,116,111,32,115,116,100,101,114,114,32,105,102,32,45,118,
-    47,80,89,84,72,79,78,86,69,82,66,79,83,69,32,105,
-    115,32,116,117,114,110,101,100,32,111,110,46,250,1,35,250,
-    7,105,109,112,111,114,116,32,122,2,35,32,41,1,90,4,
-    102,105,108,101,78,41,2,114,61,0,0,0,114,62,0,0,
-    0,41,7,114,14,0,0,0,218,5,102,108,97,103,115,218,
-    7,118,101,114,98,111,115,101,218,10,115,116,97,114,116,115,
-    119,105,116,104,218,5,112,114,105,110,116,114,38,0,0,0,
-    218,6,115,116,100,101,114,114,41,3,218,7,109,101,115,115,
-    97,103,101,114,60,0,0,0,114,47,0,0,0,114,10,0,
-    0,0,114,10,0,0,0,114,11,0,0,0,218,16,95,118,
-    101,114,98,111,115,101,95,109,101,115,115,97,103,101,212,0,
-    0,0,115,8,0,0,0,0,2,12,1,10,1,8,1,114,
-    69,0,0,0,99,1,0,0,0,0,0,0,0,2,0,0,
-    0,3,0,0,0,3,0,0,0,115,26,0,0,0,135,0,
-    102,1,100,1,100,2,132,8,125,1,116,0,124,1,136,0,
-    131,2,1,0,124,1,83,0,41,3,122,49,68,101,99,111,
-    114,97,116,111,114,32,116,111,32,118,101,114,105,102,121,32,
-    116,104,101,32,110,97,109,101,100,32,109,111,100,117,108,101,
-    32,105,115,32,98,117,105,108,116,45,105,110,46,99,2,0,
-    0,0,0,0,0,0,2,0,0,0,4,0,0,0,19,0,
-    0,0,115,38,0,0,0,124,1,116,0,106,1,107,7,114,
-    28,116,2,100,1,106,3,124,1,131,1,124,1,100,2,141,
-    2,130,1,136,0,124,0,124,1,131,2,83,0,41,3,78,
-    122,29,123,33,114,125,32,105,115,32,110,111,116,32,97,32,
-    98,117,105,108,116,45,105,110,32,109,111,100,117,108,101,41,
-    1,114,15,0,0,0,41,4,114,14,0,0,0,218,20,98,
-    117,105,108,116,105,110,95,109,111,100,117,108,101,95,110,97,
-    109,101,115,218,11,73,109,112,111,114,116,69,114,114,111,114,
-    114,38,0,0,0,41,2,114,26,0,0,0,218,8,102,117,
-    108,108,110,97,109,101,41,1,218,3,102,120,110,114,10,0,
-    0,0,114,11,0,0,0,218,25,95,114,101,113,117,105,114,
-    101,115,95,98,117,105,108,116,105,110,95,119,114,97,112,112,
-    101,114,222,0,0,0,115,8,0,0,0,0,1,10,1,10,
-    1,8,1,122,52,95,114,101,113,117,105,114,101,115,95,98,
-    117,105,108,116,105,110,46,60,108,111,99,97,108,115,62,46,
-    95,114,101,113,117,105,114,101,115,95,98,117,105,108,116,105,
-    110,95,119,114,97,112,112,101,114,41,1,114,12,0,0,0,
-    41,2,114,73,0,0,0,114,74,0,0,0,114,10,0,0,
-    0,41,1,114,73,0,0,0,114,11,0,0,0,218,17,95,
-    114,101,113,117,105,114,101,115,95,98,117,105,108,116,105,110,
-    220,0,0,0,115,6,0,0,0,0,2,12,5,10,1,114,
-    75,0,0,0,99,1,0,0,0,0,0,0,0,2,0,0,
-    0,3,0,0,0,3,0,0,0,115,26,0,0,0,135,0,
-    102,1,100,1,100,2,132,8,125,1,116,0,124,1,136,0,
-    131,2,1,0,124,1,83,0,41,3,122,47,68,101,99,111,
-    114,97,116,111,114,32,116,111,32,118,101,114,105,102,121,32,
-    116,104,101,32,110,97,109,101,100,32,109,111,100,117,108,101,
-    32,105,115,32,102,114,111,122,101,110,46,99,2,0,0,0,
-    0,0,0,0,2,0,0,0,4,0,0,0,19,0,0,0,
-    115,38,0,0,0,116,0,106,1,124,1,131,1,115,28,116,
-    2,100,1,106,3,124,1,131,1,124,1,100,2,141,2,130,
-    1,136,0,124,0,124,1,131,2,83,0,41,3,78,122,27,
-    123,33,114,125,32,105,115,32,110,111,116,32,97,32,102,114,
-    111,122,101,110,32,109,111,100,117,108,101,41,1,114,15,0,
-    0,0,41,4,114,52,0,0,0,218,9,105,115,95,102,114,
-    111,122,101,110,114,71,0,0,0,114,38,0,0,0,41,2,
-    114,26,0,0,0,114,72,0,0,0,41,1,114,73,0,0,
-    0,114,10,0,0,0,114,11,0,0,0,218,24,95,114,101,
-    113,117,105,114,101,115,95,102,114,111,122,101,110,95,119,114,
-    97,112,112,101,114,233,0,0,0,115,8,0,0,0,0,1,
-    10,1,10,1,8,1,122,50,95,114,101,113,117,105,114,101,
-    115,95,102,114,111,122,101,110,46,60,108,111,99,97,108,115,
-    62,46,95,114,101,113,117,105,114,101,115,95,102,114,111,122,
-    101,110,95,119,114,97,112,112,101,114,41,1,114,12,0,0,
-    0,41,2,114,73,0,0,0,114,77,0,0,0,114,10,0,
-    0,0,41,1,114,73,0,0,0,114,11,0,0,0,218,16,
-    95,114,101,113,117,105,114,101,115,95,102,114,111,122,101,110,
-    231,0,0,0,115,6,0,0,0,0,2,12,5,10,1,114,
-    78,0,0,0,99,2,0,0,0,0,0,0,0,4,0,0,
-    0,3,0,0,0,67,0,0,0,115,62,0,0,0,116,0,
-    124,1,124,0,131,2,125,2,124,1,116,1,106,2,107,6,
-    114,50,116,1,106,2,124,1,25,0,125,3,116,3,124,2,
-    124,3,131,2,1,0,116,1,106,2,124,1,25,0,83,0,
-    116,4,124,2,131,1,83,0,100,1,83,0,41,2,122,128,
-    76,111,97,100,32,116,104,101,32,115,112,101,99,105,102,105,
-    101,100,32,109,111,100,117,108,101,32,105,110,116,111,32,115,
-    121,115,46,109,111,100,117,108,101,115,32,97,110,100,32,114,
-    101,116,117,114,110,32,105,116,46,10,10,32,32,32,32,84,
-    104,105,115,32,109,101,116,104,111,100,32,105,115,32,100,101,
-    112,114,101,99,97,116,101,100,46,32,32,85,115,101,32,108,
-    111,97,100,101,114,46,101,120,101,99,95,109,111,100,117,108,
-    101,32,105,110,115,116,101,97,100,46,10,10,32,32,32,32,
-    78,41,5,218,16,115,112,101,99,95,102,114,111,109,95,108,
-    111,97,100,101,114,114,14,0,0,0,218,7,109,111,100,117,
-    108,101,115,218,5,95,101,120,101,99,218,5,95,108,111,97,
-    100,41,4,114,26,0,0,0,114,72,0,0,0,218,4,115,
-    112,101,99,218,6,109,111,100,117,108,101,114,10,0,0,0,
-    114,10,0,0,0,114,11,0,0,0,218,17,95,108,111,97,
-    100,95,109,111,100,117,108,101,95,115,104,105,109,243,0,0,
-    0,115,12,0,0,0,0,6,10,1,10,1,10,1,10,1,
-    10,2,114,85,0,0,0,99,1,0,0,0,0,0,0,0,
-    5,0,0,0,35,0,0,0,67,0,0,0,115,216,0,0,
-    0,116,0,124,0,100,1,100,0,131,3,125,1,116,1,124,
-    1,100,2,131,2,114,54,121,10,124,1,106,2,124,0,131,
-    1,83,0,4,0,116,3,107,10,114,52,1,0,1,0,1,
-    0,89,0,110,2,88,0,121,10,124,0,106,4,125,2,87,
-    0,110,20,4,0,116,5,107,10,114,84,1,0,1,0,1,
-    0,89,0,110,18,88,0,124,2,100,0,107,9,114,102,116,
-    6,124,2,131,1,83,0,121,10,124,0,106,7,125,3,87,
-    0,110,24,4,0,116,5,107,10,114,136,1,0,1,0,1,
-    0,100,3,125,3,89,0,110,2,88,0,121,10,124,0,106,
-    8,125,4,87,0,110,50,4,0,116,5,107,10,114,198,1,
-    0,1,0,1,0,124,1,100,0,107,8,114,182,100,4,106,
-    9,124,3,131,1,83,0,100,5,106,9,124,3,124,1,131,
-    2,83,0,89,0,110,14,88,0,100,6,106,9,124,3,124,
-    4,131,2,83,0,100,0,83,0,41,7,78,218,10,95,95,
-    108,111,97,100,101,114,95,95,218,11,109,111,100,117,108,101,
-    95,114,101,112,114,250,1,63,122,13,60,109,111,100,117,108,
-    101,32,123,33,114,125,62,122,20,60,109,111,100,117,108,101,
-    32,123,33,114,125,32,40,123,33,114,125,41,62,122,23,60,
-    109,111,100,117,108,101,32,123,33,114,125,32,102,114,111,109,
-    32,123,33,114,125,62,41,10,114,6,0,0,0,114,4,0,
-    0,0,114,87,0,0,0,218,9,69,120,99,101,112,116,105,
-    111,110,218,8,95,95,115,112,101,99,95,95,218,14,65,116,
-    116,114,105,98,117,116,101,69,114,114,111,114,218,22,95,109,
-    111,100,117,108,101,95,114,101,112,114,95,102,114,111,109,95,
-    115,112,101,99,114,1,0,0,0,218,8,95,95,102,105,108,
-    101,95,95,114,38,0,0,0,41,5,114,84,0,0,0,218,
-    6,108,111,97,100,101,114,114,83,0,0,0,114,15,0,0,
-    0,218,8,102,105,108,101,110,97,109,101,114,10,0,0,0,
-    114,10,0,0,0,114,11,0,0,0,218,12,95,109,111,100,
-    117,108,101,95,114,101,112,114,3,1,0,0,115,46,0,0,
-    0,0,2,12,1,10,4,2,1,10,1,14,1,6,1,2,
-    1,10,1,14,1,6,2,8,1,8,4,2,1,10,1,14,
-    1,10,1,2,1,10,1,14,1,8,1,10,2,18,2,114,
-    96,0,0,0,99,0,0,0,0,0,0,0,0,0,0,0,
-    0,2,0,0,0,64,0,0,0,115,36,0,0,0,101,0,
-    90,1,100,0,90,2,100,1,100,2,132,0,90,3,100,3,
-    100,4,132,0,90,4,100,5,100,6,132,0,90,5,100,7,
-    83,0,41,8,218,17,95,105,110,115,116,97,108,108,101,100,
-    95,115,97,102,101,108,121,99,2,0,0,0,0,0,0,0,
-    2,0,0,0,2,0,0,0,67,0,0,0,115,18,0,0,
-    0,124,1,124,0,95,0,124,1,106,1,124,0,95,2,100,
-    0,83,0,41,1,78,41,3,218,7,95,109,111,100,117,108,
-    101,114,90,0,0,0,218,5,95,115,112,101,99,41,2,114,
-    26,0,0,0,114,84,0,0,0,114,10,0,0,0,114,10,
-    0,0,0,114,11,0,0,0,114,27,0,0,0,41,1,0,
-    0,115,4,0,0,0,0,1,6,1,122,26,95,105,110,115,
-    116,97,108,108,101,100,95,115,97,102,101,108,121,46,95,95,
-    105,110,105,116,95,95,99,1,0,0,0,0,0,0,0,1,
-    0,0,0,3,0,0,0,67,0,0,0,115,28,0,0,0,
-    100,1,124,0,106,0,95,1,124,0,106,2,116,3,106,4,
-    124,0,106,0,106,5,60,0,100,0,83,0,41,2,78,84,
-    41,6,114,99,0,0,0,218,13,95,105,110,105,116,105,97,
-    108,105,122,105,110,103,114,98,0,0,0,114,14,0,0,0,
-    114,80,0,0,0,114,15,0,0,0,41,1,114,26,0,0,
-    0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
-    114,46,0,0,0,45,1,0,0,115,4,0,0,0,0,4,
-    8,1,122,27,95,105,110,115,116,97,108,108,101,100,95,115,
-    97,102,101,108,121,46,95,95,101,110,116,101,114,95,95,99,
-    1,0,0,0,0,0,0,0,3,0,0,0,17,0,0,0,
-    71,0,0,0,115,98,0,0,0,122,82,124,0,106,0,125,
-    2,116,1,100,1,100,2,132,0,124,1,68,0,131,1,131,
-    1,114,64,121,14,116,2,106,3,124,2,106,4,61,0,87,
-    0,113,80,4,0,116,5,107,10,114,60,1,0,1,0,1,
-    0,89,0,113,80,88,0,110,16,116,6,100,3,124,2,106,
-    4,124,2,106,7,131,3,1,0,87,0,100,0,100,4,124,
-    0,106,0,95,8,88,0,100,0,83,0,41,5,78,99,1,
-    0,0,0,0,0,0,0,2,0,0,0,3,0,0,0,115,
-    0,0,0,115,22,0,0,0,124,0,93,14,125,1,124,1,
-    100,0,107,9,86,0,1,0,113,2,100,0,83,0,41,1,
-    78,114,10,0,0,0,41,2,90,2,46,48,90,3,97,114,
-    103,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
-    250,9,60,103,101,110,101,120,112,114,62,55,1,0,0,115,
-    2,0,0,0,4,0,122,45,95,105,110,115,116,97,108,108,
-    101,100,95,115,97,102,101,108,121,46,95,95,101,120,105,116,
-    95,95,46,60,108,111,99,97,108,115,62,46,60,103,101,110,
-    101,120,112,114,62,122,18,105,109,112,111,114,116,32,123,33,
-    114,125,32,35,32,123,33,114,125,70,41,9,114,99,0,0,
-    0,218,3,97,110,121,114,14,0,0,0,114,80,0,0,0,
-    114,15,0,0,0,114,54,0,0,0,114,69,0,0,0,114,
-    94,0,0,0,114,100,0,0,0,41,3,114,26,0,0,0,
-    114,47,0,0,0,114,83,0,0,0,114,10,0,0,0,114,
-    10,0,0,0,114,11,0,0,0,114,48,0,0,0,52,1,
-    0,0,115,18,0,0,0,0,1,2,1,6,1,18,1,2,
-    1,14,1,14,1,8,2,20,2,122,26,95,105,110,115,116,
-    97,108,108,101,100,95,115,97,102,101,108,121,46,95,95,101,
-    120,105,116,95,95,78,41,6,114,1,0,0,0,114,0,0,
-    0,0,114,2,0,0,0,114,27,0,0,0,114,46,0,0,
-    0,114,48,0,0,0,114,10,0,0,0,114,10,0,0,0,
-    114,10,0,0,0,114,11,0,0,0,114,97,0,0,0,39,
-    1,0,0,115,6,0,0,0,8,2,8,4,8,7,114,97,
-    0,0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,
-    4,0,0,0,64,0,0,0,115,114,0,0,0,101,0,90,
-    1,100,0,90,2,100,1,90,3,100,2,100,2,100,2,100,
-    3,156,3,100,4,100,5,132,2,90,4,100,6,100,7,132,
-    0,90,5,100,8,100,9,132,0,90,6,101,7,100,10,100,
-    11,132,0,131,1,90,8,101,8,106,9,100,12,100,11,132,
-    0,131,1,90,8,101,7,100,13,100,14,132,0,131,1,90,
-    10,101,7,100,15,100,16,132,0,131,1,90,11,101,11,106,
-    9,100,17,100,16,132,0,131,1,90,11,100,2,83,0,41,
-    18,218,10,77,111,100,117,108,101,83,112,101,99,97,208,5,
-    0,0,84,104,101,32,115,112,101,99,105,102,105,99,97,116,
-    105,111,110,32,102,111,114,32,97,32,109,111,100,117,108,101,
-    44,32,117,115,101,100,32,102,111,114,32,108,111,97,100,105,
-    110,103,46,10,10,32,32,32,32,65,32,109,111,100,117,108,
-    101,39,115,32,115,112,101,99,32,105,115,32,116,104,101,32,
-    115,111,117,114,99,101,32,102,111,114,32,105,110,102,111,114,
-    109,97,116,105,111,110,32,97,98,111,117,116,32,116,104,101,
-    32,109,111,100,117,108,101,46,32,32,70,111,114,10,32,32,
-    32,32,100,97,116,97,32,97,115,115,111,99,105,97,116,101,
-    100,32,119,105,116,104,32,116,104,101,32,109,111,100,117,108,
-    101,44,32,105,110,99,108,117,100,105,110,103,32,115,111,117,
-    114,99,101,44,32,117,115,101,32,116,104,101,32,115,112,101,
-    99,39,115,10,32,32,32,32,108,111,97,100,101,114,46,10,
-    10,32,32,32,32,96,110,97,109,101,96,32,105,115,32,116,
-    104,101,32,97,98,115,111,108,117,116,101,32,110,97,109,101,
-    32,111,102,32,116,104,101,32,109,111,100,117,108,101,46,32,
-    32,96,108,111,97,100,101,114,96,32,105,115,32,116,104,101,
-    32,108,111,97,100,101,114,10,32,32,32,32,116,111,32,117,
-    115,101,32,119,104,101,110,32,108,111,97,100,105,110,103,32,
-    116,104,101,32,109,111,100,117,108,101,46,32,32,96,112,97,
-    114,101,110,116,96,32,105,115,32,116,104,101,32,110,97,109,
-    101,32,111,102,32,116,104,101,10,32,32,32,32,112,97,99,
-    107,97,103,101,32,116,104,101,32,109,111,100,117,108,101,32,
-    105,115,32,105,110,46,32,32,84,104,101,32,112,97,114,101,
-    110,116,32,105,115,32,100,101,114,105,118,101,100,32,102,114,
-    111,109,32,116,104,101,32,110,97,109,101,46,10,10,32,32,
-    32,32,96,105,115,95,112,97,99,107,97,103,101,96,32,100,
-    101,116,101,114,109,105,110,101,115,32,105,102,32,116,104,101,
-    32,109,111,100,117,108,101,32,105,115,32,99,111,110,115,105,
-    100,101,114,101,100,32,97,32,112,97,99,107,97,103,101,32,
-    111,114,10,32,32,32,32,110,111,116,46,32,32,79,110,32,
-    109,111,100,117,108,101,115,32,116,104,105,115,32,105,115,32,
-    114,101,102,108,101,99,116,101,100,32,98,121,32,116,104,101,
-    32,96,95,95,112,97,116,104,95,95,96,32,97,116,116,114,
-    105,98,117,116,101,46,10,10,32,32,32,32,96,111,114,105,
-    103,105,110,96,32,105,115,32,116,104,101,32,115,112,101,99,
-    105,102,105,99,32,108,111,99,97,116,105,111,110,32,117,115,
-    101,100,32,98,121,32,116,104,101,32,108,111,97,100,101,114,
-    32,102,114,111,109,32,119,104,105,99,104,32,116,111,10,32,
-    32,32,32,108,111,97,100,32,116,104,101,32,109,111,100,117,
-    108,101,44,32,105,102,32,116,104,97,116,32,105,110,102,111,
-    114,109,97,116,105,111,110,32,105,115,32,97,118,97,105,108,
-    97,98,108,101,46,32,32,87,104,101,110,32,102,105,108,101,
-    110,97,109,101,32,105,115,10,32,32,32,32,115,101,116,44,
-    32,111,114,105,103,105,110,32,119,105,108,108,32,109,97,116,
-    99,104,46,10,10,32,32,32,32,96,104,97,115,95,108,111,
-    99,97,116,105,111,110,96,32,105,110,100,105,99,97,116,101,
-    115,32,116,104,97,116,32,97,32,115,112,101,99,39,115,32,
-    34,111,114,105,103,105,110,34,32,114,101,102,108,101,99,116,
-    115,32,97,32,108,111,99,97,116,105,111,110,46,10,32,32,
-    32,32,87,104,101,110,32,116,104,105,115,32,105,115,32,84,
-    114,117,101,44,32,96,95,95,102,105,108,101,95,95,96,32,
-    97,116,116,114,105,98,117,116,101,32,111,102,32,116,104,101,
-    32,109,111,100,117,108,101,32,105,115,32,115,101,116,46,10,
-    10,32,32,32,32,96,99,97,99,104,101,100,96,32,105,115,
-    32,116,104,101,32,108,111,99,97,116,105,111,110,32,111,102,
-    32,116,104,101,32,99,97,99,104,101,100,32,98,121,116,101,
-    99,111,100,101,32,102,105,108,101,44,32,105,102,32,97,110,
-    121,46,32,32,73,116,10,32,32,32,32,99,111,114,114,101,
-    115,112,111,110,100,115,32,116,111,32,116,104,101,32,96,95,
-    95,99,97,99,104,101,100,95,95,96,32,97,116,116,114,105,
-    98,117,116,101,46,10,10,32,32,32,32,96,115,117,98,109,
-    111,100,117,108,101,95,115,101,97,114,99,104,95,108,111,99,
-    97,116,105,111,110,115,96,32,105,115,32,116,104,101,32,115,
-    101,113,117,101,110,99,101,32,111,102,32,112,97,116,104,32,
-    101,110,116,114,105,101,115,32,116,111,10,32,32,32,32,115,
-    101,97,114,99,104,32,119,104,101,110,32,105,109,112,111,114,
-    116,105,110,103,32,115,117,98,109,111,100,117,108,101,115,46,
-    32,32,73,102,32,115,101,116,44,32,105,115,95,112,97,99,
-    107,97,103,101,32,115,104,111,117,108,100,32,98,101,10,32,
-    32,32,32,84,114,117,101,45,45,97,110,100,32,70,97,108,
-    115,101,32,111,116,104,101,114,119,105,115,101,46,10,10,32,
-    32,32,32,80,97,99,107,97,103,101,115,32,97,114,101,32,
-    115,105,109,112,108,121,32,109,111,100,117,108,101,115,32,116,
-    104,97,116,32,40,109,97,121,41,32,104,97,118,101,32,115,
-    117,98,109,111,100,117,108,101,115,46,32,32,73,102,32,97,
-    32,115,112,101,99,10,32,32,32,32,104,97,115,32,97,32,
-    110,111,110,45,78,111,110,101,32,118,97,108,117,101,32,105,
-    110,32,96,115,117,98,109,111,100,117,108,101,95,115,101,97,
-    114,99,104,95,108,111,99,97,116,105,111,110,115,96,44,32,
-    116,104,101,32,105,109,112,111,114,116,10,32,32,32,32,115,
-    121,115,116,101,109,32,119,105,108,108,32,99,111,110,115,105,
-    100,101,114,32,109,111,100,117,108,101,115,32,108,111,97,100,
-    101,100,32,102,114,111,109,32,116,104,101,32,115,112,101,99,
-    32,97,115,32,112,97,99,107,97,103,101,115,46,10,10,32,
-    32,32,32,79,110,108,121,32,102,105,110,100,101,114,115,32,
-    40,115,101,101,32,105,109,112,111,114,116,108,105,98,46,97,
-    98,99,46,77,101,116,97,80,97,116,104,70,105,110,100,101,
-    114,32,97,110,100,10,32,32,32,32,105,109,112,111,114,116,
-    108,105,98,46,97,98,99,46,80,97,116,104,69,110,116,114,
-    121,70,105,110,100,101,114,41,32,115,104,111,117,108,100,32,
-    109,111,100,105,102,121,32,77,111,100,117,108,101,83,112,101,
-    99,32,105,110,115,116,97,110,99,101,115,46,10,10,32,32,
-    32,32,78,41,3,218,6,111,114,105,103,105,110,218,12,108,
-    111,97,100,101,114,95,115,116,97,116,101,218,10,105,115,95,
-    112,97,99,107,97,103,101,99,3,0,0,0,3,0,0,0,
-    6,0,0,0,2,0,0,0,67,0,0,0,115,54,0,0,
-    0,124,1,124,0,95,0,124,2,124,0,95,1,124,3,124,
-    0,95,2,124,4,124,0,95,3,124,5,114,32,103,0,110,
-    2,100,0,124,0,95,4,100,1,124,0,95,5,100,0,124,
-    0,95,6,100,0,83,0,41,2,78,70,41,7,114,15,0,
-    0,0,114,94,0,0,0,114,104,0,0,0,114,105,0,0,
-    0,218,26,115,117,98,109,111,100,117,108,101,95,115,101,97,
-    114,99,104,95,108,111,99,97,116,105,111,110,115,218,13,95,
-    115,101,116,95,102,105,108,101,97,116,116,114,218,7,95,99,
-    97,99,104,101,100,41,6,114,26,0,0,0,114,15,0,0,
-    0,114,94,0,0,0,114,104,0,0,0,114,105,0,0,0,
-    114,106,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
-    11,0,0,0,114,27,0,0,0,103,1,0,0,115,14,0,
-    0,0,0,2,6,1,6,1,6,1,6,1,14,3,6,1,
-    122,19,77,111,100,117,108,101,83,112,101,99,46,95,95,105,
-    110,105,116,95,95,99,1,0,0,0,0,0,0,0,2,0,
-    0,0,4,0,0,0,67,0,0,0,115,102,0,0,0,100,
-    1,106,0,124,0,106,1,131,1,100,2,106,0,124,0,106,
-    2,131,1,103,2,125,1,124,0,106,3,100,0,107,9,114,
-    52,124,1,106,4,100,3,106,0,124,0,106,3,131,1,131,
-    1,1,0,124,0,106,5,100,0,107,9,114,80,124,1,106,
-    4,100,4,106,0,124,0,106,5,131,1,131,1,1,0,100,
-    5,106,0,124,0,106,6,106,7,100,6,106,8,124,1,131,
-    1,131,2,83,0,41,7,78,122,9,110,97,109,101,61,123,
-    33,114,125,122,11,108,111,97,100,101,114,61,123,33,114,125,
-    122,11,111,114,105,103,105,110,61,123,33,114,125,122,29,115,
-    117,98,109,111,100,117,108,101,95,115,101,97,114,99,104,95,
-    108,111,99,97,116,105,111,110,115,61,123,125,122,6,123,125,
-    40,123,125,41,122,2,44,32,41,9,114,38,0,0,0,114,
+    0,0,218,2,99,98,176,0,0,0,115,10,0,0,0,0,
+    1,8,1,2,4,14,1,10,2,122,28,95,103,101,116,95,
+    109,111,100,117,108,101,95,108,111,99,107,46,60,108,111,99,
+    97,108,115,62,46,99,98,41,10,114,49,0,0,0,114,50,
+    0,0,0,114,51,0,0,0,218,8,75,101,121,69,114,114,
+    111,114,114,20,0,0,0,114,41,0,0,0,114,18,0,0,
+    0,218,8,95,119,101,97,107,114,101,102,114,53,0,0,0,
+    114,52,0,0,0,41,3,114,15,0,0,0,114,21,0,0,
+    0,114,54,0,0,0,114,10,0,0,0,114,10,0,0,0,
+    114,11,0,0,0,114,45,0,0,0,157,0,0,0,115,28,
+    0,0,0,0,6,8,1,2,1,2,1,14,1,14,1,10,
+    2,8,1,8,1,10,2,8,2,12,11,20,2,10,2,114,
+    45,0,0,0,99,1,0,0,0,0,0,0,0,2,0,0,
+    0,11,0,0,0,67,0,0,0,115,54,0,0,0,116,0,
+    124,0,131,1,125,1,121,12,124,1,106,1,131,0,1,0,
+    87,0,110,20,4,0,116,2,107,10,114,40,1,0,1,0,
+    1,0,89,0,110,10,88,0,124,1,106,3,131,0,1,0,
+    100,1,83,0,41,2,122,189,65,99,113,117,105,114,101,115,
+    32,116,104,101,110,32,114,101,108,101,97,115,101,115,32,116,
+    104,101,32,109,111,100,117,108,101,32,108,111,99,107,32,102,
+    111,114,32,97,32,103,105,118,101,110,32,109,111,100,117,108,
+    101,32,110,97,109,101,46,10,10,32,32,32,32,84,104,105,
+    115,32,105,115,32,117,115,101,100,32,116,111,32,101,110,115,
+    117,114,101,32,97,32,109,111,100,117,108,101,32,105,115,32,
+    99,111,109,112,108,101,116,101,108,121,32,105,110,105,116,105,
+    97,108,105,122,101,100,44,32,105,110,32,116,104,101,10,32,
+    32,32,32,101,118,101,110,116,32,105,116,32,105,115,32,98,
+    101,105,110,103,32,105,109,112,111,114,116,101,100,32,98,121,
+    32,97,110,111,116,104,101,114,32,116,104,114,101,97,100,46,
+    10,32,32,32,32,78,41,4,114,45,0,0,0,114,34,0,
+    0,0,114,17,0,0,0,114,35,0,0,0,41,2,114,15,
+    0,0,0,114,21,0,0,0,114,10,0,0,0,114,10,0,
+    0,0,114,11,0,0,0,218,19,95,108,111,99,107,95,117,
+    110,108,111,99,107,95,109,111,100,117,108,101,194,0,0,0,
+    115,12,0,0,0,0,6,8,1,2,1,12,1,14,3,6,
+    2,114,57,0,0,0,99,1,0,0,0,0,0,0,0,3,
+    0,0,0,3,0,0,0,79,0,0,0,115,10,0,0,0,
+    124,0,124,1,124,2,142,1,83,0,41,1,97,46,1,0,
+    0,114,101,109,111,118,101,95,105,109,112,111,114,116,108,105,
+    98,95,102,114,97,109,101,115,32,105,110,32,105,109,112,111,
+    114,116,46,99,32,119,105,108,108,32,97,108,119,97,121,115,
+    32,114,101,109,111,118,101,32,115,101,113,117,101,110,99,101,
+    115,10,32,32,32,32,111,102,32,105,109,112,111,114,116,108,
+    105,98,32,102,114,97,109,101,115,32,116,104,97,116,32,101,
+    110,100,32,119,105,116,104,32,97,32,99,97,108,108,32,116,
+    111,32,116,104,105,115,32,102,117,110,99,116,105,111,110,10,
+    10,32,32,32,32,85,115,101,32,105,116,32,105,110,115,116,
+    101,97,100,32,111,102,32,97,32,110,111,114,109,97,108,32,
+    99,97,108,108,32,105,110,32,112,108,97,99,101,115,32,119,
+    104,101,114,101,32,105,110,99,108,117,100,105,110,103,32,116,
+    104,101,32,105,109,112,111,114,116,108,105,98,10,32,32,32,
+    32,102,114,97,109,101,115,32,105,110,116,114,111,100,117,99,
+    101,115,32,117,110,119,97,110,116,101,100,32,110,111,105,115,
+    101,32,105,110,116,111,32,116,104,101,32,116,114,97,99,101,
+    98,97,99,107,32,40,101,46,103,46,32,119,104,101,110,32,
+    101,120,101,99,117,116,105,110,103,10,32,32,32,32,109,111,
+    100,117,108,101,32,99,111,100,101,41,10,32,32,32,32,114,
+    10,0,0,0,41,3,218,1,102,114,47,0,0,0,90,4,
+    107,119,100,115,114,10,0,0,0,114,10,0,0,0,114,11,
+    0,0,0,218,25,95,99,97,108,108,95,119,105,116,104,95,
+    102,114,97,109,101,115,95,114,101,109,111,118,101,100,211,0,
+    0,0,115,2,0,0,0,0,8,114,59,0,0,0,114,33,
+    0,0,0,41,1,218,9,118,101,114,98,111,115,105,116,121,
+    99,1,0,0,0,1,0,0,0,3,0,0,0,4,0,0,
+    0,71,0,0,0,115,54,0,0,0,116,0,106,1,106,2,
+    124,1,107,5,114,50,124,0,106,3,100,6,131,1,115,30,
+    100,3,124,0,23,0,125,0,116,4,124,0,106,5,124,2,
+    142,0,116,0,106,6,100,4,141,2,1,0,100,5,83,0,
+    41,7,122,61,80,114,105,110,116,32,116,104,101,32,109,101,
+    115,115,97,103,101,32,116,111,32,115,116,100,101,114,114,32,
+    105,102,32,45,118,47,80,89,84,72,79,78,86,69,82,66,
+    79,83,69,32,105,115,32,116,117,114,110,101,100,32,111,110,
+    46,250,1,35,250,7,105,109,112,111,114,116,32,122,2,35,
+    32,41,1,90,4,102,105,108,101,78,41,2,114,61,0,0,
+    0,114,62,0,0,0,41,7,114,14,0,0,0,218,5,102,
+    108,97,103,115,218,7,118,101,114,98,111,115,101,218,10,115,
+    116,97,114,116,115,119,105,116,104,218,5,112,114,105,110,116,
+    114,38,0,0,0,218,6,115,116,100,101,114,114,41,3,218,
+    7,109,101,115,115,97,103,101,114,60,0,0,0,114,47,0,
+    0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,
+    0,218,16,95,118,101,114,98,111,115,101,95,109,101,115,115,
+    97,103,101,222,0,0,0,115,8,0,0,0,0,2,12,1,
+    10,1,8,1,114,69,0,0,0,99,1,0,0,0,0,0,
+    0,0,2,0,0,0,3,0,0,0,3,0,0,0,115,26,
+    0,0,0,135,0,102,1,100,1,100,2,132,8,125,1,116,
+    0,124,1,136,0,131,2,1,0,124,1,83,0,41,3,122,
+    49,68,101,99,111,114,97,116,111,114,32,116,111,32,118,101,
+    114,105,102,121,32,116,104,101,32,110,97,109,101,100,32,109,
+    111,100,117,108,101,32,105,115,32,98,117,105,108,116,45,105,
+    110,46,99,2,0,0,0,0,0,0,0,2,0,0,0,4,
+    0,0,0,19,0,0,0,115,38,0,0,0,124,1,116,0,
+    106,1,107,7,114,28,116,2,100,1,106,3,124,1,131,1,
+    124,1,100,2,141,2,130,1,136,0,124,0,124,1,131,2,
+    83,0,41,3,78,122,29,123,33,114,125,32,105,115,32,110,
+    111,116,32,97,32,98,117,105,108,116,45,105,110,32,109,111,
+    100,117,108,101,41,1,114,15,0,0,0,41,4,114,14,0,
+    0,0,218,20,98,117,105,108,116,105,110,95,109,111,100,117,
+    108,101,95,110,97,109,101,115,218,11,73,109,112,111,114,116,
+    69,114,114,111,114,114,38,0,0,0,41,2,114,26,0,0,
+    0,218,8,102,117,108,108,110,97,109,101,41,1,218,3,102,
+    120,110,114,10,0,0,0,114,11,0,0,0,218,25,95,114,
+    101,113,117,105,114,101,115,95,98,117,105,108,116,105,110,95,
+    119,114,97,112,112,101,114,232,0,0,0,115,8,0,0,0,
+    0,1,10,1,10,1,8,1,122,52,95,114,101,113,117,105,
+    114,101,115,95,98,117,105,108,116,105,110,46,60,108,111,99,
+    97,108,115,62,46,95,114,101,113,117,105,114,101,115,95,98,
+    117,105,108,116,105,110,95,119,114,97,112,112,101,114,41,1,
+    114,12,0,0,0,41,2,114,73,0,0,0,114,74,0,0,
+    0,114,10,0,0,0,41,1,114,73,0,0,0,114,11,0,
+    0,0,218,17,95,114,101,113,117,105,114,101,115,95,98,117,
+    105,108,116,105,110,230,0,0,0,115,6,0,0,0,0,2,
+    12,5,10,1,114,75,0,0,0,99,1,0,0,0,0,0,
+    0,0,2,0,0,0,3,0,0,0,3,0,0,0,115,26,
+    0,0,0,135,0,102,1,100,1,100,2,132,8,125,1,116,
+    0,124,1,136,0,131,2,1,0,124,1,83,0,41,3,122,
+    47,68,101,99,111,114,97,116,111,114,32,116,111,32,118,101,
+    114,105,102,121,32,116,104,101,32,110,97,109,101,100,32,109,
+    111,100,117,108,101,32,105,115,32,102,114,111,122,101,110,46,
+    99,2,0,0,0,0,0,0,0,2,0,0,0,4,0,0,
+    0,19,0,0,0,115,38,0,0,0,116,0,106,1,124,1,
+    131,1,115,28,116,2,100,1,106,3,124,1,131,1,124,1,
+    100,2,141,2,130,1,136,0,124,0,124,1,131,2,83,0,
+    41,3,78,122,27,123,33,114,125,32,105,115,32,110,111,116,
+    32,97,32,102,114,111,122,101,110,32,109,111,100,117,108,101,
+    41,1,114,15,0,0,0,41,4,114,49,0,0,0,218,9,
+    105,115,95,102,114,111,122,101,110,114,71,0,0,0,114,38,
+    0,0,0,41,2,114,26,0,0,0,114,72,0,0,0,41,
+    1,114,73,0,0,0,114,10,0,0,0,114,11,0,0,0,
+    218,24,95,114,101,113,117,105,114,101,115,95,102,114,111,122,
+    101,110,95,119,114,97,112,112,101,114,243,0,0,0,115,8,
+    0,0,0,0,1,10,1,10,1,8,1,122,50,95,114,101,
+    113,117,105,114,101,115,95,102,114,111,122,101,110,46,60,108,
+    111,99,97,108,115,62,46,95,114,101,113,117,105,114,101,115,
+    95,102,114,111,122,101,110,95,119,114,97,112,112,101,114,41,
+    1,114,12,0,0,0,41,2,114,73,0,0,0,114,77,0,
+    0,0,114,10,0,0,0,41,1,114,73,0,0,0,114,11,
+    0,0,0,218,16,95,114,101,113,117,105,114,101,115,95,102,
+    114,111,122,101,110,241,0,0,0,115,6,0,0,0,0,2,
+    12,5,10,1,114,78,0,0,0,99,2,0,0,0,0,0,
+    0,0,4,0,0,0,3,0,0,0,67,0,0,0,115,62,
+    0,0,0,116,0,124,1,124,0,131,2,125,2,124,1,116,
+    1,106,2,107,6,114,50,116,1,106,2,124,1,25,0,125,
+    3,116,3,124,2,124,3,131,2,1,0,116,1,106,2,124,
+    1,25,0,83,0,116,4,124,2,131,1,83,0,100,1,83,
+    0,41,2,122,128,76,111,97,100,32,116,104,101,32,115,112,
+    101,99,105,102,105,101,100,32,109,111,100,117,108,101,32,105,
+    110,116,111,32,115,121,115,46,109,111,100,117,108,101,115,32,
+    97,110,100,32,114,101,116,117,114,110,32,105,116,46,10,10,
+    32,32,32,32,84,104,105,115,32,109,101,116,104,111,100,32,
+    105,115,32,100,101,112,114,101,99,97,116,101,100,46,32,32,
+    85,115,101,32,108,111,97,100,101,114,46,101,120,101,99,95,
+    109,111,100,117,108,101,32,105,110,115,116,101,97,100,46,10,
+    10,32,32,32,32,78,41,5,218,16,115,112,101,99,95,102,
+    114,111,109,95,108,111,97,100,101,114,114,14,0,0,0,218,
+    7,109,111,100,117,108,101,115,218,5,95,101,120,101,99,218,
+    5,95,108,111,97,100,41,4,114,26,0,0,0,114,72,0,
+    0,0,218,4,115,112,101,99,218,6,109,111,100,117,108,101,
+    114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,
+    17,95,108,111,97,100,95,109,111,100,117,108,101,95,115,104,
+    105,109,253,0,0,0,115,12,0,0,0,0,6,10,1,10,
+    1,10,1,10,1,10,2,114,85,0,0,0,99,1,0,0,
+    0,0,0,0,0,5,0,0,0,35,0,0,0,67,0,0,
+    0,115,216,0,0,0,116,0,124,0,100,1,100,0,131,3,
+    125,1,116,1,124,1,100,2,131,2,114,54,121,10,124,1,
+    106,2,124,0,131,1,83,0,4,0,116,3,107,10,114,52,
+    1,0,1,0,1,0,89,0,110,2,88,0,121,10,124,0,
+    106,4,125,2,87,0,110,20,4,0,116,5,107,10,114,84,
+    1,0,1,0,1,0,89,0,110,18,88,0,124,2,100,0,
+    107,9,114,102,116,6,124,2,131,1,83,0,121,10,124,0,
+    106,7,125,3,87,0,110,24,4,0,116,5,107,10,114,136,
+    1,0,1,0,1,0,100,3,125,3,89,0,110,2,88,0,
+    121,10,124,0,106,8,125,4,87,0,110,50,4,0,116,5,
+    107,10,114,198,1,0,1,0,1,0,124,1,100,0,107,8,
+    114,182,100,4,106,9,124,3,131,1,83,0,100,5,106,9,
+    124,3,124,1,131,2,83,0,89,0,110,14,88,0,100,6,
+    106,9,124,3,124,4,131,2,83,0,100,0,83,0,41,7,
+    78,218,10,95,95,108,111,97,100,101,114,95,95,218,11,109,
+    111,100,117,108,101,95,114,101,112,114,250,1,63,122,13,60,
+    109,111,100,117,108,101,32,123,33,114,125,62,122,20,60,109,
+    111,100,117,108,101,32,123,33,114,125,32,40,123,33,114,125,
+    41,62,122,23,60,109,111,100,117,108,101,32,123,33,114,125,
+    32,102,114,111,109,32,123,33,114,125,62,41,10,114,6,0,
+    0,0,114,4,0,0,0,114,87,0,0,0,218,9,69,120,
+    99,101,112,116,105,111,110,218,8,95,95,115,112,101,99,95,
+    95,218,14,65,116,116,114,105,98,117,116,101,69,114,114,111,
+    114,218,22,95,109,111,100,117,108,101,95,114,101,112,114,95,
+    102,114,111,109,95,115,112,101,99,114,1,0,0,0,218,8,
+    95,95,102,105,108,101,95,95,114,38,0,0,0,41,5,114,
+    84,0,0,0,218,6,108,111,97,100,101,114,114,83,0,0,
+    0,114,15,0,0,0,218,8,102,105,108,101,110,97,109,101,
+    114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,
+    12,95,109,111,100,117,108,101,95,114,101,112,114,13,1,0,
+    0,115,46,0,0,0,0,2,12,1,10,4,2,1,10,1,
+    14,1,6,1,2,1,10,1,14,1,6,2,8,1,8,4,
+    2,1,10,1,14,1,10,1,2,1,10,1,14,1,8,1,
+    10,2,18,2,114,96,0,0,0,99,0,0,0,0,0,0,
+    0,0,0,0,0,0,2,0,0,0,64,0,0,0,115,36,
+    0,0,0,101,0,90,1,100,0,90,2,100,1,100,2,132,
+    0,90,3,100,3,100,4,132,0,90,4,100,5,100,6,132,
+    0,90,5,100,7,83,0,41,8,218,17,95,105,110,115,116,
+    97,108,108,101,100,95,115,97,102,101,108,121,99,2,0,0,
+    0,0,0,0,0,2,0,0,0,2,0,0,0,67,0,0,
+    0,115,18,0,0,0,124,1,124,0,95,0,124,1,106,1,
+    124,0,95,2,100,0,83,0,41,1,78,41,3,218,7,95,
+    109,111,100,117,108,101,114,90,0,0,0,218,5,95,115,112,
+    101,99,41,2,114,26,0,0,0,114,84,0,0,0,114,10,
+    0,0,0,114,10,0,0,0,114,11,0,0,0,114,27,0,
+    0,0,51,1,0,0,115,4,0,0,0,0,1,6,1,122,
+    26,95,105,110,115,116,97,108,108,101,100,95,115,97,102,101,
+    108,121,46,95,95,105,110,105,116,95,95,99,1,0,0,0,
+    0,0,0,0,1,0,0,0,3,0,0,0,67,0,0,0,
+    115,28,0,0,0,100,1,124,0,106,0,95,1,124,0,106,
+    2,116,3,106,4,124,0,106,0,106,5,60,0,100,0,83,
+    0,41,2,78,84,41,6,114,99,0,0,0,218,13,95,105,
+    110,105,116,105,97,108,105,122,105,110,103,114,98,0,0,0,
+    114,14,0,0,0,114,80,0,0,0,114,15,0,0,0,41,
+    1,114,26,0,0,0,114,10,0,0,0,114,10,0,0,0,
+    114,11,0,0,0,114,46,0,0,0,55,1,0,0,115,4,
+    0,0,0,0,4,8,1,122,27,95,105,110,115,116,97,108,
+    108,101,100,95,115,97,102,101,108,121,46,95,95,101,110,116,
+    101,114,95,95,99,1,0,0,0,0,0,0,0,3,0,0,
+    0,17,0,0,0,71,0,0,0,115,98,0,0,0,122,82,
+    124,0,106,0,125,2,116,1,100,1,100,2,132,0,124,1,
+    68,0,131,1,131,1,114,64,121,14,116,2,106,3,124,2,
+    106,4,61,0,87,0,113,80,4,0,116,5,107,10,114,60,
+    1,0,1,0,1,0,89,0,113,80,88,0,110,16,116,6,
+    100,3,124,2,106,4,124,2,106,7,131,3,1,0,87,0,
+    100,0,100,4,124,0,106,0,95,8,88,0,100,0,83,0,
+    41,5,78,99,1,0,0,0,0,0,0,0,2,0,0,0,
+    3,0,0,0,115,0,0,0,115,22,0,0,0,124,0,93,
+    14,125,1,124,1,100,0,107,9,86,0,1,0,113,2,100,
+    0,83,0,41,1,78,114,10,0,0,0,41,2,90,2,46,
+    48,90,3,97,114,103,114,10,0,0,0,114,10,0,0,0,
+    114,11,0,0,0,250,9,60,103,101,110,101,120,112,114,62,
+    65,1,0,0,115,2,0,0,0,4,0,122,45,95,105,110,
+    115,116,97,108,108,101,100,95,115,97,102,101,108,121,46,95,
+    95,101,120,105,116,95,95,46,60,108,111,99,97,108,115,62,
+    46,60,103,101,110,101,120,112,114,62,122,18,105,109,112,111,
+    114,116,32,123,33,114,125,32,35,32,123,33,114,125,70,41,
+    9,114,99,0,0,0,218,3,97,110,121,114,14,0,0,0,
+    114,80,0,0,0,114,15,0,0,0,114,55,0,0,0,114,
+    69,0,0,0,114,94,0,0,0,114,100,0,0,0,41,3,
+    114,26,0,0,0,114,47,0,0,0,114,83,0,0,0,114,
+    10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,48,
+    0,0,0,62,1,0,0,115,18,0,0,0,0,1,2,1,
+    6,1,18,1,2,1,14,1,14,1,8,2,20,2,122,26,
+    95,105,110,115,116,97,108,108,101,100,95,115,97,102,101,108,
+    121,46,95,95,101,120,105,116,95,95,78,41,6,114,1,0,
+    0,0,114,0,0,0,0,114,2,0,0,0,114,27,0,0,
+    0,114,46,0,0,0,114,48,0,0,0,114,10,0,0,0,
+    114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,
+    97,0,0,0,49,1,0,0,115,6,0,0,0,8,2,8,
+    4,8,7,114,97,0,0,0,99,0,0,0,0,0,0,0,
+    0,0,0,0,0,4,0,0,0,64,0,0,0,115,114,0,
+    0,0,101,0,90,1,100,0,90,2,100,1,90,3,100,2,
+    100,2,100,2,100,3,156,3,100,4,100,5,132,2,90,4,
+    100,6,100,7,132,0,90,5,100,8,100,9,132,0,90,6,
+    101,7,100,10,100,11,132,0,131,1,90,8,101,8,106,9,
+    100,12,100,11,132,0,131,1,90,8,101,7,100,13,100,14,
+    132,0,131,1,90,10,101,7,100,15,100,16,132,0,131,1,
+    90,11,101,11,106,9,100,17,100,16,132,0,131,1,90,11,
+    100,2,83,0,41,18,218,10,77,111,100,117,108,101,83,112,
+    101,99,97,208,5,0,0,84,104,101,32,115,112,101,99,105,
+    102,105,99,97,116,105,111,110,32,102,111,114,32,97,32,109,
+    111,100,117,108,101,44,32,117,115,101,100,32,102,111,114,32,
+    108,111,97,100,105,110,103,46,10,10,32,32,32,32,65,32,
+    109,111,100,117,108,101,39,115,32,115,112,101,99,32,105,115,
+    32,116,104,101,32,115,111,117,114,99,101,32,102,111,114,32,
+    105,110,102,111,114,109,97,116,105,111,110,32,97,98,111,117,
+    116,32,116,104,101,32,109,111,100,117,108,101,46,32,32,70,
+    111,114,10,32,32,32,32,100,97,116,97,32,97,115,115,111,
+    99,105,97,116,101,100,32,119,105,116,104,32,116,104,101,32,
+    109,111,100,117,108,101,44,32,105,110,99,108,117,100,105,110,
+    103,32,115,111,117,114,99,101,44,32,117,115,101,32,116,104,
+    101,32,115,112,101,99,39,115,10,32,32,32,32,108,111,97,
+    100,101,114,46,10,10,32,32,32,32,96,110,97,109,101,96,
+    32,105,115,32,116,104,101,32,97,98,115,111,108,117,116,101,
+    32,110,97,109,101,32,111,102,32,116,104,101,32,109,111,100,
+    117,108,101,46,32,32,96,108,111,97,100,101,114,96,32,105,
+    115,32,116,104,101,32,108,111,97,100,101,114,10,32,32,32,
+    32,116,111,32,117,115,101,32,119,104,101,110,32,108,111,97,
+    100,105,110,103,32,116,104,101,32,109,111,100,117,108,101,46,
+    32,32,96,112,97,114,101,110,116,96,32,105,115,32,116,104,
+    101,32,110,97,109,101,32,111,102,32,116,104,101,10,32,32,
+    32,32,112,97,99,107,97,103,101,32,116,104,101,32,109,111,
+    100,117,108,101,32,105,115,32,105,110,46,32,32,84,104,101,
+    32,112,97,114,101,110,116,32,105,115,32,100,101,114,105,118,
+    101,100,32,102,114,111,109,32,116,104,101,32,110,97,109,101,
+    46,10,10,32,32,32,32,96,105,115,95,112,97,99,107,97,
+    103,101,96,32,100,101,116,101,114,109,105,110,101,115,32,105,
+    102,32,116,104,101,32,109,111,100,117,108,101,32,105,115,32,
+    99,111,110,115,105,100,101,114,101,100,32,97,32,112,97,99,
+    107,97,103,101,32,111,114,10,32,32,32,32,110,111,116,46,
+    32,32,79,110,32,109,111,100,117,108,101,115,32,116,104,105,
+    115,32,105,115,32,114,101,102,108,101,99,116,101,100,32,98,
+    121,32,116,104,101,32,96,95,95,112,97,116,104,95,95,96,
+    32,97,116,116,114,105,98,117,116,101,46,10,10,32,32,32,
+    32,96,111,114,105,103,105,110,96,32,105,115,32,116,104,101,
+    32,115,112,101,99,105,102,105,99,32,108,111,99,97,116,105,
+    111,110,32,117,115,101,100,32,98,121,32,116,104,101,32,108,
+    111,97,100,101,114,32,102,114,111,109,32,119,104,105,99,104,
+    32,116,111,10,32,32,32,32,108,111,97,100,32,116,104,101,
+    32,109,111,100,117,108,101,44,32,105,102,32,116,104,97,116,
+    32,105,110,102,111,114,109,97,116,105,111,110,32,105,115,32,
+    97,118,97,105,108,97,98,108,101,46,32,32,87,104,101,110,
+    32,102,105,108,101,110,97,109,101,32,105,115,10,32,32,32,
+    32,115,101,116,44,32,111,114,105,103,105,110,32,119,105,108,
+    108,32,109,97,116,99,104,46,10,10,32,32,32,32,96,104,
+    97,115,95,108,111,99,97,116,105,111,110,96,32,105,110,100,
+    105,99,97,116,101,115,32,116,104,97,116,32,97,32,115,112,
+    101,99,39,115,32,34,111,114,105,103,105,110,34,32,114,101,
+    102,108,101,99,116,115,32,97,32,108,111,99,97,116,105,111,
+    110,46,10,32,32,32,32,87,104,101,110,32,116,104,105,115,
+    32,105,115,32,84,114,117,101,44,32,96,95,95,102,105,108,
+    101,95,95,96,32,97,116,116,114,105,98,117,116,101,32,111,
+    102,32,116,104,101,32,109,111,100,117,108,101,32,105,115,32,
+    115,101,116,46,10,10,32,32,32,32,96,99,97,99,104,101,
+    100,96,32,105,115,32,116,104,101,32,108,111,99,97,116,105,
+    111,110,32,111,102,32,116,104,101,32,99,97,99,104,101,100,
+    32,98,121,116,101,99,111,100,101,32,102,105,108,101,44,32,
+    105,102,32,97,110,121,46,32,32,73,116,10,32,32,32,32,
+    99,111,114,114,101,115,112,111,110,100,115,32,116,111,32,116,
+    104,101,32,96,95,95,99,97,99,104,101,100,95,95,96,32,
+    97,116,116,114,105,98,117,116,101,46,10,10,32,32,32,32,
+    96,115,117,98,109,111,100,117,108,101,95,115,101,97,114,99,
+    104,95,108,111,99,97,116,105,111,110,115,96,32,105,115,32,
+    116,104,101,32,115,101,113,117,101,110,99,101,32,111,102,32,
+    112,97,116,104,32,101,110,116,114,105,101,115,32,116,111,10,
+    32,32,32,32,115,101,97,114,99,104,32,119,104,101,110,32,
+    105,109,112,111,114,116,105,110,103,32,115,117,98,109,111,100,
+    117,108,101,115,46,32,32,73,102,32,115,101,116,44,32,105,
+    115,95,112,97,99,107,97,103,101,32,115,104,111,117,108,100,
+    32,98,101,10,32,32,32,32,84,114,117,101,45,45,97,110,
+    100,32,70,97,108,115,101,32,111,116,104,101,114,119,105,115,
+    101,46,10,10,32,32,32,32,80,97,99,107,97,103,101,115,
+    32,97,114,101,32,115,105,109,112,108,121,32,109,111,100,117,
+    108,101,115,32,116,104,97,116,32,40,109,97,121,41,32,104,
+    97,118,101,32,115,117,98,109,111,100,117,108,101,115,46,32,
+    32,73,102,32,97,32,115,112,101,99,10,32,32,32,32,104,
+    97,115,32,97,32,110,111,110,45,78,111,110,101,32,118,97,
+    108,117,101,32,105,110,32,96,115,117,98,109,111,100,117,108,
+    101,95,115,101,97,114,99,104,95,108,111,99,97,116,105,111,
+    110,115,96,44,32,116,104,101,32,105,109,112,111,114,116,10,
+    32,32,32,32,115,121,115,116,101,109,32,119,105,108,108,32,
+    99,111,110,115,105,100,101,114,32,109,111,100,117,108,101,115,
+    32,108,111,97,100,101,100,32,102,114,111,109,32,116,104,101,
+    32,115,112,101,99,32,97,115,32,112,97,99,107,97,103,101,
+    115,46,10,10,32,32,32,32,79,110,108,121,32,102,105,110,
+    100,101,114,115,32,40,115,101,101,32,105,109,112,111,114,116,
+    108,105,98,46,97,98,99,46,77,101,116,97,80,97,116,104,
+    70,105,110,100,101,114,32,97,110,100,10,32,32,32,32,105,
+    109,112,111,114,116,108,105,98,46,97,98,99,46,80,97,116,
+    104,69,110,116,114,121,70,105,110,100,101,114,41,32,115,104,
+    111,117,108,100,32,109,111,100,105,102,121,32,77,111,100,117,
+    108,101,83,112,101,99,32,105,110,115,116,97,110,99,101,115,
+    46,10,10,32,32,32,32,78,41,3,218,6,111,114,105,103,
+    105,110,218,12,108,111,97,100,101,114,95,115,116,97,116,101,
+    218,10,105,115,95,112,97,99,107,97,103,101,99,3,0,0,
+    0,3,0,0,0,6,0,0,0,2,0,0,0,67,0,0,
+    0,115,54,0,0,0,124,1,124,0,95,0,124,2,124,0,
+    95,1,124,3,124,0,95,2,124,4,124,0,95,3,124,5,
+    114,32,103,0,110,2,100,0,124,0,95,4,100,1,124,0,
+    95,5,100,0,124,0,95,6,100,0,83,0,41,2,78,70,
+    41,7,114,15,0,0,0,114,94,0,0,0,114,104,0,0,
+    0,114,105,0,0,0,218,26,115,117,98,109,111,100,117,108,
+    101,95,115,101,97,114,99,104,95,108,111,99,97,116,105,111,
+    110,115,218,13,95,115,101,116,95,102,105,108,101,97,116,116,
+    114,218,7,95,99,97,99,104,101,100,41,6,114,26,0,0,
+    0,114,15,0,0,0,114,94,0,0,0,114,104,0,0,0,
+    114,105,0,0,0,114,106,0,0,0,114,10,0,0,0,114,
+    10,0,0,0,114,11,0,0,0,114,27,0,0,0,113,1,
+    0,0,115,14,0,0,0,0,2,6,1,6,1,6,1,6,
+    1,14,3,6,1,122,19,77,111,100,117,108,101,83,112,101,
+    99,46,95,95,105,110,105,116,95,95,99,1,0,0,0,0,
+    0,0,0,2,0,0,0,4,0,0,0,67,0,0,0,115,
+    102,0,0,0,100,1,106,0,124,0,106,1,131,1,100,2,
+    106,0,124,0,106,2,131,1,103,2,125,1,124,0,106,3,
+    100,0,107,9,114,52,124,1,106,4,100,3,106,0,124,0,
+    106,3,131,1,131,1,1,0,124,0,106,5,100,0,107,9,
+    114,80,124,1,106,4,100,4,106,0,124,0,106,5,131,1,
+    131,1,1,0,100,5,106,0,124,0,106,6,106,7,100,6,
+    106,8,124,1,131,1,131,2,83,0,41,7,78,122,9,110,
+    97,109,101,61,123,33,114,125,122,11,108,111,97,100,101,114,
+    61,123,33,114,125,122,11,111,114,105,103,105,110,61,123,33,
+    114,125,122,29,115,117,98,109,111,100,117,108,101,95,115,101,
+    97,114,99,104,95,108,111,99,97,116,105,111,110,115,61,123,
+    125,122,6,123,125,40,123,125,41,122,2,44,32,41,9,114,
+    38,0,0,0,114,15,0,0,0,114,94,0,0,0,114,104,
+    0,0,0,218,6,97,112,112,101,110,100,114,107,0,0,0,
+    218,9,95,95,99,108,97,115,115,95,95,114,1,0,0,0,
+    218,4,106,111,105,110,41,2,114,26,0,0,0,114,47,0,
+    0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,
+    0,114,40,0,0,0,125,1,0,0,115,16,0,0,0,0,
+    1,10,1,14,1,10,1,18,1,10,1,8,1,10,1,122,
+    19,77,111,100,117,108,101,83,112,101,99,46,95,95,114,101,
+    112,114,95,95,99,2,0,0,0,0,0,0,0,3,0,0,
+    0,11,0,0,0,67,0,0,0,115,102,0,0,0,124,0,
+    106,0,125,2,121,70,124,0,106,1,124,1,106,1,107,2,
+    111,76,124,0,106,2,124,1,106,2,107,2,111,76,124,0,
+    106,3,124,1,106,3,107,2,111,76,124,2,124,1,106,0,
+    107,2,111,76,124,0,106,4,124,1,106,4,107,2,111,76,
+    124,0,106,5,124,1,106,5,107,2,83,0,4,0,116,6,
+    107,10,114,96,1,0,1,0,1,0,100,1,83,0,88,0,
+    100,0,83,0,41,2,78,70,41,7,114,107,0,0,0,114,
     15,0,0,0,114,94,0,0,0,114,104,0,0,0,218,6,
-    97,112,112,101,110,100,114,107,0,0,0,218,9,95,95,99,
-    108,97,115,115,95,95,114,1,0,0,0,218,4,106,111,105,
-    110,41,2,114,26,0,0,0,114,47,0,0,0,114,10,0,
-    0,0,114,10,0,0,0,114,11,0,0,0,114,40,0,0,
-    0,115,1,0,0,115,16,0,0,0,0,1,10,1,14,1,
-    10,1,18,1,10,1,8,1,10,1,122,19,77,111,100,117,
-    108,101,83,112,101,99,46,95,95,114,101,112,114,95,95,99,
-    2,0,0,0,0,0,0,0,3,0,0,0,11,0,0,0,
-    67,0,0,0,115,102,0,0,0,124,0,106,0,125,2,121,
-    70,124,0,106,1,124,1,106,1,107,2,111,76,124,0,106,
-    2,124,1,106,2,107,2,111,76,124,0,106,3,124,1,106,
-    3,107,2,111,76,124,2,124,1,106,0,107,2,111,76,124,
-    0,106,4,124,1,106,4,107,2,111,76,124,0,106,5,124,
-    1,106,5,107,2,83,0,4,0,116,6,107,10,114,96,1,
-    0,1,0,1,0,100,1,83,0,88,0,100,0,83,0,41,
-    2,78,70,41,7,114,107,0,0,0,114,15,0,0,0,114,
-    94,0,0,0,114,104,0,0,0,218,6,99,97,99,104,101,
-    100,218,12,104,97,115,95,108,111,99,97,116,105,111,110,114,
-    91,0,0,0,41,3,114,26,0,0,0,90,5,111,116,104,
-    101,114,90,4,115,109,115,108,114,10,0,0,0,114,10,0,
-    0,0,114,11,0,0,0,218,6,95,95,101,113,95,95,125,
-    1,0,0,115,20,0,0,0,0,1,6,1,2,1,12,1,
-    12,1,12,1,10,1,12,1,12,1,14,1,122,17,77,111,
-    100,117,108,101,83,112,101,99,46,95,95,101,113,95,95,99,
+    99,97,99,104,101,100,218,12,104,97,115,95,108,111,99,97,
+    116,105,111,110,114,91,0,0,0,41,3,114,26,0,0,0,
+    90,5,111,116,104,101,114,90,4,115,109,115,108,114,10,0,
+    0,0,114,10,0,0,0,114,11,0,0,0,218,6,95,95,
+    101,113,95,95,135,1,0,0,115,20,0,0,0,0,1,6,
+    1,2,1,12,1,12,1,12,1,10,1,12,1,12,1,14,
+    1,122,17,77,111,100,117,108,101,83,112,101,99,46,95,95,
+    101,113,95,95,99,1,0,0,0,0,0,0,0,1,0,0,
+    0,2,0,0,0,67,0,0,0,115,58,0,0,0,124,0,
+    106,0,100,0,107,8,114,52,124,0,106,1,100,0,107,9,
+    114,52,124,0,106,2,114,52,116,3,100,0,107,8,114,38,
+    116,4,130,1,116,3,106,5,124,0,106,1,131,1,124,0,
+    95,0,124,0,106,0,83,0,41,1,78,41,6,114,109,0,
+    0,0,114,104,0,0,0,114,108,0,0,0,218,19,95,98,
+    111,111,116,115,116,114,97,112,95,101,120,116,101,114,110,97,
+    108,218,19,78,111,116,73,109,112,108,101,109,101,110,116,101,
+    100,69,114,114,111,114,90,11,95,103,101,116,95,99,97,99,
+    104,101,100,41,1,114,26,0,0,0,114,10,0,0,0,114,
+    10,0,0,0,114,11,0,0,0,114,113,0,0,0,147,1,
+    0,0,115,12,0,0,0,0,2,10,1,16,1,8,1,4,
+    1,14,1,122,17,77,111,100,117,108,101,83,112,101,99,46,
+    99,97,99,104,101,100,99,2,0,0,0,0,0,0,0,2,
+    0,0,0,2,0,0,0,67,0,0,0,115,10,0,0,0,
+    124,1,124,0,95,0,100,0,83,0,41,1,78,41,1,114,
+    109,0,0,0,41,2,114,26,0,0,0,114,113,0,0,0,
+    114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,
+    113,0,0,0,156,1,0,0,115,2,0,0,0,0,2,99,
     1,0,0,0,0,0,0,0,1,0,0,0,2,0,0,0,
-    67,0,0,0,115,58,0,0,0,124,0,106,0,100,0,107,
-    8,114,52,124,0,106,1,100,0,107,9,114,52,124,0,106,
-    2,114,52,116,3,100,0,107,8,114,38,116,4,130,1,116,
-    3,106,5,124,0,106,1,131,1,124,0,95,0,124,0,106,
-    0,83,0,41,1,78,41,6,114,109,0,0,0,114,104,0,
-    0,0,114,108,0,0,0,218,19,95,98,111,111,116,115,116,
-    114,97,112,95,101,120,116,101,114,110,97,108,218,19,78,111,
-    116,73,109,112,108,101,109,101,110,116,101,100,69,114,114,111,
-    114,90,11,95,103,101,116,95,99,97,99,104,101,100,41,1,
-    114,26,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
-    11,0,0,0,114,113,0,0,0,137,1,0,0,115,12,0,
-    0,0,0,2,10,1,16,1,8,1,4,1,14,1,122,17,
-    77,111,100,117,108,101,83,112,101,99,46,99,97,99,104,101,
-    100,99,2,0,0,0,0,0,0,0,2,0,0,0,2,0,
-    0,0,67,0,0,0,115,10,0,0,0,124,1,124,0,95,
-    0,100,0,83,0,41,1,78,41,1,114,109,0,0,0,41,
-    2,114,26,0,0,0,114,113,0,0,0,114,10,0,0,0,
-    114,10,0,0,0,114,11,0,0,0,114,113,0,0,0,146,
-    1,0,0,115,2,0,0,0,0,2,99,1,0,0,0,0,
-    0,0,0,1,0,0,0,2,0,0,0,67,0,0,0,115,
-    36,0,0,0,124,0,106,0,100,1,107,8,114,26,124,0,
-    106,1,106,2,100,2,131,1,100,3,25,0,83,0,124,0,
-    106,1,83,0,100,1,83,0,41,4,122,32,84,104,101,32,
-    110,97,109,101,32,111,102,32,116,104,101,32,109,111,100,117,
-    108,101,39,115,32,112,97,114,101,110,116,46,78,218,1,46,
-    114,19,0,0,0,41,3,114,107,0,0,0,114,15,0,0,
-    0,218,10,114,112,97,114,116,105,116,105,111,110,41,1,114,
-    26,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
-    0,0,0,218,6,112,97,114,101,110,116,150,1,0,0,115,
-    6,0,0,0,0,3,10,1,16,2,122,17,77,111,100,117,
-    108,101,83,112,101,99,46,112,97,114,101,110,116,99,1,0,
-    0,0,0,0,0,0,1,0,0,0,1,0,0,0,67,0,
-    0,0,115,6,0,0,0,124,0,106,0,83,0,41,1,78,
-    41,1,114,108,0,0,0,41,1,114,26,0,0,0,114,10,
-    0,0,0,114,10,0,0,0,114,11,0,0,0,114,114,0,
-    0,0,158,1,0,0,115,2,0,0,0,0,2,122,23,77,
-    111,100,117,108,101,83,112,101,99,46,104,97,115,95,108,111,
-    99,97,116,105,111,110,99,2,0,0,0,0,0,0,0,2,
-    0,0,0,2,0,0,0,67,0,0,0,115,14,0,0,0,
-    116,0,124,1,131,1,124,0,95,1,100,0,83,0,41,1,
-    78,41,2,218,4,98,111,111,108,114,108,0,0,0,41,2,
-    114,26,0,0,0,218,5,118,97,108,117,101,114,10,0,0,
-    0,114,10,0,0,0,114,11,0,0,0,114,114,0,0,0,
-    162,1,0,0,115,2,0,0,0,0,2,41,12,114,1,0,
-    0,0,114,0,0,0,0,114,2,0,0,0,114,3,0,0,
-    0,114,27,0,0,0,114,40,0,0,0,114,115,0,0,0,
-    218,8,112,114,111,112,101,114,116,121,114,113,0,0,0,218,
-    6,115,101,116,116,101,114,114,120,0,0,0,114,114,0,0,
-    0,114,10,0,0,0,114,10,0,0,0,114,10,0,0,0,
-    114,11,0,0,0,114,103,0,0,0,66,1,0,0,115,20,
-    0,0,0,8,35,4,2,4,1,14,11,8,10,8,12,12,
-    9,14,4,12,8,12,4,114,103,0,0,0,41,2,114,104,
-    0,0,0,114,106,0,0,0,99,2,0,0,0,2,0,0,
-    0,6,0,0,0,14,0,0,0,67,0,0,0,115,154,0,
-    0,0,116,0,124,1,100,1,131,2,114,74,116,1,100,2,
-    107,8,114,22,116,2,130,1,116,1,106,3,125,4,124,3,
-    100,2,107,8,114,48,124,4,124,0,124,1,100,3,141,2,
-    83,0,124,3,114,56,103,0,110,2,100,2,125,5,124,4,
-    124,0,124,1,124,5,100,4,141,3,83,0,124,3,100,2,
-    107,8,114,138,116,0,124,1,100,5,131,2,114,134,121,14,
-    124,1,106,4,124,0,131,1,125,3,87,0,113,138,4,0,
-    116,5,107,10,114,130,1,0,1,0,1,0,100,2,125,3,
-    89,0,113,138,88,0,110,4,100,6,125,3,116,6,124,0,
-    124,1,124,2,124,3,100,7,141,4,83,0,41,8,122,53,
-    82,101,116,117,114,110,32,97,32,109,111,100,117,108,101,32,
-    115,112,101,99,32,98,97,115,101,100,32,111,110,32,118,97,
-    114,105,111,117,115,32,108,111,97,100,101,114,32,109,101,116,
-    104,111,100,115,46,90,12,103,101,116,95,102,105,108,101,110,
-    97,109,101,78,41,1,114,94,0,0,0,41,2,114,94,0,
-    0,0,114,107,0,0,0,114,106,0,0,0,70,41,2,114,
-    104,0,0,0,114,106,0,0,0,41,7,114,4,0,0,0,
-    114,116,0,0,0,114,117,0,0,0,218,23,115,112,101,99,
-    95,102,114,111,109,95,102,105,108,101,95,108,111,99,97,116,
-    105,111,110,114,106,0,0,0,114,71,0,0,0,114,103,0,
-    0,0,41,6,114,15,0,0,0,114,94,0,0,0,114,104,
-    0,0,0,114,106,0,0,0,114,125,0,0,0,90,6,115,
-    101,97,114,99,104,114,10,0,0,0,114,10,0,0,0,114,
-    11,0,0,0,114,79,0,0,0,167,1,0,0,115,34,0,
-    0,0,0,2,10,1,8,1,4,1,6,2,8,1,12,1,
-    12,1,6,1,8,2,8,1,10,1,2,1,14,1,14,1,
-    12,3,4,2,114,79,0,0,0,99,3,0,0,0,0,0,
-    0,0,8,0,0,0,53,0,0,0,67,0,0,0,115,56,
-    1,0,0,121,10,124,0,106,0,125,3,87,0,110,20,4,
-    0,116,1,107,10,114,30,1,0,1,0,1,0,89,0,110,
-    14,88,0,124,3,100,0,107,9,114,44,124,3,83,0,124,
-    0,106,2,125,4,124,1,100,0,107,8,114,90,121,10,124,
-    0,106,3,125,1,87,0,110,20,4,0,116,1,107,10,114,
-    88,1,0,1,0,1,0,89,0,110,2,88,0,121,10,124,
-    0,106,4,125,5,87,0,110,24,4,0,116,1,107,10,114,
-    124,1,0,1,0,1,0,100,0,125,5,89,0,110,2,88,
-    0,124,2,100,0,107,8,114,184,124,5,100,0,107,8,114,
-    180,121,10,124,1,106,5,125,2,87,0,113,184,4,0,116,
-    1,107,10,114,176,1,0,1,0,1,0,100,0,125,2,89,
-    0,113,184,88,0,110,4,124,5,125,2,121,10,124,0,106,
-    6,125,6,87,0,110,24,4,0,116,1,107,10,114,218,1,
-    0,1,0,1,0,100,0,125,6,89,0,110,2,88,0,121,
-    14,116,7,124,0,106,8,131,1,125,7,87,0,110,26,4,
-    0,116,1,107,10,144,1,114,4,1,0,1,0,1,0,100,
-    0,125,7,89,0,110,2,88,0,116,9,124,4,124,1,124,
-    2,100,1,141,3,125,3,124,5,100,0,107,8,144,1,114,
-    34,100,2,110,2,100,3,124,3,95,10,124,6,124,3,95,
-    11,124,7,124,3,95,12,124,3,83,0,41,4,78,41,1,
-    114,104,0,0,0,70,84,41,13,114,90,0,0,0,114,91,
-    0,0,0,114,1,0,0,0,114,86,0,0,0,114,93,0,
-    0,0,90,7,95,79,82,73,71,73,78,218,10,95,95,99,
-    97,99,104,101,100,95,95,218,4,108,105,115,116,218,8,95,
-    95,112,97,116,104,95,95,114,103,0,0,0,114,108,0,0,
-    0,114,113,0,0,0,114,107,0,0,0,41,8,114,84,0,
-    0,0,114,94,0,0,0,114,104,0,0,0,114,83,0,0,
-    0,114,15,0,0,0,90,8,108,111,99,97,116,105,111,110,
-    114,113,0,0,0,114,107,0,0,0,114,10,0,0,0,114,
-    10,0,0,0,114,11,0,0,0,218,17,95,115,112,101,99,
-    95,102,114,111,109,95,109,111,100,117,108,101,193,1,0,0,
-    115,72,0,0,0,0,2,2,1,10,1,14,1,6,2,8,
-    1,4,2,6,1,8,1,2,1,10,1,14,2,6,1,2,
-    1,10,1,14,1,10,1,8,1,8,1,2,1,10,1,14,
-    1,12,2,4,1,2,1,10,1,14,1,10,1,2,1,14,
-    1,16,1,10,2,14,1,20,1,6,1,6,1,114,129,0,
-    0,0,70,41,1,218,8,111,118,101,114,114,105,100,101,99,
-    2,0,0,0,1,0,0,0,5,0,0,0,59,0,0,0,
-    67,0,0,0,115,212,1,0,0,124,2,115,20,116,0,124,
-    1,100,1,100,0,131,3,100,0,107,8,114,54,121,12,124,
-    0,106,1,124,1,95,2,87,0,110,20,4,0,116,3,107,
-    10,114,52,1,0,1,0,1,0,89,0,110,2,88,0,124,
-    2,115,74,116,0,124,1,100,2,100,0,131,3,100,0,107,
-    8,114,166,124,0,106,4,125,3,124,3,100,0,107,8,114,
-    134,124,0,106,5,100,0,107,9,114,134,116,6,100,0,107,
-    8,114,110,116,7,130,1,116,6,106,8,125,4,124,4,106,
-    9,124,4,131,1,125,3,124,0,106,5,124,3,95,10,121,
-    10,124,3,124,1,95,11,87,0,110,20,4,0,116,3,107,
-    10,114,164,1,0,1,0,1,0,89,0,110,2,88,0,124,
-    2,115,186,116,0,124,1,100,3,100,0,131,3,100,0,107,
-    8,114,220,121,12,124,0,106,12,124,1,95,13,87,0,110,
-    20,4,0,116,3,107,10,114,218,1,0,1,0,1,0,89,
-    0,110,2,88,0,121,10,124,0,124,1,95,14,87,0,110,
-    20,4,0,116,3,107,10,114,250,1,0,1,0,1,0,89,
-    0,110,2,88,0,124,2,144,1,115,20,116,0,124,1,100,
-    4,100,0,131,3,100,0,107,8,144,1,114,68,124,0,106,
-    5,100,0,107,9,144,1,114,68,121,12,124,0,106,5,124,
-    1,95,15,87,0,110,22,4,0,116,3,107,10,144,1,114,
-    66,1,0,1,0,1,0,89,0,110,2,88,0,124,0,106,
-    16,144,1,114,208,124,2,144,1,115,100,116,0,124,1,100,
-    5,100,0,131,3,100,0,107,8,144,1,114,136,121,12,124,
-    0,106,17,124,1,95,18,87,0,110,22,4,0,116,3,107,
-    10,144,1,114,134,1,0,1,0,1,0,89,0,110,2,88,
-    0,124,2,144,1,115,160,116,0,124,1,100,6,100,0,131,
-    3,100,0,107,8,144,1,114,208,124,0,106,19,100,0,107,
-    9,144,1,114,208,121,12,124,0,106,19,124,1,95,20,87,
-    0,110,22,4,0,116,3,107,10,144,1,114,206,1,0,1,
-    0,1,0,89,0,110,2,88,0,124,1,83,0,41,7,78,
-    114,1,0,0,0,114,86,0,0,0,218,11,95,95,112,97,
-    99,107,97,103,101,95,95,114,128,0,0,0,114,93,0,0,
-    0,114,126,0,0,0,41,21,114,6,0,0,0,114,15,0,
-    0,0,114,1,0,0,0,114,91,0,0,0,114,94,0,0,
-    0,114,107,0,0,0,114,116,0,0,0,114,117,0,0,0,
-    218,16,95,78,97,109,101,115,112,97,99,101,76,111,97,100,
-    101,114,218,7,95,95,110,101,119,95,95,90,5,95,112,97,
-    116,104,114,86,0,0,0,114,120,0,0,0,114,131,0,0,
-    0,114,90,0,0,0,114,128,0,0,0,114,114,0,0,0,
-    114,104,0,0,0,114,93,0,0,0,114,113,0,0,0,114,
-    126,0,0,0,41,5,114,83,0,0,0,114,84,0,0,0,
-    114,130,0,0,0,114,94,0,0,0,114,132,0,0,0,114,
-    10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,18,
-    95,105,110,105,116,95,109,111,100,117,108,101,95,97,116,116,
-    114,115,238,1,0,0,115,92,0,0,0,0,4,20,1,2,
-    1,12,1,14,1,6,2,20,1,6,1,8,2,10,1,8,
-    1,4,1,6,2,10,1,8,1,2,1,10,1,14,1,6,
-    2,20,1,2,1,12,1,14,1,6,2,2,1,10,1,14,
-    1,6,2,24,1,12,1,2,1,12,1,16,1,6,2,8,
-    1,24,1,2,1,12,1,16,1,6,2,24,1,12,1,2,
-    1,12,1,16,1,6,1,114,134,0,0,0,99,1,0,0,
-    0,0,0,0,0,2,0,0,0,3,0,0,0,67,0,0,
-    0,115,82,0,0,0,100,1,125,1,116,0,124,0,106,1,
-    100,2,131,2,114,30,124,0,106,1,106,2,124,0,131,1,
-    125,1,110,20,116,0,124,0,106,1,100,3,131,2,114,50,
-    116,3,100,4,131,1,130,1,124,1,100,1,107,8,114,68,
-    116,4,124,0,106,5,131,1,125,1,116,6,124,0,124,1,
-    131,2,1,0,124,1,83,0,41,5,122,43,67,114,101,97,
-    116,101,32,97,32,109,111,100,117,108,101,32,98,97,115,101,
-    100,32,111,110,32,116,104,101,32,112,114,111,118,105,100,101,
-    100,32,115,112,101,99,46,78,218,13,99,114,101,97,116,101,
-    95,109,111,100,117,108,101,218,11,101,120,101,99,95,109,111,
-    100,117,108,101,122,66,108,111,97,100,101,114,115,32,116,104,
-    97,116,32,100,101,102,105,110,101,32,101,120,101,99,95,109,
-    111,100,117,108,101,40,41,32,109,117,115,116,32,97,108,115,
-    111,32,100,101,102,105,110,101,32,99,114,101,97,116,101,95,
-    109,111,100,117,108,101,40,41,41,7,114,4,0,0,0,114,
-    94,0,0,0,114,135,0,0,0,114,71,0,0,0,114,16,
-    0,0,0,114,15,0,0,0,114,134,0,0,0,41,2,114,
-    83,0,0,0,114,84,0,0,0,114,10,0,0,0,114,10,
-    0,0,0,114,11,0,0,0,218,16,109,111,100,117,108,101,
-    95,102,114,111,109,95,115,112,101,99,42,2,0,0,115,18,
-    0,0,0,0,3,4,1,12,3,14,1,12,1,8,2,8,
-    1,10,1,10,1,114,137,0,0,0,99,1,0,0,0,0,
-    0,0,0,2,0,0,0,3,0,0,0,67,0,0,0,115,
-    106,0,0,0,124,0,106,0,100,1,107,8,114,14,100,2,
-    110,4,124,0,106,0,125,1,124,0,106,1,100,1,107,8,
-    114,66,124,0,106,2,100,1,107,8,114,50,100,3,106,3,
-    124,1,131,1,83,0,100,4,106,3,124,1,124,0,106,2,
-    131,2,83,0,110,36,124,0,106,4,114,86,100,5,106,3,
-    124,1,124,0,106,1,131,2,83,0,100,6,106,3,124,0,
-    106,0,124,0,106,1,131,2,83,0,100,1,83,0,41,7,
-    122,38,82,101,116,117,114,110,32,116,104,101,32,114,101,112,
-    114,32,116,111,32,117,115,101,32,102,111,114,32,116,104,101,
-    32,109,111,100,117,108,101,46,78,114,88,0,0,0,122,13,
-    60,109,111,100,117,108,101,32,123,33,114,125,62,122,20,60,
-    109,111,100,117,108,101,32,123,33,114,125,32,40,123,33,114,
-    125,41,62,122,23,60,109,111,100,117,108,101,32,123,33,114,
-    125,32,102,114,111,109,32,123,33,114,125,62,122,18,60,109,
-    111,100,117,108,101,32,123,33,114,125,32,40,123,125,41,62,
-    41,5,114,15,0,0,0,114,104,0,0,0,114,94,0,0,
-    0,114,38,0,0,0,114,114,0,0,0,41,2,114,83,0,
-    0,0,114,15,0,0,0,114,10,0,0,0,114,10,0,0,
-    0,114,11,0,0,0,114,92,0,0,0,59,2,0,0,115,
-    16,0,0,0,0,3,20,1,10,1,10,1,10,2,16,2,
-    6,1,14,2,114,92,0,0,0,99,2,0,0,0,0,0,
-    0,0,4,0,0,0,12,0,0,0,67,0,0,0,115,178,
-    0,0,0,124,0,106,0,125,2,116,1,124,2,131,1,143,
-    148,1,0,116,2,106,3,106,4,124,2,131,1,124,1,107,
-    9,114,54,100,1,106,5,124,2,131,1,125,3,116,6,124,
-    3,124,2,100,2,141,2,130,1,124,0,106,7,100,3,107,
-    8,114,106,124,0,106,8,100,3,107,8,114,88,116,6,100,
-    4,124,0,106,0,100,2,141,2,130,1,116,9,124,0,124,
-    1,100,5,100,6,141,3,1,0,124,1,83,0,116,9,124,
-    0,124,1,100,5,100,6,141,3,1,0,116,10,124,0,106,
-    7,100,7,131,2,115,146,124,0,106,7,106,11,124,2,131,
-    1,1,0,110,12,124,0,106,7,106,12,124,1,131,1,1,
-    0,87,0,100,3,81,0,82,0,88,0,116,2,106,3,124,
-    2,25,0,83,0,41,8,122,70,69,120,101,99,117,116,101,
-    32,116,104,101,32,115,112,101,99,39,115,32,115,112,101,99,
-    105,102,105,101,100,32,109,111,100,117,108,101,32,105,110,32,
-    97,110,32,101,120,105,115,116,105,110,103,32,109,111,100,117,
-    108,101,39,115,32,110,97,109,101,115,112,97,99,101,46,122,
-    30,109,111,100,117,108,101,32,123,33,114,125,32,110,111,116,
-    32,105,110,32,115,121,115,46,109,111,100,117,108,101,115,41,
-    1,114,15,0,0,0,78,122,14,109,105,115,115,105,110,103,
-    32,108,111,97,100,101,114,84,41,1,114,130,0,0,0,114,
-    136,0,0,0,41,13,114,15,0,0,0,114,42,0,0,0,
-    114,14,0,0,0,114,80,0,0,0,114,30,0,0,0,114,
-    38,0,0,0,114,71,0,0,0,114,94,0,0,0,114,107,
-    0,0,0,114,134,0,0,0,114,4,0,0,0,218,11,108,
-    111,97,100,95,109,111,100,117,108,101,114,136,0,0,0,41,
-    4,114,83,0,0,0,114,84,0,0,0,114,15,0,0,0,
-    218,3,109,115,103,114,10,0,0,0,114,10,0,0,0,114,
-    11,0,0,0,114,81,0,0,0,76,2,0,0,115,30,0,
-    0,0,0,2,6,1,10,1,16,1,10,1,12,1,10,1,
-    10,1,14,2,14,1,4,1,14,1,12,4,14,2,22,1,
-    114,81,0,0,0,99,1,0,0,0,0,0,0,0,2,0,
-    0,0,27,0,0,0,67,0,0,0,115,206,0,0,0,124,
-    0,106,0,106,1,124,0,106,2,131,1,1,0,116,3,106,
-    4,124,0,106,2,25,0,125,1,116,5,124,1,100,1,100,
-    0,131,3,100,0,107,8,114,76,121,12,124,0,106,0,124,
-    1,95,6,87,0,110,20,4,0,116,7,107,10,114,74,1,
-    0,1,0,1,0,89,0,110,2,88,0,116,5,124,1,100,
-    2,100,0,131,3,100,0,107,8,114,154,121,40,124,1,106,
-    8,124,1,95,9,116,10,124,1,100,3,131,2,115,130,124,
-    0,106,2,106,11,100,4,131,1,100,5,25,0,124,1,95,
-    9,87,0,110,20,4,0,116,7,107,10,114,152,1,0,1,
-    0,1,0,89,0,110,2,88,0,116,5,124,1,100,6,100,
-    0,131,3,100,0,107,8,114,202,121,10,124,0,124,1,95,
-    12,87,0,110,20,4,0,116,7,107,10,114,200,1,0,1,
-    0,1,0,89,0,110,2,88,0,124,1,83,0,41,7,78,
-    114,86,0,0,0,114,131,0,0,0,114,128,0,0,0,114,
-    118,0,0,0,114,19,0,0,0,114,90,0,0,0,41,13,
-    114,94,0,0,0,114,138,0,0,0,114,15,0,0,0,114,
-    14,0,0,0,114,80,0,0,0,114,6,0,0,0,114,86,
-    0,0,0,114,91,0,0,0,114,1,0,0,0,114,131,0,
-    0,0,114,4,0,0,0,114,119,0,0,0,114,90,0,0,
-    0,41,2,114,83,0,0,0,114,84,0,0,0,114,10,0,
-    0,0,114,10,0,0,0,114,11,0,0,0,218,25,95,108,
-    111,97,100,95,98,97,99,107,119,97,114,100,95,99,111,109,
-    112,97,116,105,98,108,101,100,2,0,0,115,40,0,0,0,
-    0,4,14,2,12,1,16,1,2,1,12,1,14,1,6,1,
-    16,1,2,4,8,1,10,1,22,1,14,1,6,1,16,1,
-    2,1,10,1,14,1,6,1,114,140,0,0,0,99,1,0,
-    0,0,0,0,0,0,2,0,0,0,11,0,0,0,67,0,
-    0,0,115,118,0,0,0,124,0,106,0,100,0,107,9,114,
-    30,116,1,124,0,106,0,100,1,131,2,115,30,116,2,124,
-    0,131,1,83,0,116,3,124,0,131,1,125,1,116,4,124,
-    1,131,1,143,54,1,0,124,0,106,0,100,0,107,8,114,
-    84,124,0,106,5,100,0,107,8,114,96,116,6,100,2,124,
-    0,106,7,100,3,141,2,130,1,110,12,124,0,106,0,106,
-    8,124,1,131,1,1,0,87,0,100,0,81,0,82,0,88,
-    0,116,9,106,10,124,0,106,7,25,0,83,0,41,4,78,
-    114,136,0,0,0,122,14,109,105,115,115,105,110,103,32,108,
-    111,97,100,101,114,41,1,114,15,0,0,0,41,11,114,94,
-    0,0,0,114,4,0,0,0,114,140,0,0,0,114,137,0,
-    0,0,114,97,0,0,0,114,107,0,0,0,114,71,0,0,
-    0,114,15,0,0,0,114,136,0,0,0,114,14,0,0,0,
-    114,80,0,0,0,41,2,114,83,0,0,0,114,84,0,0,
-    0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
-    218,14,95,108,111,97,100,95,117,110,108,111,99,107,101,100,
-    129,2,0,0,115,20,0,0,0,0,2,10,2,12,1,8,
-    2,8,1,10,1,10,1,10,1,16,3,22,5,114,141,0,
-    0,0,99,1,0,0,0,0,0,0,0,1,0,0,0,9,
-    0,0,0,67,0,0,0,115,30,0,0,0,116,0,124,0,
-    106,1,131,1,143,10,1,0,116,2,124,0,131,1,83,0,
-    81,0,82,0,88,0,100,1,83,0,41,2,122,191,82,101,
-    116,117,114,110,32,97,32,110,101,119,32,109,111,100,117,108,
-    101,32,111,98,106,101,99,116,44,32,108,111,97,100,101,100,
-    32,98,121,32,116,104,101,32,115,112,101,99,39,115,32,108,
-    111,97,100,101,114,46,10,10,32,32,32,32,84,104,101,32,
-    109,111,100,117,108,101,32,105,115,32,110,111,116,32,97,100,
-    100,101,100,32,116,111,32,105,116,115,32,112,97,114,101,110,
-    116,46,10,10,32,32,32,32,73,102,32,97,32,109,111,100,
-    117,108,101,32,105,115,32,97,108,114,101,97,100,121,32,105,
-    110,32,115,121,115,46,109,111,100,117,108,101,115,44,32,116,
-    104,97,116,32,101,120,105,115,116,105,110,103,32,109,111,100,
-    117,108,101,32,103,101,116,115,10,32,32,32,32,99,108,111,
-    98,98,101,114,101,100,46,10,10,32,32,32,32,78,41,3,
-    114,42,0,0,0,114,15,0,0,0,114,141,0,0,0,41,
-    1,114,83,0,0,0,114,10,0,0,0,114,10,0,0,0,
-    114,11,0,0,0,114,82,0,0,0,152,2,0,0,115,4,
-    0,0,0,0,9,12,1,114,82,0,0,0,99,0,0,0,
-    0,0,0,0,0,0,0,0,0,4,0,0,0,64,0,0,
-    0,115,136,0,0,0,101,0,90,1,100,0,90,2,100,1,
-    90,3,101,4,100,2,100,3,132,0,131,1,90,5,101,6,
-    100,19,100,5,100,6,132,1,131,1,90,7,101,6,100,20,
-    100,7,100,8,132,1,131,1,90,8,101,6,100,9,100,10,
-    132,0,131,1,90,9,101,6,100,11,100,12,132,0,131,1,
-    90,10,101,6,101,11,100,13,100,14,132,0,131,1,131,1,
-    90,12,101,6,101,11,100,15,100,16,132,0,131,1,131,1,
-    90,13,101,6,101,11,100,17,100,18,132,0,131,1,131,1,
-    90,14,101,6,101,15,131,1,90,16,100,4,83,0,41,21,
-    218,15,66,117,105,108,116,105,110,73,109,112,111,114,116,101,
-    114,122,144,77,101,116,97,32,112,97,116,104,32,105,109,112,
-    111,114,116,32,102,111,114,32,98,117,105,108,116,45,105,110,
-    32,109,111,100,117,108,101,115,46,10,10,32,32,32,32,65,
-    108,108,32,109,101,116,104,111,100,115,32,97,114,101,32,101,
-    105,116,104,101,114,32,99,108,97,115,115,32,111,114,32,115,
-    116,97,116,105,99,32,109,101,116,104,111,100,115,32,116,111,
-    32,97,118,111,105,100,32,116,104,101,32,110,101,101,100,32,
-    116,111,10,32,32,32,32,105,110,115,116,97,110,116,105,97,
-    116,101,32,116,104,101,32,99,108,97,115,115,46,10,10,32,
-    32,32,32,99,1,0,0,0,0,0,0,0,1,0,0,0,
-    2,0,0,0,67,0,0,0,115,12,0,0,0,100,1,106,
-    0,124,0,106,1,131,1,83,0,41,2,122,115,82,101,116,
-    117,114,110,32,114,101,112,114,32,102,111,114,32,116,104,101,
+    67,0,0,0,115,36,0,0,0,124,0,106,0,100,1,107,
+    8,114,26,124,0,106,1,106,2,100,2,131,1,100,3,25,
+    0,83,0,124,0,106,1,83,0,100,1,83,0,41,4,122,
+    32,84,104,101,32,110,97,109,101,32,111,102,32,116,104,101,
+    32,109,111,100,117,108,101,39,115,32,112,97,114,101,110,116,
+    46,78,218,1,46,114,19,0,0,0,41,3,114,107,0,0,
+    0,114,15,0,0,0,218,10,114,112,97,114,116,105,116,105,
+    111,110,41,1,114,26,0,0,0,114,10,0,0,0,114,10,
+    0,0,0,114,11,0,0,0,218,6,112,97,114,101,110,116,
+    160,1,0,0,115,6,0,0,0,0,3,10,1,16,2,122,
+    17,77,111,100,117,108,101,83,112,101,99,46,112,97,114,101,
+    110,116,99,1,0,0,0,0,0,0,0,1,0,0,0,1,
+    0,0,0,67,0,0,0,115,6,0,0,0,124,0,106,0,
+    83,0,41,1,78,41,1,114,108,0,0,0,41,1,114,26,
+    0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,
+    0,0,114,114,0,0,0,168,1,0,0,115,2,0,0,0,
+    0,2,122,23,77,111,100,117,108,101,83,112,101,99,46,104,
+    97,115,95,108,111,99,97,116,105,111,110,99,2,0,0,0,
+    0,0,0,0,2,0,0,0,2,0,0,0,67,0,0,0,
+    115,14,0,0,0,116,0,124,1,131,1,124,0,95,1,100,
+    0,83,0,41,1,78,41,2,218,4,98,111,111,108,114,108,
+    0,0,0,41,2,114,26,0,0,0,218,5,118,97,108,117,
+    101,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
+    114,114,0,0,0,172,1,0,0,115,2,0,0,0,0,2,
+    41,12,114,1,0,0,0,114,0,0,0,0,114,2,0,0,
+    0,114,3,0,0,0,114,27,0,0,0,114,40,0,0,0,
+    114,115,0,0,0,218,8,112,114,111,112,101,114,116,121,114,
+    113,0,0,0,218,6,115,101,116,116,101,114,114,120,0,0,
+    0,114,114,0,0,0,114,10,0,0,0,114,10,0,0,0,
+    114,10,0,0,0,114,11,0,0,0,114,103,0,0,0,76,
+    1,0,0,115,20,0,0,0,8,35,4,2,4,1,14,11,
+    8,10,8,12,12,9,14,4,12,8,12,4,114,103,0,0,
+    0,41,2,114,104,0,0,0,114,106,0,0,0,99,2,0,
+    0,0,2,0,0,0,6,0,0,0,14,0,0,0,67,0,
+    0,0,115,154,0,0,0,116,0,124,1,100,1,131,2,114,
+    74,116,1,100,2,107,8,114,22,116,2,130,1,116,1,106,
+    3,125,4,124,3,100,2,107,8,114,48,124,4,124,0,124,
+    1,100,3,141,2,83,0,124,3,114,56,103,0,110,2,100,
+    2,125,5,124,4,124,0,124,1,124,5,100,4,141,3,83,
+    0,124,3,100,2,107,8,114,138,116,0,124,1,100,5,131,
+    2,114,134,121,14,124,1,106,4,124,0,131,1,125,3,87,
+    0,113,138,4,0,116,5,107,10,114,130,1,0,1,0,1,
+    0,100,2,125,3,89,0,113,138,88,0,110,4,100,6,125,
+    3,116,6,124,0,124,1,124,2,124,3,100,7,141,4,83,
+    0,41,8,122,53,82,101,116,117,114,110,32,97,32,109,111,
+    100,117,108,101,32,115,112,101,99,32,98,97,115,101,100,32,
+    111,110,32,118,97,114,105,111,117,115,32,108,111,97,100,101,
+    114,32,109,101,116,104,111,100,115,46,90,12,103,101,116,95,
+    102,105,108,101,110,97,109,101,78,41,1,114,94,0,0,0,
+    41,2,114,94,0,0,0,114,107,0,0,0,114,106,0,0,
+    0,70,41,2,114,104,0,0,0,114,106,0,0,0,41,7,
+    114,4,0,0,0,114,116,0,0,0,114,117,0,0,0,218,
+    23,115,112,101,99,95,102,114,111,109,95,102,105,108,101,95,
+    108,111,99,97,116,105,111,110,114,106,0,0,0,114,71,0,
+    0,0,114,103,0,0,0,41,6,114,15,0,0,0,114,94,
+    0,0,0,114,104,0,0,0,114,106,0,0,0,114,125,0,
+    0,0,90,6,115,101,97,114,99,104,114,10,0,0,0,114,
+    10,0,0,0,114,11,0,0,0,114,79,0,0,0,177,1,
+    0,0,115,34,0,0,0,0,2,10,1,8,1,4,1,6,
+    2,8,1,12,1,12,1,6,1,8,2,8,1,10,1,2,
+    1,14,1,14,1,12,3,4,2,114,79,0,0,0,99,3,
+    0,0,0,0,0,0,0,8,0,0,0,53,0,0,0,67,
+    0,0,0,115,56,1,0,0,121,10,124,0,106,0,125,3,
+    87,0,110,20,4,0,116,1,107,10,114,30,1,0,1,0,
+    1,0,89,0,110,14,88,0,124,3,100,0,107,9,114,44,
+    124,3,83,0,124,0,106,2,125,4,124,1,100,0,107,8,
+    114,90,121,10,124,0,106,3,125,1,87,0,110,20,4,0,
+    116,1,107,10,114,88,1,0,1,0,1,0,89,0,110,2,
+    88,0,121,10,124,0,106,4,125,5,87,0,110,24,4,0,
+    116,1,107,10,114,124,1,0,1,0,1,0,100,0,125,5,
+    89,0,110,2,88,0,124,2,100,0,107,8,114,184,124,5,
+    100,0,107,8,114,180,121,10,124,1,106,5,125,2,87,0,
+    113,184,4,0,116,1,107,10,114,176,1,0,1,0,1,0,
+    100,0,125,2,89,0,113,184,88,0,110,4,124,5,125,2,
+    121,10,124,0,106,6,125,6,87,0,110,24,4,0,116,1,
+    107,10,114,218,1,0,1,0,1,0,100,0,125,6,89,0,
+    110,2,88,0,121,14,116,7,124,0,106,8,131,1,125,7,
+    87,0,110,26,4,0,116,1,107,10,144,1,114,4,1,0,
+    1,0,1,0,100,0,125,7,89,0,110,2,88,0,116,9,
+    124,4,124,1,124,2,100,1,141,3,125,3,124,5,100,0,
+    107,8,144,1,114,34,100,2,110,2,100,3,124,3,95,10,
+    124,6,124,3,95,11,124,7,124,3,95,12,124,3,83,0,
+    41,4,78,41,1,114,104,0,0,0,70,84,41,13,114,90,
+    0,0,0,114,91,0,0,0,114,1,0,0,0,114,86,0,
+    0,0,114,93,0,0,0,90,7,95,79,82,73,71,73,78,
+    218,10,95,95,99,97,99,104,101,100,95,95,218,4,108,105,
+    115,116,218,8,95,95,112,97,116,104,95,95,114,103,0,0,
+    0,114,108,0,0,0,114,113,0,0,0,114,107,0,0,0,
+    41,8,114,84,0,0,0,114,94,0,0,0,114,104,0,0,
+    0,114,83,0,0,0,114,15,0,0,0,90,8,108,111,99,
+    97,116,105,111,110,114,113,0,0,0,114,107,0,0,0,114,
+    10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,17,
+    95,115,112,101,99,95,102,114,111,109,95,109,111,100,117,108,
+    101,203,1,0,0,115,72,0,0,0,0,2,2,1,10,1,
+    14,1,6,2,8,1,4,2,6,1,8,1,2,1,10,1,
+    14,2,6,1,2,1,10,1,14,1,10,1,8,1,8,1,
+    2,1,10,1,14,1,12,2,4,1,2,1,10,1,14,1,
+    10,1,2,1,14,1,16,1,10,2,14,1,20,1,6,1,
+    6,1,114,129,0,0,0,70,41,1,218,8,111,118,101,114,
+    114,105,100,101,99,2,0,0,0,1,0,0,0,5,0,0,
+    0,59,0,0,0,67,0,0,0,115,212,1,0,0,124,2,
+    115,20,116,0,124,1,100,1,100,0,131,3,100,0,107,8,
+    114,54,121,12,124,0,106,1,124,1,95,2,87,0,110,20,
+    4,0,116,3,107,10,114,52,1,0,1,0,1,0,89,0,
+    110,2,88,0,124,2,115,74,116,0,124,1,100,2,100,0,
+    131,3,100,0,107,8,114,166,124,0,106,4,125,3,124,3,
+    100,0,107,8,114,134,124,0,106,5,100,0,107,9,114,134,
+    116,6,100,0,107,8,114,110,116,7,130,1,116,6,106,8,
+    125,4,124,4,106,9,124,4,131,1,125,3,124,0,106,5,
+    124,3,95,10,121,10,124,3,124,1,95,11,87,0,110,20,
+    4,0,116,3,107,10,114,164,1,0,1,0,1,0,89,0,
+    110,2,88,0,124,2,115,186,116,0,124,1,100,3,100,0,
+    131,3,100,0,107,8,114,220,121,12,124,0,106,12,124,1,
+    95,13,87,0,110,20,4,0,116,3,107,10,114,218,1,0,
+    1,0,1,0,89,0,110,2,88,0,121,10,124,0,124,1,
+    95,14,87,0,110,20,4,0,116,3,107,10,114,250,1,0,
+    1,0,1,0,89,0,110,2,88,0,124,2,144,1,115,20,
+    116,0,124,1,100,4,100,0,131,3,100,0,107,8,144,1,
+    114,68,124,0,106,5,100,0,107,9,144,1,114,68,121,12,
+    124,0,106,5,124,1,95,15,87,0,110,22,4,0,116,3,
+    107,10,144,1,114,66,1,0,1,0,1,0,89,0,110,2,
+    88,0,124,0,106,16,144,1,114,208,124,2,144,1,115,100,
+    116,0,124,1,100,5,100,0,131,3,100,0,107,8,144,1,
+    114,136,121,12,124,0,106,17,124,1,95,18,87,0,110,22,
+    4,0,116,3,107,10,144,1,114,134,1,0,1,0,1,0,
+    89,0,110,2,88,0,124,2,144,1,115,160,116,0,124,1,
+    100,6,100,0,131,3,100,0,107,8,144,1,114,208,124,0,
+    106,19,100,0,107,9,144,1,114,208,121,12,124,0,106,19,
+    124,1,95,20,87,0,110,22,4,0,116,3,107,10,144,1,
+    114,206,1,0,1,0,1,0,89,0,110,2,88,0,124,1,
+    83,0,41,7,78,114,1,0,0,0,114,86,0,0,0,218,
+    11,95,95,112,97,99,107,97,103,101,95,95,114,128,0,0,
+    0,114,93,0,0,0,114,126,0,0,0,41,21,114,6,0,
+    0,0,114,15,0,0,0,114,1,0,0,0,114,91,0,0,
+    0,114,94,0,0,0,114,107,0,0,0,114,116,0,0,0,
+    114,117,0,0,0,218,16,95,78,97,109,101,115,112,97,99,
+    101,76,111,97,100,101,114,218,7,95,95,110,101,119,95,95,
+    90,5,95,112,97,116,104,114,86,0,0,0,114,120,0,0,
+    0,114,131,0,0,0,114,90,0,0,0,114,128,0,0,0,
+    114,114,0,0,0,114,104,0,0,0,114,93,0,0,0,114,
+    113,0,0,0,114,126,0,0,0,41,5,114,83,0,0,0,
+    114,84,0,0,0,114,130,0,0,0,114,94,0,0,0,114,
+    132,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
+    0,0,0,218,18,95,105,110,105,116,95,109,111,100,117,108,
+    101,95,97,116,116,114,115,248,1,0,0,115,92,0,0,0,
+    0,4,20,1,2,1,12,1,14,1,6,2,20,1,6,1,
+    8,2,10,1,8,1,4,1,6,2,10,1,8,1,2,1,
+    10,1,14,1,6,2,20,1,2,1,12,1,14,1,6,2,
+    2,1,10,1,14,1,6,2,24,1,12,1,2,1,12,1,
+    16,1,6,2,8,1,24,1,2,1,12,1,16,1,6,2,
+    24,1,12,1,2,1,12,1,16,1,6,1,114,134,0,0,
+    0,99,1,0,0,0,0,0,0,0,2,0,0,0,3,0,
+    0,0,67,0,0,0,115,82,0,0,0,100,1,125,1,116,
+    0,124,0,106,1,100,2,131,2,114,30,124,0,106,1,106,
+    2,124,0,131,1,125,1,110,20,116,0,124,0,106,1,100,
+    3,131,2,114,50,116,3,100,4,131,1,130,1,124,1,100,
+    1,107,8,114,68,116,4,124,0,106,5,131,1,125,1,116,
+    6,124,0,124,1,131,2,1,0,124,1,83,0,41,5,122,
+    43,67,114,101,97,116,101,32,97,32,109,111,100,117,108,101,
+    32,98,97,115,101,100,32,111,110,32,116,104,101,32,112,114,
+    111,118,105,100,101,100,32,115,112,101,99,46,78,218,13,99,
+    114,101,97,116,101,95,109,111,100,117,108,101,218,11,101,120,
+    101,99,95,109,111,100,117,108,101,122,66,108,111,97,100,101,
+    114,115,32,116,104,97,116,32,100,101,102,105,110,101,32,101,
+    120,101,99,95,109,111,100,117,108,101,40,41,32,109,117,115,
+    116,32,97,108,115,111,32,100,101,102,105,110,101,32,99,114,
+    101,97,116,101,95,109,111,100,117,108,101,40,41,41,7,114,
+    4,0,0,0,114,94,0,0,0,114,135,0,0,0,114,71,
+    0,0,0,114,16,0,0,0,114,15,0,0,0,114,134,0,
+    0,0,41,2,114,83,0,0,0,114,84,0,0,0,114,10,
+    0,0,0,114,10,0,0,0,114,11,0,0,0,218,16,109,
+    111,100,117,108,101,95,102,114,111,109,95,115,112,101,99,52,
+    2,0,0,115,18,0,0,0,0,3,4,1,12,3,14,1,
+    12,1,8,2,8,1,10,1,10,1,114,137,0,0,0,99,
+    1,0,0,0,0,0,0,0,2,0,0,0,3,0,0,0,
+    67,0,0,0,115,106,0,0,0,124,0,106,0,100,1,107,
+    8,114,14,100,2,110,4,124,0,106,0,125,1,124,0,106,
+    1,100,1,107,8,114,66,124,0,106,2,100,1,107,8,114,
+    50,100,3,106,3,124,1,131,1,83,0,100,4,106,3,124,
+    1,124,0,106,2,131,2,83,0,110,36,124,0,106,4,114,
+    86,100,5,106,3,124,1,124,0,106,1,131,2,83,0,100,
+    6,106,3,124,0,106,0,124,0,106,1,131,2,83,0,100,
+    1,83,0,41,7,122,38,82,101,116,117,114,110,32,116,104,
+    101,32,114,101,112,114,32,116,111,32,117,115,101,32,102,111,
+    114,32,116,104,101,32,109,111,100,117,108,101,46,78,114,88,
+    0,0,0,122,13,60,109,111,100,117,108,101,32,123,33,114,
+    125,62,122,20,60,109,111,100,117,108,101,32,123,33,114,125,
+    32,40,123,33,114,125,41,62,122,23,60,109,111,100,117,108,
+    101,32,123,33,114,125,32,102,114,111,109,32,123,33,114,125,
+    62,122,18,60,109,111,100,117,108,101,32,123,33,114,125,32,
+    40,123,125,41,62,41,5,114,15,0,0,0,114,104,0,0,
+    0,114,94,0,0,0,114,38,0,0,0,114,114,0,0,0,
+    41,2,114,83,0,0,0,114,15,0,0,0,114,10,0,0,
+    0,114,10,0,0,0,114,11,0,0,0,114,92,0,0,0,
+    69,2,0,0,115,16,0,0,0,0,3,20,1,10,1,10,
+    1,10,2,16,2,6,1,14,2,114,92,0,0,0,99,2,
+    0,0,0,0,0,0,0,4,0,0,0,12,0,0,0,67,
+    0,0,0,115,178,0,0,0,124,0,106,0,125,2,116,1,
+    124,2,131,1,143,148,1,0,116,2,106,3,106,4,124,2,
+    131,1,124,1,107,9,114,54,100,1,106,5,124,2,131,1,
+    125,3,116,6,124,3,124,2,100,2,141,2,130,1,124,0,
+    106,7,100,3,107,8,114,106,124,0,106,8,100,3,107,8,
+    114,88,116,6,100,4,124,0,106,0,100,2,141,2,130,1,
+    116,9,124,0,124,1,100,5,100,6,141,3,1,0,124,1,
+    83,0,116,9,124,0,124,1,100,5,100,6,141,3,1,0,
+    116,10,124,0,106,7,100,7,131,2,115,146,124,0,106,7,
+    106,11,124,2,131,1,1,0,110,12,124,0,106,7,106,12,
+    124,1,131,1,1,0,87,0,100,3,81,0,82,0,88,0,
+    116,2,106,3,124,2,25,0,83,0,41,8,122,70,69,120,
+    101,99,117,116,101,32,116,104,101,32,115,112,101,99,39,115,
+    32,115,112,101,99,105,102,105,101,100,32,109,111,100,117,108,
+    101,32,105,110,32,97,110,32,101,120,105,115,116,105,110,103,
+    32,109,111,100,117,108,101,39,115,32,110,97,109,101,115,112,
+    97,99,101,46,122,30,109,111,100,117,108,101,32,123,33,114,
+    125,32,110,111,116,32,105,110,32,115,121,115,46,109,111,100,
+    117,108,101,115,41,1,114,15,0,0,0,78,122,14,109,105,
+    115,115,105,110,103,32,108,111,97,100,101,114,84,41,1,114,
+    130,0,0,0,114,136,0,0,0,41,13,114,15,0,0,0,
+    114,42,0,0,0,114,14,0,0,0,114,80,0,0,0,114,
+    30,0,0,0,114,38,0,0,0,114,71,0,0,0,114,94,
+    0,0,0,114,107,0,0,0,114,134,0,0,0,114,4,0,
+    0,0,218,11,108,111,97,100,95,109,111,100,117,108,101,114,
+    136,0,0,0,41,4,114,83,0,0,0,114,84,0,0,0,
+    114,15,0,0,0,218,3,109,115,103,114,10,0,0,0,114,
+    10,0,0,0,114,11,0,0,0,114,81,0,0,0,86,2,
+    0,0,115,30,0,0,0,0,2,6,1,10,1,16,1,10,
+    1,12,1,10,1,10,1,14,2,14,1,4,1,14,1,12,
+    4,14,2,22,1,114,81,0,0,0,99,1,0,0,0,0,
+    0,0,0,2,0,0,0,27,0,0,0,67,0,0,0,115,
+    206,0,0,0,124,0,106,0,106,1,124,0,106,2,131,1,
+    1,0,116,3,106,4,124,0,106,2,25,0,125,1,116,5,
+    124,1,100,1,100,0,131,3,100,0,107,8,114,76,121,12,
+    124,0,106,0,124,1,95,6,87,0,110,20,4,0,116,7,
+    107,10,114,74,1,0,1,0,1,0,89,0,110,2,88,0,
+    116,5,124,1,100,2,100,0,131,3,100,0,107,8,114,154,
+    121,40,124,1,106,8,124,1,95,9,116,10,124,1,100,3,
+    131,2,115,130,124,0,106,2,106,11,100,4,131,1,100,5,
+    25,0,124,1,95,9,87,0,110,20,4,0,116,7,107,10,
+    114,152,1,0,1,0,1,0,89,0,110,2,88,0,116,5,
+    124,1,100,6,100,0,131,3,100,0,107,8,114,202,121,10,
+    124,0,124,1,95,12,87,0,110,20,4,0,116,7,107,10,
+    114,200,1,0,1,0,1,0,89,0,110,2,88,0,124,1,
+    83,0,41,7,78,114,86,0,0,0,114,131,0,0,0,114,
+    128,0,0,0,114,118,0,0,0,114,19,0,0,0,114,90,
+    0,0,0,41,13,114,94,0,0,0,114,138,0,0,0,114,
+    15,0,0,0,114,14,0,0,0,114,80,0,0,0,114,6,
+    0,0,0,114,86,0,0,0,114,91,0,0,0,114,1,0,
+    0,0,114,131,0,0,0,114,4,0,0,0,114,119,0,0,
+    0,114,90,0,0,0,41,2,114,83,0,0,0,114,84,0,
+    0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,
+    0,218,25,95,108,111,97,100,95,98,97,99,107,119,97,114,
+    100,95,99,111,109,112,97,116,105,98,108,101,110,2,0,0,
+    115,40,0,0,0,0,4,14,2,12,1,16,1,2,1,12,
+    1,14,1,6,1,16,1,2,4,8,1,10,1,22,1,14,
+    1,6,1,16,1,2,1,10,1,14,1,6,1,114,140,0,
+    0,0,99,1,0,0,0,0,0,0,0,2,0,0,0,11,
+    0,0,0,67,0,0,0,115,118,0,0,0,124,0,106,0,
+    100,0,107,9,114,30,116,1,124,0,106,0,100,1,131,2,
+    115,30,116,2,124,0,131,1,83,0,116,3,124,0,131,1,
+    125,1,116,4,124,1,131,1,143,54,1,0,124,0,106,0,
+    100,0,107,8,114,84,124,0,106,5,100,0,107,8,114,96,
+    116,6,100,2,124,0,106,7,100,3,141,2,130,1,110,12,
+    124,0,106,0,106,8,124,1,131,1,1,0,87,0,100,0,
+    81,0,82,0,88,0,116,9,106,10,124,0,106,7,25,0,
+    83,0,41,4,78,114,136,0,0,0,122,14,109,105,115,115,
+    105,110,103,32,108,111,97,100,101,114,41,1,114,15,0,0,
+    0,41,11,114,94,0,0,0,114,4,0,0,0,114,140,0,
+    0,0,114,137,0,0,0,114,97,0,0,0,114,107,0,0,
+    0,114,71,0,0,0,114,15,0,0,0,114,136,0,0,0,
+    114,14,0,0,0,114,80,0,0,0,41,2,114,83,0,0,
+    0,114,84,0,0,0,114,10,0,0,0,114,10,0,0,0,
+    114,11,0,0,0,218,14,95,108,111,97,100,95,117,110,108,
+    111,99,107,101,100,139,2,0,0,115,20,0,0,0,0,2,
+    10,2,12,1,8,2,8,1,10,1,10,1,10,1,16,3,
+    22,5,114,141,0,0,0,99,1,0,0,0,0,0,0,0,
+    1,0,0,0,9,0,0,0,67,0,0,0,115,30,0,0,
+    0,116,0,124,0,106,1,131,1,143,10,1,0,116,2,124,
+    0,131,1,83,0,81,0,82,0,88,0,100,1,83,0,41,
+    2,122,191,82,101,116,117,114,110,32,97,32,110,101,119,32,
+    109,111,100,117,108,101,32,111,98,106,101,99,116,44,32,108,
+    111,97,100,101,100,32,98,121,32,116,104,101,32,115,112,101,
+    99,39,115,32,108,111,97,100,101,114,46,10,10,32,32,32,
+    32,84,104,101,32,109,111,100,117,108,101,32,105,115,32,110,
+    111,116,32,97,100,100,101,100,32,116,111,32,105,116,115,32,
+    112,97,114,101,110,116,46,10,10,32,32,32,32,73,102,32,
+    97,32,109,111,100,117,108,101,32,105,115,32,97,108,114,101,
+    97,100,121,32,105,110,32,115,121,115,46,109,111,100,117,108,
+    101,115,44,32,116,104,97,116,32,101,120,105,115,116,105,110,
+    103,32,109,111,100,117,108,101,32,103,101,116,115,10,32,32,
+    32,32,99,108,111,98,98,101,114,101,100,46,10,10,32,32,
+    32,32,78,41,3,114,42,0,0,0,114,15,0,0,0,114,
+    141,0,0,0,41,1,114,83,0,0,0,114,10,0,0,0,
+    114,10,0,0,0,114,11,0,0,0,114,82,0,0,0,162,
+    2,0,0,115,4,0,0,0,0,9,12,1,114,82,0,0,
+    0,99,0,0,0,0,0,0,0,0,0,0,0,0,4,0,
+    0,0,64,0,0,0,115,136,0,0,0,101,0,90,1,100,
+    0,90,2,100,1,90,3,101,4,100,2,100,3,132,0,131,
+    1,90,5,101,6,100,19,100,5,100,6,132,1,131,1,90,
+    7,101,6,100,20,100,7,100,8,132,1,131,1,90,8,101,
+    6,100,9,100,10,132,0,131,1,90,9,101,6,100,11,100,
+    12,132,0,131,1,90,10,101,6,101,11,100,13,100,14,132,
+    0,131,1,131,1,90,12,101,6,101,11,100,15,100,16,132,
+    0,131,1,131,1,90,13,101,6,101,11,100,17,100,18,132,
+    0,131,1,131,1,90,14,101,6,101,15,131,1,90,16,100,
+    4,83,0,41,21,218,15,66,117,105,108,116,105,110,73,109,
+    112,111,114,116,101,114,122,144,77,101,116,97,32,112,97,116,
+    104,32,105,109,112,111,114,116,32,102,111,114,32,98,117,105,
+    108,116,45,105,110,32,109,111,100,117,108,101,115,46,10,10,
+    32,32,32,32,65,108,108,32,109,101,116,104,111,100,115,32,
+    97,114,101,32,101,105,116,104,101,114,32,99,108,97,115,115,
+    32,111,114,32,115,116,97,116,105,99,32,109,101,116,104,111,
+    100,115,32,116,111,32,97,118,111,105,100,32,116,104,101,32,
+    110,101,101,100,32,116,111,10,32,32,32,32,105,110,115,116,
+    97,110,116,105,97,116,101,32,116,104,101,32,99,108,97,115,
+    115,46,10,10,32,32,32,32,99,1,0,0,0,0,0,0,
+    0,1,0,0,0,2,0,0,0,67,0,0,0,115,12,0,
+    0,0,100,1,106,0,124,0,106,1,131,1,83,0,41,2,
+    122,115,82,101,116,117,114,110,32,114,101,112,114,32,102,111,
+    114,32,116,104,101,32,109,111,100,117,108,101,46,10,10,32,
+    32,32,32,32,32,32,32,84,104,101,32,109,101,116,104,111,
+    100,32,105,115,32,100,101,112,114,101,99,97,116,101,100,46,
+    32,32,84,104,101,32,105,109,112,111,114,116,32,109,97,99,
+    104,105,110,101,114,121,32,100,111,101,115,32,116,104,101,32,
+    106,111,98,32,105,116,115,101,108,102,46,10,10,32,32,32,
+    32,32,32,32,32,122,24,60,109,111,100,117,108,101,32,123,
+    33,114,125,32,40,98,117,105,108,116,45,105,110,41,62,41,
+    2,114,38,0,0,0,114,1,0,0,0,41,1,114,84,0,
+    0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,
+    0,114,87,0,0,0,186,2,0,0,115,2,0,0,0,0,
+    7,122,27,66,117,105,108,116,105,110,73,109,112,111,114,116,
+    101,114,46,109,111,100,117,108,101,95,114,101,112,114,78,99,
+    4,0,0,0,0,0,0,0,4,0,0,0,5,0,0,0,
+    67,0,0,0,115,44,0,0,0,124,2,100,0,107,9,114,
+    12,100,0,83,0,116,0,106,1,124,1,131,1,114,36,116,
+    2,124,1,124,0,100,1,100,2,141,3,83,0,100,0,83,
+    0,100,0,83,0,41,3,78,122,8,98,117,105,108,116,45,
+    105,110,41,1,114,104,0,0,0,41,3,114,49,0,0,0,
+    90,10,105,115,95,98,117,105,108,116,105,110,114,79,0,0,
+    0,41,4,218,3,99,108,115,114,72,0,0,0,218,4,112,
+    97,116,104,218,6,116,97,114,103,101,116,114,10,0,0,0,
+    114,10,0,0,0,114,11,0,0,0,218,9,102,105,110,100,
+    95,115,112,101,99,195,2,0,0,115,10,0,0,0,0,2,
+    8,1,4,1,10,1,14,2,122,25,66,117,105,108,116,105,
+    110,73,109,112,111,114,116,101,114,46,102,105,110,100,95,115,
+    112,101,99,99,3,0,0,0,0,0,0,0,4,0,0,0,
+    3,0,0,0,67,0,0,0,115,30,0,0,0,124,0,106,
+    0,124,1,124,2,131,2,125,3,124,3,100,1,107,9,114,
+    26,124,3,106,1,83,0,100,1,83,0,41,2,122,175,70,
+    105,110,100,32,116,104,101,32,98,117,105,108,116,45,105,110,
     32,109,111,100,117,108,101,46,10,10,32,32,32,32,32,32,
-    32,32,84,104,101,32,109,101,116,104,111,100,32,105,115,32,
-    100,101,112,114,101,99,97,116,101,100,46,32,32,84,104,101,
-    32,105,109,112,111,114,116,32,109,97,99,104,105,110,101,114,
-    121,32,100,111,101,115,32,116,104,101,32,106,111,98,32,105,
-    116,115,101,108,102,46,10,10,32,32,32,32,32,32,32,32,
-    122,24,60,109,111,100,117,108,101,32,123,33,114,125,32,40,
-    98,117,105,108,116,45,105,110,41,62,41,2,114,38,0,0,
-    0,114,1,0,0,0,41,1,114,84,0,0,0,114,10,0,
-    0,0,114,10,0,0,0,114,11,0,0,0,114,87,0,0,
-    0,176,2,0,0,115,2,0,0,0,0,7,122,27,66,117,
-    105,108,116,105,110,73,109,112,111,114,116,101,114,46,109,111,
-    100,117,108,101,95,114,101,112,114,78,99,4,0,0,0,0,
-    0,0,0,4,0,0,0,5,0,0,0,67,0,0,0,115,
-    44,0,0,0,124,2,100,0,107,9,114,12,100,0,83,0,
-    116,0,106,1,124,1,131,1,114,36,116,2,124,1,124,0,
-    100,1,100,2,141,3,83,0,100,0,83,0,100,0,83,0,
-    41,3,78,122,8,98,117,105,108,116,45,105,110,41,1,114,
-    104,0,0,0,41,3,114,52,0,0,0,90,10,105,115,95,
-    98,117,105,108,116,105,110,114,79,0,0,0,41,4,218,3,
-    99,108,115,114,72,0,0,0,218,4,112,97,116,104,218,6,
-    116,97,114,103,101,116,114,10,0,0,0,114,10,0,0,0,
-    114,11,0,0,0,218,9,102,105,110,100,95,115,112,101,99,
-    185,2,0,0,115,10,0,0,0,0,2,8,1,4,1,10,
-    1,14,2,122,25,66,117,105,108,116,105,110,73,109,112,111,
-    114,116,101,114,46,102,105,110,100,95,115,112,101,99,99,3,
-    0,0,0,0,0,0,0,4,0,0,0,3,0,0,0,67,
-    0,0,0,115,30,0,0,0,124,0,106,0,124,1,124,2,
-    131,2,125,3,124,3,100,1,107,9,114,26,124,3,106,1,
-    83,0,100,1,83,0,41,2,122,175,70,105,110,100,32,116,
-    104,101,32,98,117,105,108,116,45,105,110,32,109,111,100,117,
-    108,101,46,10,10,32,32,32,32,32,32,32,32,73,102,32,
-    39,112,97,116,104,39,32,105,115,32,101,118,101,114,32,115,
-    112,101,99,105,102,105,101,100,32,116,104,101,110,32,116,104,
-    101,32,115,101,97,114,99,104,32,105,115,32,99,111,110,115,
-    105,100,101,114,101,100,32,97,32,102,97,105,108,117,114,101,
-    46,10,10,32,32,32,32,32,32,32,32,84,104,105,115,32,
-    109,101,116,104,111,100,32,105,115,32,100,101,112,114,101,99,
-    97,116,101,100,46,32,32,85,115,101,32,102,105,110,100,95,
-    115,112,101,99,40,41,32,105,110,115,116,101,97,100,46,10,
-    10,32,32,32,32,32,32,32,32,78,41,2,114,146,0,0,
-    0,114,94,0,0,0,41,4,114,143,0,0,0,114,72,0,
-    0,0,114,144,0,0,0,114,83,0,0,0,114,10,0,0,
-    0,114,10,0,0,0,114,11,0,0,0,218,11,102,105,110,
-    100,95,109,111,100,117,108,101,194,2,0,0,115,4,0,0,
-    0,0,9,12,1,122,27,66,117,105,108,116,105,110,73,109,
-    112,111,114,116,101,114,46,102,105,110,100,95,109,111,100,117,
-    108,101,99,2,0,0,0,0,0,0,0,2,0,0,0,4,
-    0,0,0,67,0,0,0,115,46,0,0,0,124,1,106,0,
-    116,1,106,2,107,7,114,34,116,3,100,1,106,4,124,1,
-    106,0,131,1,124,1,106,0,100,2,141,2,130,1,116,5,
-    116,6,106,7,124,1,131,2,83,0,41,3,122,24,67,114,
-    101,97,116,101,32,97,32,98,117,105,108,116,45,105,110,32,
-    109,111,100,117,108,101,122,29,123,33,114,125,32,105,115,32,
-    110,111,116,32,97,32,98,117,105,108,116,45,105,110,32,109,
-    111,100,117,108,101,41,1,114,15,0,0,0,41,8,114,15,
-    0,0,0,114,14,0,0,0,114,70,0,0,0,114,71,0,
-    0,0,114,38,0,0,0,114,59,0,0,0,114,52,0,0,
-    0,90,14,99,114,101,97,116,101,95,98,117,105,108,116,105,
-    110,41,2,114,26,0,0,0,114,83,0,0,0,114,10,0,
-    0,0,114,10,0,0,0,114,11,0,0,0,114,135,0,0,
-    0,206,2,0,0,115,8,0,0,0,0,3,12,1,12,1,
-    10,1,122,29,66,117,105,108,116,105,110,73,109,112,111,114,
-    116,101,114,46,99,114,101,97,116,101,95,109,111,100,117,108,
-    101,99,2,0,0,0,0,0,0,0,2,0,0,0,3,0,
-    0,0,67,0,0,0,115,16,0,0,0,116,0,116,1,106,
-    2,124,1,131,2,1,0,100,1,83,0,41,2,122,22,69,
-    120,101,99,32,97,32,98,117,105,108,116,45,105,110,32,109,
-    111,100,117,108,101,78,41,3,114,59,0,0,0,114,52,0,
-    0,0,90,12,101,120,101,99,95,98,117,105,108,116,105,110,
-    41,2,114,26,0,0,0,114,84,0,0,0,114,10,0,0,
-    0,114,10,0,0,0,114,11,0,0,0,114,136,0,0,0,
-    214,2,0,0,115,2,0,0,0,0,3,122,27,66,117,105,
-    108,116,105,110,73,109,112,111,114,116,101,114,46,101,120,101,
-    99,95,109,111,100,117,108,101,99,2,0,0,0,0,0,0,
+    32,32,73,102,32,39,112,97,116,104,39,32,105,115,32,101,
+    118,101,114,32,115,112,101,99,105,102,105,101,100,32,116,104,
+    101,110,32,116,104,101,32,115,101,97,114,99,104,32,105,115,
+    32,99,111,110,115,105,100,101,114,101,100,32,97,32,102,97,
+    105,108,117,114,101,46,10,10,32,32,32,32,32,32,32,32,
+    84,104,105,115,32,109,101,116,104,111,100,32,105,115,32,100,
+    101,112,114,101,99,97,116,101,100,46,32,32,85,115,101,32,
+    102,105,110,100,95,115,112,101,99,40,41,32,105,110,115,116,
+    101,97,100,46,10,10,32,32,32,32,32,32,32,32,78,41,
+    2,114,146,0,0,0,114,94,0,0,0,41,4,114,143,0,
+    0,0,114,72,0,0,0,114,144,0,0,0,114,83,0,0,
+    0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
+    218,11,102,105,110,100,95,109,111,100,117,108,101,204,2,0,
+    0,115,4,0,0,0,0,9,12,1,122,27,66,117,105,108,
+    116,105,110,73,109,112,111,114,116,101,114,46,102,105,110,100,
+    95,109,111,100,117,108,101,99,2,0,0,0,0,0,0,0,
+    2,0,0,0,4,0,0,0,67,0,0,0,115,46,0,0,
+    0,124,1,106,0,116,1,106,2,107,7,114,34,116,3,100,
+    1,106,4,124,1,106,0,131,1,124,1,106,0,100,2,141,
+    2,130,1,116,5,116,6,106,7,124,1,131,2,83,0,41,
+    3,122,24,67,114,101,97,116,101,32,97,32,98,117,105,108,
+    116,45,105,110,32,109,111,100,117,108,101,122,29,123,33,114,
+    125,32,105,115,32,110,111,116,32,97,32,98,117,105,108,116,
+    45,105,110,32,109,111,100,117,108,101,41,1,114,15,0,0,
+    0,41,8,114,15,0,0,0,114,14,0,0,0,114,70,0,
+    0,0,114,71,0,0,0,114,38,0,0,0,114,59,0,0,
+    0,114,49,0,0,0,90,14,99,114,101,97,116,101,95,98,
+    117,105,108,116,105,110,41,2,114,26,0,0,0,114,83,0,
+    0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,
+    0,114,135,0,0,0,216,2,0,0,115,8,0,0,0,0,
+    3,12,1,12,1,10,1,122,29,66,117,105,108,116,105,110,
+    73,109,112,111,114,116,101,114,46,99,114,101,97,116,101,95,
+    109,111,100,117,108,101,99,2,0,0,0,0,0,0,0,2,
+    0,0,0,3,0,0,0,67,0,0,0,115,16,0,0,0,
+    116,0,116,1,106,2,124,1,131,2,1,0,100,1,83,0,
+    41,2,122,22,69,120,101,99,32,97,32,98,117,105,108,116,
+    45,105,110,32,109,111,100,117,108,101,78,41,3,114,59,0,
+    0,0,114,49,0,0,0,90,12,101,120,101,99,95,98,117,
+    105,108,116,105,110,41,2,114,26,0,0,0,114,84,0,0,
+    0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
+    114,136,0,0,0,224,2,0,0,115,2,0,0,0,0,3,
+    122,27,66,117,105,108,116,105,110,73,109,112,111,114,116,101,
+    114,46,101,120,101,99,95,109,111,100,117,108,101,99,2,0,
+    0,0,0,0,0,0,2,0,0,0,1,0,0,0,67,0,
+    0,0,115,4,0,0,0,100,1,83,0,41,2,122,57,82,
+    101,116,117,114,110,32,78,111,110,101,32,97,115,32,98,117,
+    105,108,116,45,105,110,32,109,111,100,117,108,101,115,32,100,
+    111,32,110,111,116,32,104,97,118,101,32,99,111,100,101,32,
+    111,98,106,101,99,116,115,46,78,114,10,0,0,0,41,2,
+    114,143,0,0,0,114,72,0,0,0,114,10,0,0,0,114,
+    10,0,0,0,114,11,0,0,0,218,8,103,101,116,95,99,
+    111,100,101,229,2,0,0,115,2,0,0,0,0,4,122,24,
+    66,117,105,108,116,105,110,73,109,112,111,114,116,101,114,46,
+    103,101,116,95,99,111,100,101,99,2,0,0,0,0,0,0,
     0,2,0,0,0,1,0,0,0,67,0,0,0,115,4,0,
-    0,0,100,1,83,0,41,2,122,57,82,101,116,117,114,110,
+    0,0,100,1,83,0,41,2,122,56,82,101,116,117,114,110,
     32,78,111,110,101,32,97,115,32,98,117,105,108,116,45,105,
     110,32,109,111,100,117,108,101,115,32,100,111,32,110,111,116,
-    32,104,97,118,101,32,99,111,100,101,32,111,98,106,101,99,
-    116,115,46,78,114,10,0,0,0,41,2,114,143,0,0,0,
-    114,72,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
-    11,0,0,0,218,8,103,101,116,95,99,111,100,101,219,2,
-    0,0,115,2,0,0,0,0,4,122,24,66,117,105,108,116,
-    105,110,73,109,112,111,114,116,101,114,46,103,101,116,95,99,
-    111,100,101,99,2,0,0,0,0,0,0,0,2,0,0,0,
-    1,0,0,0,67,0,0,0,115,4,0,0,0,100,1,83,
-    0,41,2,122,56,82,101,116,117,114,110,32,78,111,110,101,
-    32,97,115,32,98,117,105,108,116,45,105,110,32,109,111,100,
-    117,108,101,115,32,100,111,32,110,111,116,32,104,97,118,101,
-    32,115,111,117,114,99,101,32,99,111,100,101,46,78,114,10,
-    0,0,0,41,2,114,143,0,0,0,114,72,0,0,0,114,
-    10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,10,
-    103,101,116,95,115,111,117,114,99,101,225,2,0,0,115,2,
-    0,0,0,0,4,122,26,66,117,105,108,116,105,110,73,109,
-    112,111,114,116,101,114,46,103,101,116,95,115,111,117,114,99,
-    101,99,2,0,0,0,0,0,0,0,2,0,0,0,1,0,
-    0,0,67,0,0,0,115,4,0,0,0,100,1,83,0,41,
-    2,122,52,82,101,116,117,114,110,32,70,97,108,115,101,32,
-    97,115,32,98,117,105,108,116,45,105,110,32,109,111,100,117,
-    108,101,115,32,97,114,101,32,110,101,118,101,114,32,112,97,
-    99,107,97,103,101,115,46,70,114,10,0,0,0,41,2,114,
-    143,0,0,0,114,72,0,0,0,114,10,0,0,0,114,10,
-    0,0,0,114,11,0,0,0,114,106,0,0,0,231,2,0,
-    0,115,2,0,0,0,0,4,122,26,66,117,105,108,116,105,
-    110,73,109,112,111,114,116,101,114,46,105,115,95,112,97,99,
-    107,97,103,101,41,2,78,78,41,1,78,41,17,114,1,0,
-    0,0,114,0,0,0,0,114,2,0,0,0,114,3,0,0,
-    0,218,12,115,116,97,116,105,99,109,101,116,104,111,100,114,
-    87,0,0,0,218,11,99,108,97,115,115,109,101,116,104,111,
-    100,114,146,0,0,0,114,147,0,0,0,114,135,0,0,0,
-    114,136,0,0,0,114,75,0,0,0,114,148,0,0,0,114,
-    149,0,0,0,114,106,0,0,0,114,85,0,0,0,114,138,
-    0,0,0,114,10,0,0,0,114,10,0,0,0,114,10,0,
-    0,0,114,11,0,0,0,114,142,0,0,0,167,2,0,0,
-    115,30,0,0,0,8,7,4,2,12,9,2,1,12,8,2,
-    1,12,11,12,8,12,5,2,1,14,5,2,1,14,5,2,
-    1,14,5,114,142,0,0,0,99,0,0,0,0,0,0,0,
-    0,0,0,0,0,4,0,0,0,64,0,0,0,115,140,0,
-    0,0,101,0,90,1,100,0,90,2,100,1,90,3,101,4,
-    100,2,100,3,132,0,131,1,90,5,101,6,100,21,100,5,
-    100,6,132,1,131,1,90,7,101,6,100,22,100,7,100,8,
-    132,1,131,1,90,8,101,6,100,9,100,10,132,0,131,1,
-    90,9,101,4,100,11,100,12,132,0,131,1,90,10,101,6,
-    100,13,100,14,132,0,131,1,90,11,101,6,101,12,100,15,
-    100,16,132,0,131,1,131,1,90,13,101,6,101,12,100,17,
-    100,18,132,0,131,1,131,1,90,14,101,6,101,12,100,19,
-    100,20,132,0,131,1,131,1,90,15,100,4,83,0,41,23,
-    218,14,70,114,111,122,101,110,73,109,112,111,114,116,101,114,
-    122,142,77,101,116,97,32,112,97,116,104,32,105,109,112,111,
-    114,116,32,102,111,114,32,102,114,111,122,101,110,32,109,111,
-    100,117,108,101,115,46,10,10,32,32,32,32,65,108,108,32,
-    109,101,116,104,111,100,115,32,97,114,101,32,101,105,116,104,
-    101,114,32,99,108,97,115,115,32,111,114,32,115,116,97,116,
-    105,99,32,109,101,116,104,111,100,115,32,116,111,32,97,118,
-    111,105,100,32,116,104,101,32,110,101,101,100,32,116,111,10,
-    32,32,32,32,105,110,115,116,97,110,116,105,97,116,101,32,
-    116,104,101,32,99,108,97,115,115,46,10,10,32,32,32,32,
-    99,1,0,0,0,0,0,0,0,1,0,0,0,2,0,0,
-    0,67,0,0,0,115,12,0,0,0,100,1,106,0,124,0,
-    106,1,131,1,83,0,41,2,122,115,82,101,116,117,114,110,
-    32,114,101,112,114,32,102,111,114,32,116,104,101,32,109,111,
-    100,117,108,101,46,10,10,32,32,32,32,32,32,32,32,84,
-    104,101,32,109,101,116,104,111,100,32,105,115,32,100,101,112,
-    114,101,99,97,116,101,100,46,32,32,84,104,101,32,105,109,
-    112,111,114,116,32,109,97,99,104,105,110,101,114,121,32,100,
-    111,101,115,32,116,104,101,32,106,111,98,32,105,116,115,101,
-    108,102,46,10,10,32,32,32,32,32,32,32,32,122,22,60,
-    109,111,100,117,108,101,32,123,33,114,125,32,40,102,114,111,
-    122,101,110,41,62,41,2,114,38,0,0,0,114,1,0,0,
-    0,41,1,218,1,109,114,10,0,0,0,114,10,0,0,0,
-    114,11,0,0,0,114,87,0,0,0,249,2,0,0,115,2,
-    0,0,0,0,7,122,26,70,114,111,122,101,110,73,109,112,
-    111,114,116,101,114,46,109,111,100,117,108,101,95,114,101,112,
-    114,78,99,4,0,0,0,0,0,0,0,4,0,0,0,5,
-    0,0,0,67,0,0,0,115,32,0,0,0,116,0,106,1,
-    124,1,131,1,114,24,116,2,124,1,124,0,100,1,100,2,
-    141,3,83,0,100,0,83,0,100,0,83,0,41,3,78,90,
-    6,102,114,111,122,101,110,41,1,114,104,0,0,0,41,3,
-    114,52,0,0,0,114,76,0,0,0,114,79,0,0,0,41,
-    4,114,143,0,0,0,114,72,0,0,0,114,144,0,0,0,
-    114,145,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
-    11,0,0,0,114,146,0,0,0,2,3,0,0,115,6,0,
-    0,0,0,2,10,1,14,2,122,24,70,114,111,122,101,110,
-    73,109,112,111,114,116,101,114,46,102,105,110,100,95,115,112,
-    101,99,99,3,0,0,0,0,0,0,0,3,0,0,0,2,
-    0,0,0,67,0,0,0,115,18,0,0,0,116,0,106,1,
-    124,1,131,1,114,14,124,0,83,0,100,1,83,0,41,2,
-    122,93,70,105,110,100,32,97,32,102,114,111,122,101,110,32,
-    109,111,100,117,108,101,46,10,10,32,32,32,32,32,32,32,
-    32,84,104,105,115,32,109,101,116,104,111,100,32,105,115,32,
-    100,101,112,114,101,99,97,116,101,100,46,32,32,85,115,101,
-    32,102,105,110,100,95,115,112,101,99,40,41,32,105,110,115,
-    116,101,97,100,46,10,10,32,32,32,32,32,32,32,32,78,
-    41,2,114,52,0,0,0,114,76,0,0,0,41,3,114,143,
-    0,0,0,114,72,0,0,0,114,144,0,0,0,114,10,0,
-    0,0,114,10,0,0,0,114,11,0,0,0,114,147,0,0,
-    0,9,3,0,0,115,2,0,0,0,0,7,122,26,70,114,
-    111,122,101,110,73,109,112,111,114,116,101,114,46,102,105,110,
-    100,95,109,111,100,117,108,101,99,2,0,0,0,0,0,0,
-    0,2,0,0,0,1,0,0,0,67,0,0,0,115,4,0,
-    0,0,100,1,83,0,41,2,122,42,85,115,101,32,100,101,
-    102,97,117,108,116,32,115,101,109,97,110,116,105,99,115,32,
-    102,111,114,32,109,111,100,117,108,101,32,99,114,101,97,116,
-    105,111,110,46,78,114,10,0,0,0,41,2,114,143,0,0,
-    0,114,83,0,0,0,114,10,0,0,0,114,10,0,0,0,
-    114,11,0,0,0,114,135,0,0,0,18,3,0,0,115,0,
-    0,0,0,122,28,70,114,111,122,101,110,73,109,112,111,114,
-    116,101,114,46,99,114,101,97,116,101,95,109,111,100,117,108,
-    101,99,1,0,0,0,0,0,0,0,3,0,0,0,4,0,
-    0,0,67,0,0,0,115,64,0,0,0,124,0,106,0,106,
-    1,125,1,116,2,106,3,124,1,131,1,115,36,116,4,100,
-    1,106,5,124,1,131,1,124,1,100,2,141,2,130,1,116,
-    6,116,2,106,7,124,1,131,2,125,2,116,8,124,2,124,
-    0,106,9,131,2,1,0,100,0,83,0,41,3,78,122,27,
-    123,33,114,125,32,105,115,32,110,111,116,32,97,32,102,114,
-    111,122,101,110,32,109,111,100,117,108,101,41,1,114,15,0,
-    0,0,41,10,114,90,0,0,0,114,15,0,0,0,114,52,
-    0,0,0,114,76,0,0,0,114,71,0,0,0,114,38,0,
-    0,0,114,59,0,0,0,218,17,103,101,116,95,102,114,111,
-    122,101,110,95,111,98,106,101,99,116,218,4,101,120,101,99,
-    114,7,0,0,0,41,3,114,84,0,0,0,114,15,0,0,
-    0,218,4,99,111,100,101,114,10,0,0,0,114,10,0,0,
-    0,114,11,0,0,0,114,136,0,0,0,22,3,0,0,115,
-    12,0,0,0,0,2,8,1,10,1,10,1,8,1,12,1,
-    122,26,70,114,111,122,101,110,73,109,112,111,114,116,101,114,
-    46,101,120,101,99,95,109,111,100,117,108,101,99,2,0,0,
-    0,0,0,0,0,2,0,0,0,3,0,0,0,67,0,0,
-    0,115,10,0,0,0,116,0,124,0,124,1,131,2,83,0,
-    41,1,122,95,76,111,97,100,32,97,32,102,114,111,122,101,
-    110,32,109,111,100,117,108,101,46,10,10,32,32,32,32,32,
-    32,32,32,84,104,105,115,32,109,101,116,104,111,100,32,105,
-    115,32,100,101,112,114,101,99,97,116,101,100,46,32,32,85,
-    115,101,32,101,120,101,99,95,109,111,100,117,108,101,40,41,
-    32,105,110,115,116,101,97,100,46,10,10,32,32,32,32,32,
-    32,32,32,41,1,114,85,0,0,0,41,2,114,143,0,0,
-    0,114,72,0,0,0,114,10,0,0,0,114,10,0,0,0,
-    114,11,0,0,0,114,138,0,0,0,31,3,0,0,115,2,
-    0,0,0,0,7,122,26,70,114,111,122,101,110,73,109,112,
-    111,114,116,101,114,46,108,111,97,100,95,109,111,100,117,108,
-    101,99,2,0,0,0,0,0,0,0,2,0,0,0,2,0,
-    0,0,67,0,0,0,115,10,0,0,0,116,0,106,1,124,
-    1,131,1,83,0,41,1,122,45,82,101,116,117,114,110,32,
-    116,104,101,32,99,111,100,101,32,111,98,106,101,99,116,32,
-    102,111,114,32,116,104,101,32,102,114,111,122,101,110,32,109,
-    111,100,117,108,101,46,41,2,114,52,0,0,0,114,154,0,
-    0,0,41,2,114,143,0,0,0,114,72,0,0,0,114,10,
-    0,0,0,114,10,0,0,0,114,11,0,0,0,114,148,0,
-    0,0,40,3,0,0,115,2,0,0,0,0,4,122,23,70,
-    114,111,122,101,110,73,109,112,111,114,116,101,114,46,103,101,
-    116,95,99,111,100,101,99,2,0,0,0,0,0,0,0,2,
+    32,104,97,118,101,32,115,111,117,114,99,101,32,99,111,100,
+    101,46,78,114,10,0,0,0,41,2,114,143,0,0,0,114,
+    72,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
+    0,0,0,218,10,103,101,116,95,115,111,117,114,99,101,235,
+    2,0,0,115,2,0,0,0,0,4,122,26,66,117,105,108,
+    116,105,110,73,109,112,111,114,116,101,114,46,103,101,116,95,
+    115,111,117,114,99,101,99,2,0,0,0,0,0,0,0,2,
     0,0,0,1,0,0,0,67,0,0,0,115,4,0,0,0,
-    100,1,83,0,41,2,122,54,82,101,116,117,114,110,32,78,
-    111,110,101,32,97,115,32,102,114,111,122,101,110,32,109,111,
-    100,117,108,101,115,32,100,111,32,110,111,116,32,104,97,118,
-    101,32,115,111,117,114,99,101,32,99,111,100,101,46,78,114,
-    10,0,0,0,41,2,114,143,0,0,0,114,72,0,0,0,
-    114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,
-    149,0,0,0,46,3,0,0,115,2,0,0,0,0,4,122,
-    25,70,114,111,122,101,110,73,109,112,111,114,116,101,114,46,
-    103,101,116,95,115,111,117,114,99,101,99,2,0,0,0,0,
-    0,0,0,2,0,0,0,2,0,0,0,67,0,0,0,115,
-    10,0,0,0,116,0,106,1,124,1,131,1,83,0,41,1,
-    122,46,82,101,116,117,114,110,32,84,114,117,101,32,105,102,
-    32,116,104,101,32,102,114,111,122,101,110,32,109,111,100,117,
-    108,101,32,105,115,32,97,32,112,97,99,107,97,103,101,46,
-    41,2,114,52,0,0,0,90,17,105,115,95,102,114,111,122,
-    101,110,95,112,97,99,107,97,103,101,41,2,114,143,0,0,
-    0,114,72,0,0,0,114,10,0,0,0,114,10,0,0,0,
-    114,11,0,0,0,114,106,0,0,0,52,3,0,0,115,2,
-    0,0,0,0,4,122,25,70,114,111,122,101,110,73,109,112,
-    111,114,116,101,114,46,105,115,95,112,97,99,107,97,103,101,
-    41,2,78,78,41,1,78,41,16,114,1,0,0,0,114,0,
-    0,0,0,114,2,0,0,0,114,3,0,0,0,114,150,0,
-    0,0,114,87,0,0,0,114,151,0,0,0,114,146,0,0,
-    0,114,147,0,0,0,114,135,0,0,0,114,136,0,0,0,
-    114,138,0,0,0,114,78,0,0,0,114,148,0,0,0,114,
-    149,0,0,0,114,106,0,0,0,114,10,0,0,0,114,10,
-    0,0,0,114,10,0,0,0,114,11,0,0,0,114,152,0,
-    0,0,240,2,0,0,115,30,0,0,0,8,7,4,2,12,
-    9,2,1,12,6,2,1,12,8,12,4,12,9,12,9,2,
-    1,14,5,2,1,14,5,2,1,114,152,0,0,0,99,0,
-    0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,64,
-    0,0,0,115,32,0,0,0,101,0,90,1,100,0,90,2,
-    100,1,90,3,100,2,100,3,132,0,90,4,100,4,100,5,
-    132,0,90,5,100,6,83,0,41,7,218,18,95,73,109,112,
-    111,114,116,76,111,99,107,67,111,110,116,101,120,116,122,36,
-    67,111,110,116,101,120,116,32,109,97,110,97,103,101,114,32,
-    102,111,114,32,116,104,101,32,105,109,112,111,114,116,32,108,
-    111,99,107,46,99,1,0,0,0,0,0,0,0,1,0,0,
-    0,1,0,0,0,67,0,0,0,115,12,0,0,0,116,0,
-    106,1,131,0,1,0,100,1,83,0,41,2,122,24,65,99,
-    113,117,105,114,101,32,116,104,101,32,105,109,112,111,114,116,
-    32,108,111,99,107,46,78,41,2,114,52,0,0,0,114,53,
-    0,0,0,41,1,114,26,0,0,0,114,10,0,0,0,114,
-    10,0,0,0,114,11,0,0,0,114,46,0,0,0,65,3,
-    0,0,115,2,0,0,0,0,2,122,28,95,73,109,112,111,
+    100,1,83,0,41,2,122,52,82,101,116,117,114,110,32,70,
+    97,108,115,101,32,97,115,32,98,117,105,108,116,45,105,110,
+    32,109,111,100,117,108,101,115,32,97,114,101,32,110,101,118,
+    101,114,32,112,97,99,107,97,103,101,115,46,70,114,10,0,
+    0,0,41,2,114,143,0,0,0,114,72,0,0,0,114,10,
+    0,0,0,114,10,0,0,0,114,11,0,0,0,114,106,0,
+    0,0,241,2,0,0,115,2,0,0,0,0,4,122,26,66,
+    117,105,108,116,105,110,73,109,112,111,114,116,101,114,46,105,
+    115,95,112,97,99,107,97,103,101,41,2,78,78,41,1,78,
+    41,17,114,1,0,0,0,114,0,0,0,0,114,2,0,0,
+    0,114,3,0,0,0,218,12,115,116,97,116,105,99,109,101,
+    116,104,111,100,114,87,0,0,0,218,11,99,108,97,115,115,
+    109,101,116,104,111,100,114,146,0,0,0,114,147,0,0,0,
+    114,135,0,0,0,114,136,0,0,0,114,75,0,0,0,114,
+    148,0,0,0,114,149,0,0,0,114,106,0,0,0,114,85,
+    0,0,0,114,138,0,0,0,114,10,0,0,0,114,10,0,
+    0,0,114,10,0,0,0,114,11,0,0,0,114,142,0,0,
+    0,177,2,0,0,115,30,0,0,0,8,7,4,2,12,9,
+    2,1,12,8,2,1,12,11,12,8,12,5,2,1,14,5,
+    2,1,14,5,2,1,14,5,114,142,0,0,0,99,0,0,
+    0,0,0,0,0,0,0,0,0,0,4,0,0,0,64,0,
+    0,0,115,140,0,0,0,101,0,90,1,100,0,90,2,100,
+    1,90,3,101,4,100,2,100,3,132,0,131,1,90,5,101,
+    6,100,21,100,5,100,6,132,1,131,1,90,7,101,6,100,
+    22,100,7,100,8,132,1,131,1,90,8,101,6,100,9,100,
+    10,132,0,131,1,90,9,101,4,100,11,100,12,132,0,131,
+    1,90,10,101,6,100,13,100,14,132,0,131,1,90,11,101,
+    6,101,12,100,15,100,16,132,0,131,1,131,1,90,13,101,
+    6,101,12,100,17,100,18,132,0,131,1,131,1,90,14,101,
+    6,101,12,100,19,100,20,132,0,131,1,131,1,90,15,100,
+    4,83,0,41,23,218,14,70,114,111,122,101,110,73,109,112,
+    111,114,116,101,114,122,142,77,101,116,97,32,112,97,116,104,
+    32,105,109,112,111,114,116,32,102,111,114,32,102,114,111,122,
+    101,110,32,109,111,100,117,108,101,115,46,10,10,32,32,32,
+    32,65,108,108,32,109,101,116,104,111,100,115,32,97,114,101,
+    32,101,105,116,104,101,114,32,99,108,97,115,115,32,111,114,
+    32,115,116,97,116,105,99,32,109,101,116,104,111,100,115,32,
+    116,111,32,97,118,111,105,100,32,116,104,101,32,110,101,101,
+    100,32,116,111,10,32,32,32,32,105,110,115,116,97,110,116,
+    105,97,116,101,32,116,104,101,32,99,108,97,115,115,46,10,
+    10,32,32,32,32,99,1,0,0,0,0,0,0,0,1,0,
+    0,0,2,0,0,0,67,0,0,0,115,12,0,0,0,100,
+    1,106,0,124,0,106,1,131,1,83,0,41,2,122,115,82,
+    101,116,117,114,110,32,114,101,112,114,32,102,111,114,32,116,
+    104,101,32,109,111,100,117,108,101,46,10,10,32,32,32,32,
+    32,32,32,32,84,104,101,32,109,101,116,104,111,100,32,105,
+    115,32,100,101,112,114,101,99,97,116,101,100,46,32,32,84,
+    104,101,32,105,109,112,111,114,116,32,109,97,99,104,105,110,
+    101,114,121,32,100,111,101,115,32,116,104,101,32,106,111,98,
+    32,105,116,115,101,108,102,46,10,10,32,32,32,32,32,32,
+    32,32,122,22,60,109,111,100,117,108,101,32,123,33,114,125,
+    32,40,102,114,111,122,101,110,41,62,41,2,114,38,0,0,
+    0,114,1,0,0,0,41,1,218,1,109,114,10,0,0,0,
+    114,10,0,0,0,114,11,0,0,0,114,87,0,0,0,3,
+    3,0,0,115,2,0,0,0,0,7,122,26,70,114,111,122,
+    101,110,73,109,112,111,114,116,101,114,46,109,111,100,117,108,
+    101,95,114,101,112,114,78,99,4,0,0,0,0,0,0,0,
+    4,0,0,0,5,0,0,0,67,0,0,0,115,32,0,0,
+    0,116,0,106,1,124,1,131,1,114,24,116,2,124,1,124,
+    0,100,1,100,2,141,3,83,0,100,0,83,0,100,0,83,
+    0,41,3,78,90,6,102,114,111,122,101,110,41,1,114,104,
+    0,0,0,41,3,114,49,0,0,0,114,76,0,0,0,114,
+    79,0,0,0,41,4,114,143,0,0,0,114,72,0,0,0,
+    114,144,0,0,0,114,145,0,0,0,114,10,0,0,0,114,
+    10,0,0,0,114,11,0,0,0,114,146,0,0,0,12,3,
+    0,0,115,6,0,0,0,0,2,10,1,14,2,122,24,70,
+    114,111,122,101,110,73,109,112,111,114,116,101,114,46,102,105,
+    110,100,95,115,112,101,99,99,3,0,0,0,0,0,0,0,
+    3,0,0,0,2,0,0,0,67,0,0,0,115,18,0,0,
+    0,116,0,106,1,124,1,131,1,114,14,124,0,83,0,100,
+    1,83,0,41,2,122,93,70,105,110,100,32,97,32,102,114,
+    111,122,101,110,32,109,111,100,117,108,101,46,10,10,32,32,
+    32,32,32,32,32,32,84,104,105,115,32,109,101,116,104,111,
+    100,32,105,115,32,100,101,112,114,101,99,97,116,101,100,46,
+    32,32,85,115,101,32,102,105,110,100,95,115,112,101,99,40,
+    41,32,105,110,115,116,101,97,100,46,10,10,32,32,32,32,
+    32,32,32,32,78,41,2,114,49,0,0,0,114,76,0,0,
+    0,41,3,114,143,0,0,0,114,72,0,0,0,114,144,0,
+    0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,
+    0,114,147,0,0,0,19,3,0,0,115,2,0,0,0,0,
+    7,122,26,70,114,111,122,101,110,73,109,112,111,114,116,101,
+    114,46,102,105,110,100,95,109,111,100,117,108,101,99,2,0,
+    0,0,0,0,0,0,2,0,0,0,1,0,0,0,67,0,
+    0,0,115,4,0,0,0,100,1,83,0,41,2,122,42,85,
+    115,101,32,100,101,102,97,117,108,116,32,115,101,109,97,110,
+    116,105,99,115,32,102,111,114,32,109,111,100,117,108,101,32,
+    99,114,101,97,116,105,111,110,46,78,114,10,0,0,0,41,
+    2,114,143,0,0,0,114,83,0,0,0,114,10,0,0,0,
+    114,10,0,0,0,114,11,0,0,0,114,135,0,0,0,28,
+    3,0,0,115,0,0,0,0,122,28,70,114,111,122,101,110,
+    73,109,112,111,114,116,101,114,46,99,114,101,97,116,101,95,
+    109,111,100,117,108,101,99,1,0,0,0,0,0,0,0,3,
+    0,0,0,4,0,0,0,67,0,0,0,115,64,0,0,0,
+    124,0,106,0,106,1,125,1,116,2,106,3,124,1,131,1,
+    115,36,116,4,100,1,106,5,124,1,131,1,124,1,100,2,
+    141,2,130,1,116,6,116,2,106,7,124,1,131,2,125,2,
+    116,8,124,2,124,0,106,9,131,2,1,0,100,0,83,0,
+    41,3,78,122,27,123,33,114,125,32,105,115,32,110,111,116,
+    32,97,32,102,114,111,122,101,110,32,109,111,100,117,108,101,
+    41,1,114,15,0,0,0,41,10,114,90,0,0,0,114,15,
+    0,0,0,114,49,0,0,0,114,76,0,0,0,114,71,0,
+    0,0,114,38,0,0,0,114,59,0,0,0,218,17,103,101,
+    116,95,102,114,111,122,101,110,95,111,98,106,101,99,116,218,
+    4,101,120,101,99,114,7,0,0,0,41,3,114,84,0,0,
+    0,114,15,0,0,0,218,4,99,111,100,101,114,10,0,0,
+    0,114,10,0,0,0,114,11,0,0,0,114,136,0,0,0,
+    32,3,0,0,115,12,0,0,0,0,2,8,1,10,1,10,
+    1,8,1,12,1,122,26,70,114,111,122,101,110,73,109,112,
+    111,114,116,101,114,46,101,120,101,99,95,109,111,100,117,108,
+    101,99,2,0,0,0,0,0,0,0,2,0,0,0,3,0,
+    0,0,67,0,0,0,115,10,0,0,0,116,0,124,0,124,
+    1,131,2,83,0,41,1,122,95,76,111,97,100,32,97,32,
+    102,114,111,122,101,110,32,109,111,100,117,108,101,46,10,10,
+    32,32,32,32,32,32,32,32,84,104,105,115,32,109,101,116,
+    104,111,100,32,105,115,32,100,101,112,114,101,99,97,116,101,
+    100,46,32,32,85,115,101,32,101,120,101,99,95,109,111,100,
+    117,108,101,40,41,32,105,110,115,116,101,97,100,46,10,10,
+    32,32,32,32,32,32,32,32,41,1,114,85,0,0,0,41,
+    2,114,143,0,0,0,114,72,0,0,0,114,10,0,0,0,
+    114,10,0,0,0,114,11,0,0,0,114,138,0,0,0,41,
+    3,0,0,115,2,0,0,0,0,7,122,26,70,114,111,122,
+    101,110,73,109,112,111,114,116,101,114,46,108,111,97,100,95,
+    109,111,100,117,108,101,99,2,0,0,0,0,0,0,0,2,
+    0,0,0,2,0,0,0,67,0,0,0,115,10,0,0,0,
+    116,0,106,1,124,1,131,1,83,0,41,1,122,45,82,101,
+    116,117,114,110,32,116,104,101,32,99,111,100,101,32,111,98,
+    106,101,99,116,32,102,111,114,32,116,104,101,32,102,114,111,
+    122,101,110,32,109,111,100,117,108,101,46,41,2,114,49,0,
+    0,0,114,154,0,0,0,41,2,114,143,0,0,0,114,72,
+    0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,
+    0,0,114,148,0,0,0,50,3,0,0,115,2,0,0,0,
+    0,4,122,23,70,114,111,122,101,110,73,109,112,111,114,116,
+    101,114,46,103,101,116,95,99,111,100,101,99,2,0,0,0,
+    0,0,0,0,2,0,0,0,1,0,0,0,67,0,0,0,
+    115,4,0,0,0,100,1,83,0,41,2,122,54,82,101,116,
+    117,114,110,32,78,111,110,101,32,97,115,32,102,114,111,122,
+    101,110,32,109,111,100,117,108,101,115,32,100,111,32,110,111,
+    116,32,104,97,118,101,32,115,111,117,114,99,101,32,99,111,
+    100,101,46,78,114,10,0,0,0,41,2,114,143,0,0,0,
+    114,72,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
+    11,0,0,0,114,149,0,0,0,56,3,0,0,115,2,0,
+    0,0,0,4,122,25,70,114,111,122,101,110,73,109,112,111,
+    114,116,101,114,46,103,101,116,95,115,111,117,114,99,101,99,
+    2,0,0,0,0,0,0,0,2,0,0,0,2,0,0,0,
+    67,0,0,0,115,10,0,0,0,116,0,106,1,124,1,131,
+    1,83,0,41,1,122,46,82,101,116,117,114,110,32,84,114,
+    117,101,32,105,102,32,116,104,101,32,102,114,111,122,101,110,
+    32,109,111,100,117,108,101,32,105,115,32,97,32,112,97,99,
+    107,97,103,101,46,41,2,114,49,0,0,0,90,17,105,115,
+    95,102,114,111,122,101,110,95,112,97,99,107,97,103,101,41,
+    2,114,143,0,0,0,114,72,0,0,0,114,10,0,0,0,
+    114,10,0,0,0,114,11,0,0,0,114,106,0,0,0,62,
+    3,0,0,115,2,0,0,0,0,4,122,25,70,114,111,122,
+    101,110,73,109,112,111,114,116,101,114,46,105,115,95,112,97,
+    99,107,97,103,101,41,2,78,78,41,1,78,41,16,114,1,
+    0,0,0,114,0,0,0,0,114,2,0,0,0,114,3,0,
+    0,0,114,150,0,0,0,114,87,0,0,0,114,151,0,0,
+    0,114,146,0,0,0,114,147,0,0,0,114,135,0,0,0,
+    114,136,0,0,0,114,138,0,0,0,114,78,0,0,0,114,
+    148,0,0,0,114,149,0,0,0,114,106,0,0,0,114,10,
+    0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,
+    0,0,114,152,0,0,0,250,2,0,0,115,30,0,0,0,
+    8,7,4,2,12,9,2,1,12,6,2,1,12,8,12,4,
+    12,9,12,9,2,1,14,5,2,1,14,5,2,1,114,152,
+    0,0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,
+    2,0,0,0,64,0,0,0,115,32,0,0,0,101,0,90,
+    1,100,0,90,2,100,1,90,3,100,2,100,3,132,0,90,
+    4,100,4,100,5,132,0,90,5,100,6,83,0,41,7,218,
+    18,95,73,109,112,111,114,116,76,111,99,107,67,111,110,116,
+    101,120,116,122,36,67,111,110,116,101,120,116,32,109,97,110,
+    97,103,101,114,32,102,111,114,32,116,104,101,32,105,109,112,
+    111,114,116,32,108,111,99,107,46,99,1,0,0,0,0,0,
+    0,0,1,0,0,0,1,0,0,0,67,0,0,0,115,12,
+    0,0,0,116,0,106,1,131,0,1,0,100,1,83,0,41,
+    2,122,24,65,99,113,117,105,114,101,32,116,104,101,32,105,
+    109,112,111,114,116,32,108,111,99,107,46,78,41,2,114,49,
+    0,0,0,114,50,0,0,0,41,1,114,26,0,0,0,114,
+    10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,46,
+    0,0,0,75,3,0,0,115,2,0,0,0,0,2,122,28,
+    95,73,109,112,111,114,116,76,111,99,107,67,111,110,116,101,
+    120,116,46,95,95,101,110,116,101,114,95,95,99,4,0,0,
+    0,0,0,0,0,4,0,0,0,1,0,0,0,67,0,0,
+    0,115,12,0,0,0,116,0,106,1,131,0,1,0,100,1,
+    83,0,41,2,122,60,82,101,108,101,97,115,101,32,116,104,
+    101,32,105,109,112,111,114,116,32,108,111,99,107,32,114,101,
+    103,97,114,100,108,101,115,115,32,111,102,32,97,110,121,32,
+    114,97,105,115,101,100,32,101,120,99,101,112,116,105,111,110,
+    115,46,78,41,2,114,49,0,0,0,114,52,0,0,0,41,
+    4,114,26,0,0,0,90,8,101,120,99,95,116,121,112,101,
+    90,9,101,120,99,95,118,97,108,117,101,90,13,101,120,99,
+    95,116,114,97,99,101,98,97,99,107,114,10,0,0,0,114,
+    10,0,0,0,114,11,0,0,0,114,48,0,0,0,79,3,
+    0,0,115,2,0,0,0,0,2,122,27,95,73,109,112,111,
     114,116,76,111,99,107,67,111,110,116,101,120,116,46,95,95,
-    101,110,116,101,114,95,95,99,4,0,0,0,0,0,0,0,
-    4,0,0,0,1,0,0,0,67,0,0,0,115,12,0,0,
-    0,116,0,106,1,131,0,1,0,100,1,83,0,41,2,122,
-    60,82,101,108,101,97,115,101,32,116,104,101,32,105,109,112,
-    111,114,116,32,108,111,99,107,32,114,101,103,97,114,100,108,
-    101,115,115,32,111,102,32,97,110,121,32,114,97,105,115,101,
-    100,32,101,120,99,101,112,116,105,111,110,115,46,78,41,2,
-    114,52,0,0,0,114,56,0,0,0,41,4,114,26,0,0,
-    0,90,8,101,120,99,95,116,121,112,101,90,9,101,120,99,
-    95,118,97,108,117,101,90,13,101,120,99,95,116,114,97,99,
-    101,98,97,99,107,114,10,0,0,0,114,10,0,0,0,114,
-    11,0,0,0,114,48,0,0,0,69,3,0,0,115,2,0,
-    0,0,0,2,122,27,95,73,109,112,111,114,116,76,111,99,
-    107,67,111,110,116,101,120,116,46,95,95,101,120,105,116,95,
-    95,78,41,6,114,1,0,0,0,114,0,0,0,0,114,2,
-    0,0,0,114,3,0,0,0,114,46,0,0,0,114,48,0,
-    0,0,114,10,0,0,0,114,10,0,0,0,114,10,0,0,
-    0,114,11,0,0,0,114,157,0,0,0,61,3,0,0,115,
-    6,0,0,0,8,2,4,2,8,4,114,157,0,0,0,99,
-    3,0,0,0,0,0,0,0,5,0,0,0,4,0,0,0,
-    67,0,0,0,115,64,0,0,0,124,1,106,0,100,1,124,
-    2,100,2,24,0,131,2,125,3,116,1,124,3,131,1,124,
-    2,107,0,114,36,116,2,100,3,131,1,130,1,124,3,100,
-    4,25,0,125,4,124,0,114,60,100,5,106,3,124,4,124,
-    0,131,2,83,0,124,4,83,0,41,6,122,50,82,101,115,
-    111,108,118,101,32,97,32,114,101,108,97,116,105,118,101,32,
-    109,111,100,117,108,101,32,110,97,109,101,32,116,111,32,97,
-    110,32,97,98,115,111,108,117,116,101,32,111,110,101,46,114,
-    118,0,0,0,114,33,0,0,0,122,50,97,116,116,101,109,
+    101,120,105,116,95,95,78,41,6,114,1,0,0,0,114,0,
+    0,0,0,114,2,0,0,0,114,3,0,0,0,114,46,0,
+    0,0,114,48,0,0,0,114,10,0,0,0,114,10,0,0,
+    0,114,10,0,0,0,114,11,0,0,0,114,157,0,0,0,
+    71,3,0,0,115,6,0,0,0,8,2,4,2,8,4,114,
+    157,0,0,0,99,3,0,0,0,0,0,0,0,5,0,0,
+    0,4,0,0,0,67,0,0,0,115,64,0,0,0,124,1,
+    106,0,100,1,124,2,100,2,24,0,131,2,125,3,116,1,
+    124,3,131,1,124,2,107,0,114,36,116,2,100,3,131,1,
+    130,1,124,3,100,4,25,0,125,4,124,0,114,60,100,5,
+    106,3,124,4,124,0,131,2,83,0,124,4,83,0,41,6,
+    122,50,82,101,115,111,108,118,101,32,97,32,114,101,108,97,
+    116,105,118,101,32,109,111,100,117,108,101,32,110,97,109,101,
+    32,116,111,32,97,110,32,97,98,115,111,108,117,116,101,32,
+    111,110,101,46,114,118,0,0,0,114,33,0,0,0,122,50,
+    97,116,116,101,109,112,116,101,100,32,114,101,108,97,116,105,
+    118,101,32,105,109,112,111,114,116,32,98,101,121,111,110,100,
+    32,116,111,112,45,108,101,118,101,108,32,112,97,99,107,97,
+    103,101,114,19,0,0,0,122,5,123,125,46,123,125,41,4,
+    218,6,114,115,112,108,105,116,218,3,108,101,110,218,10,86,
+    97,108,117,101,69,114,114,111,114,114,38,0,0,0,41,5,
+    114,15,0,0,0,218,7,112,97,99,107,97,103,101,218,5,
+    108,101,118,101,108,90,4,98,105,116,115,90,4,98,97,115,
+    101,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
+    218,13,95,114,101,115,111,108,118,101,95,110,97,109,101,84,
+    3,0,0,115,10,0,0,0,0,2,16,1,12,1,8,1,
+    8,1,114,163,0,0,0,99,3,0,0,0,0,0,0,0,
+    4,0,0,0,3,0,0,0,67,0,0,0,115,34,0,0,
+    0,124,0,106,0,124,1,124,2,131,2,125,3,124,3,100,
+    0,107,8,114,24,100,0,83,0,116,1,124,1,124,3,131,
+    2,83,0,41,1,78,41,2,114,147,0,0,0,114,79,0,
+    0,0,41,4,218,6,102,105,110,100,101,114,114,15,0,0,
+    0,114,144,0,0,0,114,94,0,0,0,114,10,0,0,0,
+    114,10,0,0,0,114,11,0,0,0,218,17,95,102,105,110,
+    100,95,115,112,101,99,95,108,101,103,97,99,121,93,3,0,
+    0,115,8,0,0,0,0,3,12,1,8,1,4,1,114,165,
+    0,0,0,99,3,0,0,0,0,0,0,0,10,0,0,0,
+    27,0,0,0,67,0,0,0,115,242,0,0,0,116,0,106,
+    1,125,3,124,3,100,1,107,8,114,22,116,2,100,2,131,
+    1,130,1,124,3,115,38,116,3,106,4,100,3,116,5,131,
+    2,1,0,124,0,116,0,106,6,107,6,125,4,120,188,124,
+    3,68,0,93,176,125,5,116,7,131,0,143,72,1,0,121,
+    10,124,5,106,8,125,6,87,0,110,42,4,0,116,9,107,
+    10,114,118,1,0,1,0,1,0,116,10,124,5,124,0,124,
+    1,131,3,125,7,124,7,100,1,107,8,114,114,119,54,89,
+    0,110,14,88,0,124,6,124,0,124,1,124,2,131,3,125,
+    7,87,0,100,1,81,0,82,0,88,0,124,7,100,1,107,
+    9,114,54,124,4,12,0,114,226,124,0,116,0,106,6,107,
+    6,114,226,116,0,106,6,124,0,25,0,125,8,121,10,124,
+    8,106,11,125,9,87,0,110,20,4,0,116,9,107,10,114,
+    206,1,0,1,0,1,0,124,7,83,0,88,0,124,9,100,
+    1,107,8,114,220,124,7,83,0,124,9,83,0,113,54,124,
+    7,83,0,113,54,87,0,100,1,83,0,100,1,83,0,41,
+    4,122,21,70,105,110,100,32,97,32,109,111,100,117,108,101,
+    39,115,32,115,112,101,99,46,78,122,53,115,121,115,46,109,
+    101,116,97,95,112,97,116,104,32,105,115,32,78,111,110,101,
+    44,32,80,121,116,104,111,110,32,105,115,32,108,105,107,101,
+    108,121,32,115,104,117,116,116,105,110,103,32,100,111,119,110,
+    122,22,115,121,115,46,109,101,116,97,95,112,97,116,104,32,
+    105,115,32,101,109,112,116,121,41,12,114,14,0,0,0,218,
+    9,109,101,116,97,95,112,97,116,104,114,71,0,0,0,218,
+    9,95,119,97,114,110,105,110,103,115,218,4,119,97,114,110,
+    218,13,73,109,112,111,114,116,87,97,114,110,105,110,103,114,
+    80,0,0,0,114,157,0,0,0,114,146,0,0,0,114,91,
+    0,0,0,114,165,0,0,0,114,90,0,0,0,41,10,114,
+    15,0,0,0,114,144,0,0,0,114,145,0,0,0,114,166,
+    0,0,0,90,9,105,115,95,114,101,108,111,97,100,114,164,
+    0,0,0,114,146,0,0,0,114,83,0,0,0,114,84,0,
+    0,0,114,90,0,0,0,114,10,0,0,0,114,10,0,0,
+    0,114,11,0,0,0,218,10,95,102,105,110,100,95,115,112,
+    101,99,102,3,0,0,115,54,0,0,0,0,2,6,1,8,
+    2,8,3,4,1,12,5,10,1,10,1,8,1,2,1,10,
+    1,14,1,12,1,8,1,8,2,22,1,8,2,16,1,10,
+    1,2,1,10,1,14,4,6,2,8,1,4,2,6,2,8,
+    2,114,170,0,0,0,99,3,0,0,0,0,0,0,0,3,
+    0,0,0,4,0,0,0,67,0,0,0,115,110,0,0,0,
+    116,0,124,0,116,1,131,2,115,28,116,2,100,1,106,3,
+    116,4,124,0,131,1,131,1,131,1,130,1,124,2,100,2,
+    107,0,114,44,116,5,100,3,131,1,130,1,124,2,100,2,
+    107,4,114,84,116,0,124,1,116,1,131,2,115,72,116,2,
+    100,4,131,1,130,1,110,12,124,1,115,84,116,6,100,5,
+    131,1,130,1,124,0,12,0,114,106,124,2,100,2,107,2,
+    114,106,116,5,100,6,131,1,130,1,100,7,83,0,41,8,
+    122,28,86,101,114,105,102,121,32,97,114,103,117,109,101,110,
+    116,115,32,97,114,101,32,34,115,97,110,101,34,46,122,31,
+    109,111,100,117,108,101,32,110,97,109,101,32,109,117,115,116,
+    32,98,101,32,115,116,114,44,32,110,111,116,32,123,125,114,
+    19,0,0,0,122,18,108,101,118,101,108,32,109,117,115,116,
+    32,98,101,32,62,61,32,48,122,31,95,95,112,97,99,107,
+    97,103,101,95,95,32,110,111,116,32,115,101,116,32,116,111,
+    32,97,32,115,116,114,105,110,103,122,54,97,116,116,101,109,
     112,116,101,100,32,114,101,108,97,116,105,118,101,32,105,109,
-    112,111,114,116,32,98,101,121,111,110,100,32,116,111,112,45,
-    108,101,118,101,108,32,112,97,99,107,97,103,101,114,19,0,
-    0,0,122,5,123,125,46,123,125,41,4,218,6,114,115,112,
-    108,105,116,218,3,108,101,110,218,10,86,97,108,117,101,69,
-    114,114,111,114,114,38,0,0,0,41,5,114,15,0,0,0,
-    218,7,112,97,99,107,97,103,101,218,5,108,101,118,101,108,
-    90,4,98,105,116,115,90,4,98,97,115,101,114,10,0,0,
-    0,114,10,0,0,0,114,11,0,0,0,218,13,95,114,101,
-    115,111,108,118,101,95,110,97,109,101,74,3,0,0,115,10,
-    0,0,0,0,2,16,1,12,1,8,1,8,1,114,163,0,
-    0,0,99,3,0,0,0,0,0,0,0,4,0,0,0,3,
-    0,0,0,67,0,0,0,115,34,0,0,0,124,0,106,0,
-    124,1,124,2,131,2,125,3,124,3,100,0,107,8,114,24,
-    100,0,83,0,116,1,124,1,124,3,131,2,83,0,41,1,
-    78,41,2,114,147,0,0,0,114,79,0,0,0,41,4,218,
-    6,102,105,110,100,101,114,114,15,0,0,0,114,144,0,0,
-    0,114,94,0,0,0,114,10,0,0,0,114,10,0,0,0,
-    114,11,0,0,0,218,17,95,102,105,110,100,95,115,112,101,
-    99,95,108,101,103,97,99,121,83,3,0,0,115,8,0,0,
-    0,0,3,12,1,8,1,4,1,114,165,0,0,0,99,3,
-    0,0,0,0,0,0,0,10,0,0,0,27,0,0,0,67,
-    0,0,0,115,242,0,0,0,116,0,106,1,125,3,124,3,
-    100,1,107,8,114,22,116,2,100,2,131,1,130,1,124,3,
-    115,38,116,3,106,4,100,3,116,5,131,2,1,0,124,0,
-    116,0,106,6,107,6,125,4,120,188,124,3,68,0,93,176,
-    125,5,116,7,131,0,143,72,1,0,121,10,124,5,106,8,
-    125,6,87,0,110,42,4,0,116,9,107,10,114,118,1,0,
-    1,0,1,0,116,10,124,5,124,0,124,1,131,3,125,7,
-    124,7,100,1,107,8,114,114,119,54,89,0,110,14,88,0,
-    124,6,124,0,124,1,124,2,131,3,125,7,87,0,100,1,
-    81,0,82,0,88,0,124,7,100,1,107,9,114,54,124,4,
-    12,0,114,226,124,0,116,0,106,6,107,6,114,226,116,0,
-    106,6,124,0,25,0,125,8,121,10,124,8,106,11,125,9,
-    87,0,110,20,4,0,116,9,107,10,114,206,1,0,1,0,
-    1,0,124,7,83,0,88,0,124,9,100,1,107,8,114,220,
-    124,7,83,0,124,9,83,0,113,54,124,7,83,0,113,54,
-    87,0,100,1,83,0,100,1,83,0,41,4,122,21,70,105,
-    110,100,32,97,32,109,111,100,117,108,101,39,115,32,115,112,
-    101,99,46,78,122,53,115,121,115,46,109,101,116,97,95,112,
-    97,116,104,32,105,115,32,78,111,110,101,44,32,80,121,116,
-    104,111,110,32,105,115,32,108,105,107,101,108,121,32,115,104,
-    117,116,116,105,110,103,32,100,111,119,110,122,22,115,121,115,
-    46,109,101,116,97,95,112,97,116,104,32,105,115,32,101,109,
-    112,116,121,41,12,114,14,0,0,0,218,9,109,101,116,97,
-    95,112,97,116,104,114,71,0,0,0,218,9,95,119,97,114,
-    110,105,110,103,115,218,4,119,97,114,110,218,13,73,109,112,
-    111,114,116,87,97,114,110,105,110,103,114,80,0,0,0,114,
-    157,0,0,0,114,146,0,0,0,114,91,0,0,0,114,165,
-    0,0,0,114,90,0,0,0,41,10,114,15,0,0,0,114,
-    144,0,0,0,114,145,0,0,0,114,166,0,0,0,90,9,
-    105,115,95,114,101,108,111,97,100,114,164,0,0,0,114,146,
-    0,0,0,114,83,0,0,0,114,84,0,0,0,114,90,0,
-    0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,
-    0,218,10,95,102,105,110,100,95,115,112,101,99,92,3,0,
-    0,115,54,0,0,0,0,2,6,1,8,2,8,3,4,1,
-    12,5,10,1,10,1,8,1,2,1,10,1,14,1,12,1,
-    8,1,8,2,22,1,8,2,16,1,10,1,2,1,10,1,
-    14,4,6,2,8,1,4,2,6,2,8,2,114,170,0,0,
-    0,99,3,0,0,0,0,0,0,0,3,0,0,0,4,0,
-    0,0,67,0,0,0,115,110,0,0,0,116,0,124,0,116,
-    1,131,2,115,28,116,2,100,1,106,3,116,4,124,0,131,
-    1,131,1,131,1,130,1,124,2,100,2,107,0,114,44,116,
-    5,100,3,131,1,130,1,124,2,100,2,107,4,114,84,116,
-    0,124,1,116,1,131,2,115,72,116,2,100,4,131,1,130,
-    1,110,12,124,1,115,84,116,6,100,5,131,1,130,1,124,
-    0,12,0,114,106,124,2,100,2,107,2,114,106,116,5,100,
-    6,131,1,130,1,100,7,83,0,41,8,122,28,86,101,114,
-    105,102,121,32,97,114,103,117,109,101,110,116,115,32,97,114,
-    101,32,34,115,97,110,101,34,46,122,31,109,111,100,117,108,
-    101,32,110,97,109,101,32,109,117,115,116,32,98,101,32,115,
-    116,114,44,32,110,111,116,32,123,125,114,19,0,0,0,122,
-    18,108,101,118,101,108,32,109,117,115,116,32,98,101,32,62,
-    61,32,48,122,31,95,95,112,97,99,107,97,103,101,95,95,
-    32,110,111,116,32,115,101,116,32,116,111,32,97,32,115,116,
-    114,105,110,103,122,54,97,116,116,101,109,112,116,101,100,32,
-    114,101,108,97,116,105,118,101,32,105,109,112,111,114,116,32,
-    119,105,116,104,32,110,111,32,107,110,111,119,110,32,112,97,
-    114,101,110,116,32,112,97,99,107,97,103,101,122,17,69,109,
-    112,116,121,32,109,111,100,117,108,101,32,110,97,109,101,78,
-    41,7,218,10,105,115,105,110,115,116,97,110,99,101,218,3,
-    115,116,114,218,9,84,121,112,101,69,114,114,111,114,114,38,
-    0,0,0,114,13,0,0,0,114,160,0,0,0,114,71,0,
-    0,0,41,3,114,15,0,0,0,114,161,0,0,0,114,162,
+    112,111,114,116,32,119,105,116,104,32,110,111,32,107,110,111,
+    119,110,32,112,97,114,101,110,116,32,112,97,99,107,97,103,
+    101,122,17,69,109,112,116,121,32,109,111,100,117,108,101,32,
+    110,97,109,101,78,41,7,218,10,105,115,105,110,115,116,97,
+    110,99,101,218,3,115,116,114,218,9,84,121,112,101,69,114,
+    114,111,114,114,38,0,0,0,114,13,0,0,0,114,160,0,
+    0,0,114,71,0,0,0,41,3,114,15,0,0,0,114,161,
+    0,0,0,114,162,0,0,0,114,10,0,0,0,114,10,0,
+    0,0,114,11,0,0,0,218,13,95,115,97,110,105,116,121,
+    95,99,104,101,99,107,149,3,0,0,115,22,0,0,0,0,
+    2,10,1,18,1,8,1,8,1,8,1,10,1,10,1,4,
+    1,8,2,14,1,114,174,0,0,0,122,16,78,111,32,109,
+    111,100,117,108,101,32,110,97,109,101,100,32,122,4,123,33,
+    114,125,99,2,0,0,0,0,0,0,0,8,0,0,0,12,
+    0,0,0,67,0,0,0,115,220,0,0,0,100,0,125,2,
+    124,0,106,0,100,1,131,1,100,2,25,0,125,3,124,3,
+    114,134,124,3,116,1,106,2,107,7,114,42,116,3,124,1,
+    124,3,131,2,1,0,124,0,116,1,106,2,107,6,114,62,
+    116,1,106,2,124,0,25,0,83,0,116,1,106,2,124,3,
+    25,0,125,4,121,10,124,4,106,4,125,2,87,0,110,50,
+    4,0,116,5,107,10,114,132,1,0,1,0,1,0,116,6,
+    100,3,23,0,106,7,124,0,124,3,131,2,125,5,116,8,
+    124,5,124,0,100,4,141,2,100,0,130,2,89,0,110,2,
+    88,0,116,9,124,0,124,2,131,2,125,6,124,6,100,0,
+    107,8,114,172,116,8,116,6,106,7,124,0,131,1,124,0,
+    100,4,141,2,130,1,110,8,116,10,124,6,131,1,125,7,
+    124,3,114,216,116,1,106,2,124,3,25,0,125,4,116,11,
+    124,4,124,0,106,0,100,1,131,1,100,5,25,0,124,7,
+    131,3,1,0,124,7,83,0,41,6,78,114,118,0,0,0,
+    114,19,0,0,0,122,23,59,32,123,33,114,125,32,105,115,
+    32,110,111,116,32,97,32,112,97,99,107,97,103,101,41,1,
+    114,15,0,0,0,233,2,0,0,0,41,12,114,119,0,0,
+    0,114,14,0,0,0,114,80,0,0,0,114,59,0,0,0,
+    114,128,0,0,0,114,91,0,0,0,218,8,95,69,82,82,
+    95,77,83,71,114,38,0,0,0,218,19,77,111,100,117,108,
+    101,78,111,116,70,111,117,110,100,69,114,114,111,114,114,170,
+    0,0,0,114,141,0,0,0,114,5,0,0,0,41,8,114,
+    15,0,0,0,218,7,105,109,112,111,114,116,95,114,144,0,
+    0,0,114,120,0,0,0,90,13,112,97,114,101,110,116,95,
+    109,111,100,117,108,101,114,139,0,0,0,114,83,0,0,0,
+    114,84,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
+    11,0,0,0,218,23,95,102,105,110,100,95,97,110,100,95,
+    108,111,97,100,95,117,110,108,111,99,107,101,100,168,3,0,
+    0,115,42,0,0,0,0,1,4,1,14,1,4,1,10,1,
+    10,2,10,1,10,1,10,1,2,1,10,1,14,1,16,1,
+    20,1,10,1,8,1,20,2,8,1,4,2,10,1,22,1,
+    114,179,0,0,0,99,2,0,0,0,0,0,0,0,4,0,
+    0,0,11,0,0,0,67,0,0,0,115,94,0,0,0,116,
+    0,124,0,131,1,143,38,1,0,116,1,106,2,106,3,124,
+    0,116,4,131,2,125,2,124,2,116,4,107,8,114,42,116,
+    5,124,0,124,1,131,2,83,0,87,0,100,1,81,0,82,
+    0,88,0,124,2,100,1,107,8,114,82,100,2,106,6,124,
+    0,131,1,125,3,116,7,124,3,124,0,100,3,141,2,130,
+    1,116,8,124,0,131,1,1,0,124,2,83,0,41,4,122,
+    25,70,105,110,100,32,97,110,100,32,108,111,97,100,32,116,
+    104,101,32,109,111,100,117,108,101,46,78,122,40,105,109,112,
+    111,114,116,32,111,102,32,123,125,32,104,97,108,116,101,100,
+    59,32,78,111,110,101,32,105,110,32,115,121,115,46,109,111,
+    100,117,108,101,115,41,1,114,15,0,0,0,41,9,114,42,
+    0,0,0,114,14,0,0,0,114,80,0,0,0,114,30,0,
+    0,0,218,14,95,78,69,69,68,83,95,76,79,65,68,73,
+    78,71,114,179,0,0,0,114,38,0,0,0,114,177,0,0,
+    0,114,57,0,0,0,41,4,114,15,0,0,0,114,178,0,
+    0,0,114,84,0,0,0,114,68,0,0,0,114,10,0,0,
+    0,114,10,0,0,0,114,11,0,0,0,218,14,95,102,105,
+    110,100,95,97,110,100,95,108,111,97,100,198,3,0,0,115,
+    20,0,0,0,0,2,10,1,14,1,8,1,20,2,8,1,
+    4,1,6,1,12,2,8,1,114,181,0,0,0,114,19,0,
+    0,0,99,3,0,0,0,0,0,0,0,3,0,0,0,4,
+    0,0,0,67,0,0,0,115,42,0,0,0,116,0,124,0,
+    124,1,124,2,131,3,1,0,124,2,100,1,107,4,114,32,
+    116,1,124,0,124,1,124,2,131,3,125,0,116,2,124,0,
+    116,3,131,2,83,0,41,2,97,50,1,0,0,73,109,112,
+    111,114,116,32,97,110,100,32,114,101,116,117,114,110,32,116,
+    104,101,32,109,111,100,117,108,101,32,98,97,115,101,100,32,
+    111,110,32,105,116,115,32,110,97,109,101,44,32,116,104,101,
+    32,112,97,99,107,97,103,101,32,116,104,101,32,99,97,108,
+    108,32,105,115,10,32,32,32,32,98,101,105,110,103,32,109,
+    97,100,101,32,102,114,111,109,44,32,97,110,100,32,116,104,
+    101,32,108,101,118,101,108,32,97,100,106,117,115,116,109,101,
+    110,116,46,10,10,32,32,32,32,84,104,105,115,32,102,117,
+    110,99,116,105,111,110,32,114,101,112,114,101,115,101,110,116,
+    115,32,116,104,101,32,103,114,101,97,116,101,115,116,32,99,
+    111,109,109,111,110,32,100,101,110,111,109,105,110,97,116,111,
+    114,32,111,102,32,102,117,110,99,116,105,111,110,97,108,105,
+    116,121,10,32,32,32,32,98,101,116,119,101,101,110,32,105,
+    109,112,111,114,116,95,109,111,100,117,108,101,32,97,110,100,
+    32,95,95,105,109,112,111,114,116,95,95,46,32,84,104,105,
+    115,32,105,110,99,108,117,100,101,115,32,115,101,116,116,105,
+    110,103,32,95,95,112,97,99,107,97,103,101,95,95,32,105,
+    102,10,32,32,32,32,116,104,101,32,108,111,97,100,101,114,
+    32,100,105,100,32,110,111,116,46,10,10,32,32,32,32,114,
+    19,0,0,0,41,4,114,174,0,0,0,114,163,0,0,0,
+    114,181,0,0,0,218,11,95,103,99,100,95,105,109,112,111,
+    114,116,41,3,114,15,0,0,0,114,161,0,0,0,114,162,
     0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,
-    0,0,218,13,95,115,97,110,105,116,121,95,99,104,101,99,
-    107,139,3,0,0,115,22,0,0,0,0,2,10,1,18,1,
-    8,1,8,1,8,1,10,1,10,1,4,1,8,2,14,1,
-    114,174,0,0,0,122,16,78,111,32,109,111,100,117,108,101,
-    32,110,97,109,101,100,32,122,4,123,33,114,125,99,2,0,
-    0,0,0,0,0,0,8,0,0,0,12,0,0,0,67,0,
-    0,0,115,220,0,0,0,100,0,125,2,124,0,106,0,100,
-    1,131,1,100,2,25,0,125,3,124,3,114,134,124,3,116,
-    1,106,2,107,7,114,42,116,3,124,1,124,3,131,2,1,
-    0,124,0,116,1,106,2,107,6,114,62,116,1,106,2,124,
-    0,25,0,83,0,116,1,106,2,124,3,25,0,125,4,121,
-    10,124,4,106,4,125,2,87,0,110,50,4,0,116,5,107,
-    10,114,132,1,0,1,0,1,0,116,6,100,3,23,0,106,
-    7,124,0,124,3,131,2,125,5,116,8,124,5,124,0,100,
-    4,141,2,100,0,130,2,89,0,110,2,88,0,116,9,124,
-    0,124,2,131,2,125,6,124,6,100,0,107,8,114,172,116,
-    8,116,6,106,7,124,0,131,1,124,0,100,4,141,2,130,
-    1,110,8,116,10,124,6,131,1,125,7,124,3,114,216,116,
-    1,106,2,124,3,25,0,125,4,116,11,124,4,124,0,106,
-    0,100,1,131,1,100,5,25,0,124,7,131,3,1,0,124,
-    7,83,0,41,6,78,114,118,0,0,0,114,19,0,0,0,
-    122,23,59,32,123,33,114,125,32,105,115,32,110,111,116,32,
-    97,32,112,97,99,107,97,103,101,41,1,114,15,0,0,0,
-    233,2,0,0,0,41,12,114,119,0,0,0,114,14,0,0,
-    0,114,80,0,0,0,114,59,0,0,0,114,128,0,0,0,
-    114,91,0,0,0,218,8,95,69,82,82,95,77,83,71,114,
-    38,0,0,0,218,19,77,111,100,117,108,101,78,111,116,70,
-    111,117,110,100,69,114,114,111,114,114,170,0,0,0,114,141,
-    0,0,0,114,5,0,0,0,41,8,114,15,0,0,0,218,
-    7,105,109,112,111,114,116,95,114,144,0,0,0,114,120,0,
-    0,0,90,13,112,97,114,101,110,116,95,109,111,100,117,108,
-    101,114,139,0,0,0,114,83,0,0,0,114,84,0,0,0,
-    114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,
-    23,95,102,105,110,100,95,97,110,100,95,108,111,97,100,95,
-    117,110,108,111,99,107,101,100,158,3,0,0,115,42,0,0,
-    0,0,1,4,1,14,1,4,1,10,1,10,2,10,1,10,
-    1,10,1,2,1,10,1,14,1,16,1,20,1,10,1,8,
-    1,20,2,8,1,4,2,10,1,22,1,114,179,0,0,0,
-    99,2,0,0,0,0,0,0,0,4,0,0,0,11,0,0,
-    0,67,0,0,0,115,94,0,0,0,116,0,124,0,131,1,
-    143,38,1,0,116,1,106,2,106,3,124,0,116,4,131,2,
-    125,2,124,2,116,4,107,8,114,42,116,5,124,0,124,1,
-    131,2,83,0,87,0,100,1,81,0,82,0,88,0,124,2,
-    100,1,107,8,114,82,100,2,106,6,124,0,131,1,125,3,
-    116,7,124,3,124,0,100,3,141,2,130,1,116,8,124,0,
-    131,1,1,0,124,2,83,0,41,4,122,25,70,105,110,100,
-    32,97,110,100,32,108,111,97,100,32,116,104,101,32,109,111,
-    100,117,108,101,46,78,122,40,105,109,112,111,114,116,32,111,
-    102,32,123,125,32,104,97,108,116,101,100,59,32,78,111,110,
-    101,32,105,110,32,115,121,115,46,109,111,100,117,108,101,115,
-    41,1,114,15,0,0,0,41,9,114,42,0,0,0,114,14,
-    0,0,0,114,80,0,0,0,114,30,0,0,0,218,14,95,
-    78,69,69,68,83,95,76,79,65,68,73,78,71,114,179,0,
-    0,0,114,38,0,0,0,114,177,0,0,0,114,57,0,0,
-    0,41,4,114,15,0,0,0,114,178,0,0,0,114,84,0,
-    0,0,114,68,0,0,0,114,10,0,0,0,114,10,0,0,
-    0,114,11,0,0,0,218,14,95,102,105,110,100,95,97,110,
-    100,95,108,111,97,100,188,3,0,0,115,20,0,0,0,0,
-    2,10,1,14,1,8,1,20,2,8,1,4,1,6,1,12,
-    2,8,1,114,181,0,0,0,114,19,0,0,0,99,3,0,
-    0,0,0,0,0,0,3,0,0,0,4,0,0,0,67,0,
-    0,0,115,42,0,0,0,116,0,124,0,124,1,124,2,131,
-    3,1,0,124,2,100,1,107,4,114,32,116,1,124,0,124,
-    1,124,2,131,3,125,0,116,2,124,0,116,3,131,2,83,
-    0,41,2,97,50,1,0,0,73,109,112,111,114,116,32,97,
-    110,100,32,114,101,116,117,114,110,32,116,104,101,32,109,111,
-    100,117,108,101,32,98,97,115,101,100,32,111,110,32,105,116,
-    115,32,110,97,109,101,44,32,116,104,101,32,112,97,99,107,
-    97,103,101,32,116,104,101,32,99,97,108,108,32,105,115,10,
-    32,32,32,32,98,101,105,110,103,32,109,97,100,101,32,102,
-    114,111,109,44,32,97,110,100,32,116,104,101,32,108,101,118,
-    101,108,32,97,100,106,117,115,116,109,101,110,116,46,10,10,
-    32,32,32,32,84,104,105,115,32,102,117,110,99,116,105,111,
-    110,32,114,101,112,114,101,115,101,110,116,115,32,116,104,101,
-    32,103,114,101,97,116,101,115,116,32,99,111,109,109,111,110,
-    32,100,101,110,111,109,105,110,97,116,111,114,32,111,102,32,
-    102,117,110,99,116,105,111,110,97,108,105,116,121,10,32,32,
-    32,32,98,101,116,119,101,101,110,32,105,109,112,111,114,116,
-    95,109,111,100,117,108,101,32,97,110,100,32,95,95,105,109,
-    112,111,114,116,95,95,46,32,84,104,105,115,32,105,110,99,
-    108,117,100,101,115,32,115,101,116,116,105,110,103,32,95,95,
-    112,97,99,107,97,103,101,95,95,32,105,102,10,32,32,32,
-    32,116,104,101,32,108,111,97,100,101,114,32,100,105,100,32,
-    110,111,116,46,10,10,32,32,32,32,114,19,0,0,0,41,
-    4,114,174,0,0,0,114,163,0,0,0,114,181,0,0,0,
-    218,11,95,103,99,100,95,105,109,112,111,114,116,41,3,114,
-    15,0,0,0,114,161,0,0,0,114,162,0,0,0,114,10,
-    0,0,0,114,10,0,0,0,114,11,0,0,0,114,182,0,
-    0,0,204,3,0,0,115,8,0,0,0,0,9,12,1,8,
-    1,12,1,114,182,0,0,0,99,3,0,0,0,0,0,0,
-    0,6,0,0,0,17,0,0,0,67,0,0,0,115,164,0,
-    0,0,116,0,124,0,100,1,131,2,114,160,100,2,124,1,
-    107,6,114,58,116,1,124,1,131,1,125,1,124,1,106,2,
-    100,2,131,1,1,0,116,0,124,0,100,3,131,2,114,58,
-    124,1,106,3,124,0,106,4,131,1,1,0,120,100,124,1,
-    68,0,93,92,125,3,116,0,124,0,124,3,131,2,115,64,
-    100,4,106,5,124,0,106,6,124,3,131,2,125,4,121,14,
-    116,7,124,2,124,4,131,2,1,0,87,0,113,64,4,0,
-    116,8,107,10,114,154,1,0,125,5,1,0,122,20,124,5,
-    106,9,124,4,107,2,114,136,119,64,130,0,87,0,89,0,
-    100,5,100,5,125,5,126,5,88,0,113,64,88,0,113,64,
-    87,0,124,0,83,0,41,6,122,238,70,105,103,117,114,101,
-    32,111,117,116,32,119,104,97,116,32,95,95,105,109,112,111,
-    114,116,95,95,32,115,104,111,117,108,100,32,114,101,116,117,
-    114,110,46,10,10,32,32,32,32,84,104,101,32,105,109,112,
-    111,114,116,95,32,112,97,114,97,109,101,116,101,114,32,105,
-    115,32,97,32,99,97,108,108,97,98,108,101,32,119,104,105,
-    99,104,32,116,97,107,101,115,32,116,104,101,32,110,97,109,
-    101,32,111,102,32,109,111,100,117,108,101,32,116,111,10,32,
-    32,32,32,105,109,112,111,114,116,46,32,73,116,32,105,115,
-    32,114,101,113,117,105,114,101,100,32,116,111,32,100,101,99,
-    111,117,112,108,101,32,116,104,101,32,102,117,110,99,116,105,
-    111,110,32,102,114,111,109,32,97,115,115,117,109,105,110,103,
-    32,105,109,112,111,114,116,108,105,98,39,115,10,32,32,32,
-    32,105,109,112,111,114,116,32,105,109,112,108,101,109,101,110,
-    116,97,116,105,111,110,32,105,115,32,100,101,115,105,114,101,
-    100,46,10,10,32,32,32,32,114,128,0,0,0,250,1,42,
-    218,7,95,95,97,108,108,95,95,122,5,123,125,46,123,125,
-    78,41,10,114,4,0,0,0,114,127,0,0,0,218,6,114,
-    101,109,111,118,101,218,6,101,120,116,101,110,100,114,184,0,
-    0,0,114,38,0,0,0,114,1,0,0,0,114,59,0,0,
-    0,114,177,0,0,0,114,15,0,0,0,41,6,114,84,0,
-    0,0,218,8,102,114,111,109,108,105,115,116,114,178,0,0,
-    0,218,1,120,90,9,102,114,111,109,95,110,97,109,101,90,
-    3,101,120,99,114,10,0,0,0,114,10,0,0,0,114,11,
-    0,0,0,218,16,95,104,97,110,100,108,101,95,102,114,111,
-    109,108,105,115,116,219,3,0,0,115,32,0,0,0,0,10,
-    10,1,8,1,8,1,10,1,10,1,12,1,10,1,10,1,
-    14,1,2,1,14,1,16,4,10,1,2,1,24,1,114,189,
-    0,0,0,99,1,0,0,0,0,0,0,0,3,0,0,0,
-    6,0,0,0,67,0,0,0,115,146,0,0,0,124,0,106,
-    0,100,1,131,1,125,1,124,0,106,0,100,2,131,1,125,
-    2,124,1,100,3,107,9,114,82,124,2,100,3,107,9,114,
-    78,124,1,124,2,106,1,107,3,114,78,116,2,106,3,100,
-    4,124,1,155,2,100,5,124,2,106,1,155,2,100,6,157,
-    5,116,4,100,7,100,8,141,3,1,0,124,1,83,0,124,
-    2,100,3,107,9,114,96,124,2,106,1,83,0,116,2,106,
-    3,100,9,116,4,100,7,100,8,141,3,1,0,124,0,100,
-    10,25,0,125,1,100,11,124,0,107,7,114,142,124,1,106,
-    5,100,12,131,1,100,13,25,0,125,1,124,1,83,0,41,
-    14,122,167,67,97,108,99,117,108,97,116,101,32,119,104,97,
-    116,32,95,95,112,97,99,107,97,103,101,95,95,32,115,104,
-    111,117,108,100,32,98,101,46,10,10,32,32,32,32,95,95,
-    112,97,99,107,97,103,101,95,95,32,105,115,32,110,111,116,
-    32,103,117,97,114,97,110,116,101,101,100,32,116,111,32,98,
-    101,32,100,101,102,105,110,101,100,32,111,114,32,99,111,117,
-    108,100,32,98,101,32,115,101,116,32,116,111,32,78,111,110,
-    101,10,32,32,32,32,116,111,32,114,101,112,114,101,115,101,
-    110,116,32,116,104,97,116,32,105,116,115,32,112,114,111,112,
-    101,114,32,118,97,108,117,101,32,105,115,32,117,110,107,110,
-    111,119,110,46,10,10,32,32,32,32,114,131,0,0,0,114,
-    90,0,0,0,78,122,32,95,95,112,97,99,107,97,103,101,
-    95,95,32,33,61,32,95,95,115,112,101,99,95,95,46,112,
-    97,114,101,110,116,32,40,122,4,32,33,61,32,250,1,41,
-    233,3,0,0,0,41,1,90,10,115,116,97,99,107,108,101,
-    118,101,108,122,89,99,97,110,39,116,32,114,101,115,111,108,
-    118,101,32,112,97,99,107,97,103,101,32,102,114,111,109,32,
-    95,95,115,112,101,99,95,95,32,111,114,32,95,95,112,97,
-    99,107,97,103,101,95,95,44,32,102,97,108,108,105,110,103,
-    32,98,97,99,107,32,111,110,32,95,95,110,97,109,101,95,
-    95,32,97,110,100,32,95,95,112,97,116,104,95,95,114,1,
-    0,0,0,114,128,0,0,0,114,118,0,0,0,114,19,0,
-    0,0,41,6,114,30,0,0,0,114,120,0,0,0,114,167,
-    0,0,0,114,168,0,0,0,114,169,0,0,0,114,119,0,
-    0,0,41,3,218,7,103,108,111,98,97,108,115,114,161,0,
-    0,0,114,83,0,0,0,114,10,0,0,0,114,10,0,0,
-    0,114,11,0,0,0,218,17,95,99,97,108,99,95,95,95,
-    112,97,99,107,97,103,101,95,95,250,3,0,0,115,30,0,
-    0,0,0,7,10,1,10,1,8,1,18,1,22,2,10,1,
-    4,1,8,1,6,2,6,2,10,1,8,1,8,1,14,1,
-    114,193,0,0,0,99,5,0,0,0,0,0,0,0,9,0,
-    0,0,5,0,0,0,67,0,0,0,115,166,0,0,0,124,
-    4,100,1,107,2,114,18,116,0,124,0,131,1,125,5,110,
-    36,124,1,100,2,107,9,114,30,124,1,110,2,105,0,125,
-    6,116,1,124,6,131,1,125,7,116,0,124,0,124,7,124,
-    4,131,3,125,5,124,3,115,150,124,4,100,1,107,2,114,
-    84,116,0,124,0,106,2,100,3,131,1,100,1,25,0,131,
-    1,83,0,124,0,115,92,124,5,83,0,116,3,124,0,131,
-    1,116,3,124,0,106,2,100,3,131,1,100,1,25,0,131,
-    1,24,0,125,8,116,4,106,5,124,5,106,6,100,2,116,
-    3,124,5,106,6,131,1,124,8,24,0,133,2,25,0,25,
-    0,83,0,110,12,116,7,124,5,124,3,116,0,131,3,83,
-    0,100,2,83,0,41,4,97,215,1,0,0,73,109,112,111,
-    114,116,32,97,32,109,111,100,117,108,101,46,10,10,32,32,
-    32,32,84,104,101,32,39,103,108,111,98,97,108,115,39,32,
-    97,114,103,117,109,101,110,116,32,105,115,32,117,115,101,100,
-    32,116,111,32,105,110,102,101,114,32,119,104,101,114,101,32,
-    116,104,101,32,105,109,112,111,114,116,32,105,115,32,111,99,
-    99,117,114,114,105,110,103,32,102,114,111,109,10,32,32,32,
-    32,116,111,32,104,97,110,100,108,101,32,114,101,108,97,116,
-    105,118,101,32,105,109,112,111,114,116,115,46,32,84,104,101,
-    32,39,108,111,99,97,108,115,39,32,97,114,103,117,109,101,
-    110,116,32,105,115,32,105,103,110,111,114,101,100,46,32,84,
-    104,101,10,32,32,32,32,39,102,114,111,109,108,105,115,116,
-    39,32,97,114,103,117,109,101,110,116,32,115,112,101,99,105,
-    102,105,101,115,32,119,104,97,116,32,115,104,111,117,108,100,
-    32,101,120,105,115,116,32,97,115,32,97,116,116,114,105,98,
-    117,116,101,115,32,111,110,32,116,104,101,32,109,111,100,117,
-    108,101,10,32,32,32,32,98,101,105,110,103,32,105,109,112,
-    111,114,116,101,100,32,40,101,46,103,46,32,96,96,102,114,
-    111,109,32,109,111,100,117,108,101,32,105,109,112,111,114,116,
-    32,60,102,114,111,109,108,105,115,116,62,96,96,41,46,32,
-    32,84,104,101,32,39,108,101,118,101,108,39,10,32,32,32,
-    32,97,114,103,117,109,101,110,116,32,114,101,112,114,101,115,
-    101,110,116,115,32,116,104,101,32,112,97,99,107,97,103,101,
-    32,108,111,99,97,116,105,111,110,32,116,111,32,105,109,112,
-    111,114,116,32,102,114,111,109,32,105,110,32,97,32,114,101,
-    108,97,116,105,118,101,10,32,32,32,32,105,109,112,111,114,
-    116,32,40,101,46,103,46,32,96,96,102,114,111,109,32,46,
-    46,112,107,103,32,105,109,112,111,114,116,32,109,111,100,96,
-    96,32,119,111,117,108,100,32,104,97,118,101,32,97,32,39,
-    108,101,118,101,108,39,32,111,102,32,50,41,46,10,10,32,
-    32,32,32,114,19,0,0,0,78,114,118,0,0,0,41,8,
-    114,182,0,0,0,114,193,0,0,0,218,9,112,97,114,116,
-    105,116,105,111,110,114,159,0,0,0,114,14,0,0,0,114,
-    80,0,0,0,114,1,0,0,0,114,189,0,0,0,41,9,
-    114,15,0,0,0,114,192,0,0,0,218,6,108,111,99,97,
-    108,115,114,187,0,0,0,114,162,0,0,0,114,84,0,0,
-    0,90,8,103,108,111,98,97,108,115,95,114,161,0,0,0,
-    90,7,99,117,116,95,111,102,102,114,10,0,0,0,114,10,
-    0,0,0,114,11,0,0,0,218,10,95,95,105,109,112,111,
-    114,116,95,95,21,4,0,0,115,26,0,0,0,0,11,8,
-    1,10,2,16,1,8,1,12,1,4,3,8,1,18,1,4,
-    1,4,4,26,3,32,2,114,196,0,0,0,99,1,0,0,
-    0,0,0,0,0,2,0,0,0,3,0,0,0,67,0,0,
-    0,115,38,0,0,0,116,0,106,1,124,0,131,1,125,1,
-    124,1,100,0,107,8,114,30,116,2,100,1,124,0,23,0,
-    131,1,130,1,116,3,124,1,131,1,83,0,41,2,78,122,
-    25,110,111,32,98,117,105,108,116,45,105,110,32,109,111,100,
-    117,108,101,32,110,97,109,101,100,32,41,4,114,142,0,0,
-    0,114,146,0,0,0,114,71,0,0,0,114,141,0,0,0,
-    41,2,114,15,0,0,0,114,83,0,0,0,114,10,0,0,
-    0,114,10,0,0,0,114,11,0,0,0,218,18,95,98,117,
-    105,108,116,105,110,95,102,114,111,109,95,110,97,109,101,56,
-    4,0,0,115,8,0,0,0,0,1,10,1,8,1,12,1,
-    114,197,0,0,0,99,2,0,0,0,0,0,0,0,12,0,
-    0,0,12,0,0,0,67,0,0,0,115,244,0,0,0,124,
-    1,97,0,124,0,97,1,116,2,116,1,131,1,125,2,120,
-    86,116,1,106,3,106,4,131,0,68,0,93,72,92,2,125,
-    3,125,4,116,5,124,4,124,2,131,2,114,28,124,3,116,
-    1,106,6,107,6,114,62,116,7,125,5,110,18,116,0,106,
-    8,124,3,131,1,114,28,116,9,125,5,110,2,113,28,116,
-    10,124,4,124,5,131,2,125,6,116,11,124,6,124,4,131,
-    2,1,0,113,28,87,0,116,1,106,3,116,12,25,0,125,
-    7,120,54,100,5,68,0,93,46,125,8,124,8,116,1,106,
-    3,107,7,114,144,116,13,124,8,131,1,125,9,110,10,116,
-    1,106,3,124,8,25,0,125,9,116,14,124,7,124,8,124,
-    9,131,3,1,0,113,120,87,0,121,12,116,13,100,2,131,
-    1,125,10,87,0,110,24,4,0,116,15,107,10,114,206,1,
-    0,1,0,1,0,100,3,125,10,89,0,110,2,88,0,116,
-    14,124,7,100,2,124,10,131,3,1,0,116,13,100,4,131,
-    1,125,11,116,14,124,7,100,4,124,11,131,3,1,0,100,
-    3,83,0,41,6,122,250,83,101,116,117,112,32,105,109,112,
-    111,114,116,108,105,98,32,98,121,32,105,109,112,111,114,116,
-    105,110,103,32,110,101,101,100,101,100,32,98,117,105,108,116,
-    45,105,110,32,109,111,100,117,108,101,115,32,97,110,100,32,
-    105,110,106,101,99,116,105,110,103,32,116,104,101,109,10,32,
-    32,32,32,105,110,116,111,32,116,104,101,32,103,108,111,98,
-    97,108,32,110,97,109,101,115,112,97,99,101,46,10,10,32,
-    32,32,32,65,115,32,115,121,115,32,105,115,32,110,101,101,
-    100,101,100,32,102,111,114,32,115,121,115,46,109,111,100,117,
-    108,101,115,32,97,99,99,101,115,115,32,97,110,100,32,95,
-    105,109,112,32,105,115,32,110,101,101,100,101,100,32,116,111,
-    32,108,111,97,100,32,98,117,105,108,116,45,105,110,10,32,
-    32,32,32,109,111,100,117,108,101,115,44,32,116,104,111,115,
-    101,32,116,119,111,32,109,111,100,117,108,101,115,32,109,117,
-    115,116,32,98,101,32,101,120,112,108,105,99,105,116,108,121,
-    32,112,97,115,115,101,100,32,105,110,46,10,10,32,32,32,
-    32,114,167,0,0,0,114,20,0,0,0,78,114,55,0,0,
-    0,41,1,114,167,0,0,0,41,16,114,52,0,0,0,114,
-    14,0,0,0,114,13,0,0,0,114,80,0,0,0,218,5,
-    105,116,101,109,115,114,171,0,0,0,114,70,0,0,0,114,
-    142,0,0,0,114,76,0,0,0,114,152,0,0,0,114,129,
-    0,0,0,114,134,0,0,0,114,1,0,0,0,114,197,0,
-    0,0,114,5,0,0,0,114,71,0,0,0,41,12,218,10,
-    115,121,115,95,109,111,100,117,108,101,218,11,95,105,109,112,
-    95,109,111,100,117,108,101,90,11,109,111,100,117,108,101,95,
-    116,121,112,101,114,15,0,0,0,114,84,0,0,0,114,94,
-    0,0,0,114,83,0,0,0,90,11,115,101,108,102,95,109,
-    111,100,117,108,101,90,12,98,117,105,108,116,105,110,95,110,
-    97,109,101,90,14,98,117,105,108,116,105,110,95,109,111,100,
-    117,108,101,90,13,116,104,114,101,97,100,95,109,111,100,117,
-    108,101,90,14,119,101,97,107,114,101,102,95,109,111,100,117,
-    108,101,114,10,0,0,0,114,10,0,0,0,114,11,0,0,
-    0,218,6,95,115,101,116,117,112,63,4,0,0,115,50,0,
-    0,0,0,9,4,1,4,3,8,1,20,1,10,1,10,1,
-    6,1,10,1,6,2,2,1,10,1,14,3,10,1,10,1,
-    10,1,10,2,10,1,16,3,2,1,12,1,14,2,10,1,
-    12,3,8,1,114,201,0,0,0,99,2,0,0,0,0,0,
-    0,0,3,0,0,0,3,0,0,0,67,0,0,0,115,66,
-    0,0,0,116,0,124,0,124,1,131,2,1,0,116,1,106,
-    2,106,3,116,4,131,1,1,0,116,1,106,2,106,3,116,
-    5,131,1,1,0,100,1,100,2,108,6,125,2,124,2,97,
-    7,124,2,106,8,116,1,106,9,116,10,25,0,131,1,1,
-    0,100,2,83,0,41,3,122,50,73,110,115,116,97,108,108,
-    32,105,109,112,111,114,116,108,105,98,32,97,115,32,116,104,
-    101,32,105,109,112,108,101,109,101,110,116,97,116,105,111,110,
-    32,111,102,32,105,109,112,111,114,116,46,114,19,0,0,0,
-    78,41,11,114,201,0,0,0,114,14,0,0,0,114,166,0,
-    0,0,114,110,0,0,0,114,142,0,0,0,114,152,0,0,
-    0,218,26,95,102,114,111,122,101,110,95,105,109,112,111,114,
-    116,108,105,98,95,101,120,116,101,114,110,97,108,114,116,0,
-    0,0,218,8,95,105,110,115,116,97,108,108,114,80,0,0,
-    0,114,1,0,0,0,41,3,114,199,0,0,0,114,200,0,
-    0,0,114,202,0,0,0,114,10,0,0,0,114,10,0,0,
-    0,114,11,0,0,0,114,203,0,0,0,110,4,0,0,115,
-    12,0,0,0,0,2,10,2,12,1,12,3,8,1,4,1,
-    114,203,0,0,0,41,2,78,78,41,1,78,41,2,78,114,
-    19,0,0,0,41,50,114,3,0,0,0,114,116,0,0,0,
-    114,12,0,0,0,114,16,0,0,0,114,49,0,0,0,114,
-    29,0,0,0,114,36,0,0,0,114,17,0,0,0,114,18,
-    0,0,0,114,41,0,0,0,114,42,0,0,0,114,45,0,
-    0,0,114,57,0,0,0,114,59,0,0,0,114,69,0,0,
-    0,114,75,0,0,0,114,78,0,0,0,114,85,0,0,0,
-    114,96,0,0,0,114,97,0,0,0,114,103,0,0,0,114,
-    79,0,0,0,114,129,0,0,0,114,134,0,0,0,114,137,
-    0,0,0,114,92,0,0,0,114,81,0,0,0,114,140,0,
-    0,0,114,141,0,0,0,114,82,0,0,0,114,142,0,0,
-    0,114,152,0,0,0,114,157,0,0,0,114,163,0,0,0,
-    114,165,0,0,0,114,170,0,0,0,114,174,0,0,0,90,
-    15,95,69,82,82,95,77,83,71,95,80,82,69,70,73,88,
-    114,176,0,0,0,114,179,0,0,0,218,6,111,98,106,101,
-    99,116,114,180,0,0,0,114,181,0,0,0,114,182,0,0,
-    0,114,189,0,0,0,114,193,0,0,0,114,196,0,0,0,
-    114,197,0,0,0,114,201,0,0,0,114,203,0,0,0,114,
-    10,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
-    0,0,0,218,8,60,109,111,100,117,108,101,62,8,0,0,
-    0,115,94,0,0,0,4,17,4,2,8,8,8,8,4,2,
-    4,3,16,4,14,68,14,21,14,16,8,27,8,17,8,11,
-    14,8,8,11,8,12,8,16,8,36,14,27,14,101,16,26,
-    10,45,14,60,8,17,8,17,8,24,8,29,8,23,8,15,
-    14,73,14,77,14,13,8,9,8,9,10,47,8,16,4,1,
-    8,2,8,27,6,3,8,16,10,15,8,31,8,27,18,35,
-    8,7,8,47,
+    0,0,114,182,0,0,0,214,3,0,0,115,8,0,0,0,
+    0,9,12,1,8,1,12,1,114,182,0,0,0,99,3,0,
+    0,0,0,0,0,0,6,0,0,0,17,0,0,0,67,0,
+    0,0,115,164,0,0,0,116,0,124,0,100,1,131,2,114,
+    160,100,2,124,1,107,6,114,58,116,1,124,1,131,1,125,
+    1,124,1,106,2,100,2,131,1,1,0,116,0,124,0,100,
+    3,131,2,114,58,124,1,106,3,124,0,106,4,131,1,1,
+    0,120,100,124,1,68,0,93,92,125,3,116,0,124,0,124,
+    3,131,2,115,64,100,4,106,5,124,0,106,6,124,3,131,
+    2,125,4,121,14,116,7,124,2,124,4,131,2,1,0,87,
+    0,113,64,4,0,116,8,107,10,114,154,1,0,125,5,1,
+    0,122,20,124,5,106,9,124,4,107,2,114,136,119,64,130,
+    0,87,0,89,0,100,5,100,5,125,5,126,5,88,0,113,
+    64,88,0,113,64,87,0,124,0,83,0,41,6,122,238,70,
+    105,103,117,114,101,32,111,117,116,32,119,104,97,116,32,95,
+    95,105,109,112,111,114,116,95,95,32,115,104,111,117,108,100,
+    32,114,101,116,117,114,110,46,10,10,32,32,32,32,84,104,
+    101,32,105,109,112,111,114,116,95,32,112,97,114,97,109,101,
+    116,101,114,32,105,115,32,97,32,99,97,108,108,97,98,108,
+    101,32,119,104,105,99,104,32,116,97,107,101,115,32,116,104,
+    101,32,110,97,109,101,32,111,102,32,109,111,100,117,108,101,
+    32,116,111,10,32,32,32,32,105,109,112,111,114,116,46,32,
+    73,116,32,105,115,32,114,101,113,117,105,114,101,100,32,116,
+    111,32,100,101,99,111,117,112,108,101,32,116,104,101,32,102,
+    117,110,99,116,105,111,110,32,102,114,111,109,32,97,115,115,
+    117,109,105,110,103,32,105,109,112,111,114,116,108,105,98,39,
+    115,10,32,32,32,32,105,109,112,111,114,116,32,105,109,112,
+    108,101,109,101,110,116,97,116,105,111,110,32,105,115,32,100,
+    101,115,105,114,101,100,46,10,10,32,32,32,32,114,128,0,
+    0,0,250,1,42,218,7,95,95,97,108,108,95,95,122,5,
+    123,125,46,123,125,78,41,10,114,4,0,0,0,114,127,0,
+    0,0,218,6,114,101,109,111,118,101,218,6,101,120,116,101,
+    110,100,114,184,0,0,0,114,38,0,0,0,114,1,0,0,
+    0,114,59,0,0,0,114,177,0,0,0,114,15,0,0,0,
+    41,6,114,84,0,0,0,218,8,102,114,111,109,108,105,115,
+    116,114,178,0,0,0,218,1,120,90,9,102,114,111,109,95,
+    110,97,109,101,90,3,101,120,99,114,10,0,0,0,114,10,
+    0,0,0,114,11,0,0,0,218,16,95,104,97,110,100,108,
+    101,95,102,114,111,109,108,105,115,116,229,3,0,0,115,32,
+    0,0,0,0,10,10,1,8,1,8,1,10,1,10,1,12,
+    1,10,1,10,1,14,1,2,1,14,1,16,4,10,1,2,
+    1,24,1,114,189,0,0,0,99,1,0,0,0,0,0,0,
+    0,3,0,0,0,6,0,0,0,67,0,0,0,115,146,0,
+    0,0,124,0,106,0,100,1,131,1,125,1,124,0,106,0,
+    100,2,131,1,125,2,124,1,100,3,107,9,114,82,124,2,
+    100,3,107,9,114,78,124,1,124,2,106,1,107,3,114,78,
+    116,2,106,3,100,4,124,1,155,2,100,5,124,2,106,1,
+    155,2,100,6,157,5,116,4,100,7,100,8,141,3,1,0,
+    124,1,83,0,124,2,100,3,107,9,114,96,124,2,106,1,
+    83,0,116,2,106,3,100,9,116,4,100,7,100,8,141,3,
+    1,0,124,0,100,10,25,0,125,1,100,11,124,0,107,7,
+    114,142,124,1,106,5,100,12,131,1,100,13,25,0,125,1,
+    124,1,83,0,41,14,122,167,67,97,108,99,117,108,97,116,
+    101,32,119,104,97,116,32,95,95,112,97,99,107,97,103,101,
+    95,95,32,115,104,111,117,108,100,32,98,101,46,10,10,32,
+    32,32,32,95,95,112,97,99,107,97,103,101,95,95,32,105,
+    115,32,110,111,116,32,103,117,97,114,97,110,116,101,101,100,
+    32,116,111,32,98,101,32,100,101,102,105,110,101,100,32,111,
+    114,32,99,111,117,108,100,32,98,101,32,115,101,116,32,116,
+    111,32,78,111,110,101,10,32,32,32,32,116,111,32,114,101,
+    112,114,101,115,101,110,116,32,116,104,97,116,32,105,116,115,
+    32,112,114,111,112,101,114,32,118,97,108,117,101,32,105,115,
+    32,117,110,107,110,111,119,110,46,10,10,32,32,32,32,114,
+    131,0,0,0,114,90,0,0,0,78,122,32,95,95,112,97,
+    99,107,97,103,101,95,95,32,33,61,32,95,95,115,112,101,
+    99,95,95,46,112,97,114,101,110,116,32,40,122,4,32,33,
+    61,32,250,1,41,233,3,0,0,0,41,1,90,10,115,116,
+    97,99,107,108,101,118,101,108,122,89,99,97,110,39,116,32,
+    114,101,115,111,108,118,101,32,112,97,99,107,97,103,101,32,
+    102,114,111,109,32,95,95,115,112,101,99,95,95,32,111,114,
+    32,95,95,112,97,99,107,97,103,101,95,95,44,32,102,97,
+    108,108,105,110,103,32,98,97,99,107,32,111,110,32,95,95,
+    110,97,109,101,95,95,32,97,110,100,32,95,95,112,97,116,
+    104,95,95,114,1,0,0,0,114,128,0,0,0,114,118,0,
+    0,0,114,19,0,0,0,41,6,114,30,0,0,0,114,120,
+    0,0,0,114,167,0,0,0,114,168,0,0,0,114,169,0,
+    0,0,114,119,0,0,0,41,3,218,7,103,108,111,98,97,
+    108,115,114,161,0,0,0,114,83,0,0,0,114,10,0,0,
+    0,114,10,0,0,0,114,11,0,0,0,218,17,95,99,97,
+    108,99,95,95,95,112,97,99,107,97,103,101,95,95,4,4,
+    0,0,115,30,0,0,0,0,7,10,1,10,1,8,1,18,
+    1,22,2,10,1,4,1,8,1,6,2,6,2,10,1,8,
+    1,8,1,14,1,114,193,0,0,0,99,5,0,0,0,0,
+    0,0,0,9,0,0,0,5,0,0,0,67,0,0,0,115,
+    166,0,0,0,124,4,100,1,107,2,114,18,116,0,124,0,
+    131,1,125,5,110,36,124,1,100,2,107,9,114,30,124,1,
+    110,2,105,0,125,6,116,1,124,6,131,1,125,7,116,0,
+    124,0,124,7,124,4,131,3,125,5,124,3,115,150,124,4,
+    100,1,107,2,114,84,116,0,124,0,106,2,100,3,131,1,
+    100,1,25,0,131,1,83,0,124,0,115,92,124,5,83,0,
+    116,3,124,0,131,1,116,3,124,0,106,2,100,3,131,1,
+    100,1,25,0,131,1,24,0,125,8,116,4,106,5,124,5,
+    106,6,100,2,116,3,124,5,106,6,131,1,124,8,24,0,
+    133,2,25,0,25,0,83,0,110,12,116,7,124,5,124,3,
+    116,0,131,3,83,0,100,2,83,0,41,4,97,215,1,0,
+    0,73,109,112,111,114,116,32,97,32,109,111,100,117,108,101,
+    46,10,10,32,32,32,32,84,104,101,32,39,103,108,111,98,
+    97,108,115,39,32,97,114,103,117,109,101,110,116,32,105,115,
+    32,117,115,101,100,32,116,111,32,105,110,102,101,114,32,119,
+    104,101,114,101,32,116,104,101,32,105,109,112,111,114,116,32,
+    105,115,32,111,99,99,117,114,114,105,110,103,32,102,114,111,
+    109,10,32,32,32,32,116,111,32,104,97,110,100,108,101,32,
+    114,101,108,97,116,105,118,101,32,105,109,112,111,114,116,115,
+    46,32,84,104,101,32,39,108,111,99,97,108,115,39,32,97,
+    114,103,117,109,101,110,116,32,105,115,32,105,103,110,111,114,
+    101,100,46,32,84,104,101,10,32,32,32,32,39,102,114,111,
+    109,108,105,115,116,39,32,97,114,103,117,109,101,110,116,32,
+    115,112,101,99,105,102,105,101,115,32,119,104,97,116,32,115,
+    104,111,117,108,100,32,101,120,105,115,116,32,97,115,32,97,
+    116,116,114,105,98,117,116,101,115,32,111,110,32,116,104,101,
+    32,109,111,100,117,108,101,10,32,32,32,32,98,101,105,110,
+    103,32,105,109,112,111,114,116,101,100,32,40,101,46,103,46,
+    32,96,96,102,114,111,109,32,109,111,100,117,108,101,32,105,
+    109,112,111,114,116,32,60,102,114,111,109,108,105,115,116,62,
+    96,96,41,46,32,32,84,104,101,32,39,108,101,118,101,108,
+    39,10,32,32,32,32,97,114,103,117,109,101,110,116,32,114,
+    101,112,114,101,115,101,110,116,115,32,116,104,101,32,112,97,
+    99,107,97,103,101,32,108,111,99,97,116,105,111,110,32,116,
+    111,32,105,109,112,111,114,116,32,102,114,111,109,32,105,110,
+    32,97,32,114,101,108,97,116,105,118,101,10,32,32,32,32,
+    105,109,112,111,114,116,32,40,101,46,103,46,32,96,96,102,
+    114,111,109,32,46,46,112,107,103,32,105,109,112,111,114,116,
+    32,109,111,100,96,96,32,119,111,117,108,100,32,104,97,118,
+    101,32,97,32,39,108,101,118,101,108,39,32,111,102,32,50,
+    41,46,10,10,32,32,32,32,114,19,0,0,0,78,114,118,
+    0,0,0,41,8,114,182,0,0,0,114,193,0,0,0,218,
+    9,112,97,114,116,105,116,105,111,110,114,159,0,0,0,114,
+    14,0,0,0,114,80,0,0,0,114,1,0,0,0,114,189,
+    0,0,0,41,9,114,15,0,0,0,114,192,0,0,0,218,
+    6,108,111,99,97,108,115,114,187,0,0,0,114,162,0,0,
+    0,114,84,0,0,0,90,8,103,108,111,98,97,108,115,95,
+    114,161,0,0,0,90,7,99,117,116,95,111,102,102,114,10,
+    0,0,0,114,10,0,0,0,114,11,0,0,0,218,10,95,
+    95,105,109,112,111,114,116,95,95,31,4,0,0,115,26,0,
+    0,0,0,11,8,1,10,2,16,1,8,1,12,1,4,3,
+    8,1,18,1,4,1,4,4,26,3,32,2,114,196,0,0,
+    0,99,1,0,0,0,0,0,0,0,2,0,0,0,3,0,
+    0,0,67,0,0,0,115,38,0,0,0,116,0,106,1,124,
+    0,131,1,125,1,124,1,100,0,107,8,114,30,116,2,100,
+    1,124,0,23,0,131,1,130,1,116,3,124,1,131,1,83,
+    0,41,2,78,122,25,110,111,32,98,117,105,108,116,45,105,
+    110,32,109,111,100,117,108,101,32,110,97,109,101,100,32,41,
+    4,114,142,0,0,0,114,146,0,0,0,114,71,0,0,0,
+    114,141,0,0,0,41,2,114,15,0,0,0,114,83,0,0,
+    0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
+    218,18,95,98,117,105,108,116,105,110,95,102,114,111,109,95,
+    110,97,109,101,66,4,0,0,115,8,0,0,0,0,1,10,
+    1,8,1,12,1,114,197,0,0,0,99,2,0,0,0,0,
+    0,0,0,12,0,0,0,12,0,0,0,67,0,0,0,115,
+    244,0,0,0,124,1,97,0,124,0,97,1,116,2,116,1,
+    131,1,125,2,120,86,116,1,106,3,106,4,131,0,68,0,
+    93,72,92,2,125,3,125,4,116,5,124,4,124,2,131,2,
+    114,28,124,3,116,1,106,6,107,6,114,62,116,7,125,5,
+    110,18,116,0,106,8,124,3,131,1,114,28,116,9,125,5,
+    110,2,113,28,116,10,124,4,124,5,131,2,125,6,116,11,
+    124,6,124,4,131,2,1,0,113,28,87,0,116,1,106,3,
+    116,12,25,0,125,7,120,54,100,5,68,0,93,46,125,8,
+    124,8,116,1,106,3,107,7,114,144,116,13,124,8,131,1,
+    125,9,110,10,116,1,106,3,124,8,25,0,125,9,116,14,
+    124,7,124,8,124,9,131,3,1,0,113,120,87,0,121,12,
+    116,13,100,2,131,1,125,10,87,0,110,24,4,0,116,15,
+    107,10,114,206,1,0,1,0,1,0,100,3,125,10,89,0,
+    110,2,88,0,116,14,124,7,100,2,124,10,131,3,1,0,
+    116,13,100,4,131,1,125,11,116,14,124,7,100,4,124,11,
+    131,3,1,0,100,3,83,0,41,6,122,250,83,101,116,117,
+    112,32,105,109,112,111,114,116,108,105,98,32,98,121,32,105,
+    109,112,111,114,116,105,110,103,32,110,101,101,100,101,100,32,
+    98,117,105,108,116,45,105,110,32,109,111,100,117,108,101,115,
+    32,97,110,100,32,105,110,106,101,99,116,105,110,103,32,116,
+    104,101,109,10,32,32,32,32,105,110,116,111,32,116,104,101,
+    32,103,108,111,98,97,108,32,110,97,109,101,115,112,97,99,
+    101,46,10,10,32,32,32,32,65,115,32,115,121,115,32,105,
+    115,32,110,101,101,100,101,100,32,102,111,114,32,115,121,115,
+    46,109,111,100,117,108,101,115,32,97,99,99,101,115,115,32,
+    97,110,100,32,95,105,109,112,32,105,115,32,110,101,101,100,
+    101,100,32,116,111,32,108,111,97,100,32,98,117,105,108,116,
+    45,105,110,10,32,32,32,32,109,111,100,117,108,101,115,44,
+    32,116,104,111,115,101,32,116,119,111,32,109,111,100,117,108,
+    101,115,32,109,117,115,116,32,98,101,32,101,120,112,108,105,
+    99,105,116,108,121,32,112,97,115,115,101,100,32,105,110,46,
+    10,10,32,32,32,32,114,167,0,0,0,114,20,0,0,0,
+    78,114,56,0,0,0,41,1,114,167,0,0,0,41,16,114,
+    49,0,0,0,114,14,0,0,0,114,13,0,0,0,114,80,
+    0,0,0,218,5,105,116,101,109,115,114,171,0,0,0,114,
+    70,0,0,0,114,142,0,0,0,114,76,0,0,0,114,152,
+    0,0,0,114,129,0,0,0,114,134,0,0,0,114,1,0,
+    0,0,114,197,0,0,0,114,5,0,0,0,114,71,0,0,
+    0,41,12,218,10,115,121,115,95,109,111,100,117,108,101,218,
+    11,95,105,109,112,95,109,111,100,117,108,101,90,11,109,111,
+    100,117,108,101,95,116,121,112,101,114,15,0,0,0,114,84,
+    0,0,0,114,94,0,0,0,114,83,0,0,0,90,11,115,
+    101,108,102,95,109,111,100,117,108,101,90,12,98,117,105,108,
+    116,105,110,95,110,97,109,101,90,14,98,117,105,108,116,105,
+    110,95,109,111,100,117,108,101,90,13,116,104,114,101,97,100,
+    95,109,111,100,117,108,101,90,14,119,101,97,107,114,101,102,
+    95,109,111,100,117,108,101,114,10,0,0,0,114,10,0,0,
+    0,114,11,0,0,0,218,6,95,115,101,116,117,112,73,4,
+    0,0,115,50,0,0,0,0,9,4,1,4,3,8,1,20,
+    1,10,1,10,1,6,1,10,1,6,2,2,1,10,1,14,
+    3,10,1,10,1,10,1,10,2,10,1,16,3,2,1,12,
+    1,14,2,10,1,12,3,8,1,114,201,0,0,0,99,2,
+    0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,67,
+    0,0,0,115,66,0,0,0,116,0,124,0,124,1,131,2,
+    1,0,116,1,106,2,106,3,116,4,131,1,1,0,116,1,
+    106,2,106,3,116,5,131,1,1,0,100,1,100,2,108,6,
+    125,2,124,2,97,7,124,2,106,8,116,1,106,9,116,10,
+    25,0,131,1,1,0,100,2,83,0,41,3,122,50,73,110,
+    115,116,97,108,108,32,105,109,112,111,114,116,108,105,98,32,
+    97,115,32,116,104,101,32,105,109,112,108,101,109,101,110,116,
+    97,116,105,111,110,32,111,102,32,105,109,112,111,114,116,46,
+    114,19,0,0,0,78,41,11,114,201,0,0,0,114,14,0,
+    0,0,114,166,0,0,0,114,110,0,0,0,114,142,0,0,
+    0,114,152,0,0,0,218,26,95,102,114,111,122,101,110,95,
+    105,109,112,111,114,116,108,105,98,95,101,120,116,101,114,110,
+    97,108,114,116,0,0,0,218,8,95,105,110,115,116,97,108,
+    108,114,80,0,0,0,114,1,0,0,0,41,3,114,199,0,
+    0,0,114,200,0,0,0,114,202,0,0,0,114,10,0,0,
+    0,114,10,0,0,0,114,11,0,0,0,114,203,0,0,0,
+    120,4,0,0,115,12,0,0,0,0,2,10,2,12,1,12,
+    3,8,1,4,1,114,203,0,0,0,41,2,78,78,41,1,
+    78,41,2,78,114,19,0,0,0,41,50,114,3,0,0,0,
+    114,116,0,0,0,114,12,0,0,0,114,16,0,0,0,114,
+    51,0,0,0,114,29,0,0,0,114,36,0,0,0,114,17,
+    0,0,0,114,18,0,0,0,114,41,0,0,0,114,42,0,
+    0,0,114,45,0,0,0,114,57,0,0,0,114,59,0,0,
+    0,114,69,0,0,0,114,75,0,0,0,114,78,0,0,0,
+    114,85,0,0,0,114,96,0,0,0,114,97,0,0,0,114,
+    103,0,0,0,114,79,0,0,0,114,129,0,0,0,114,134,
+    0,0,0,114,137,0,0,0,114,92,0,0,0,114,81,0,
+    0,0,114,140,0,0,0,114,141,0,0,0,114,82,0,0,
+    0,114,142,0,0,0,114,152,0,0,0,114,157,0,0,0,
+    114,163,0,0,0,114,165,0,0,0,114,170,0,0,0,114,
+    174,0,0,0,90,15,95,69,82,82,95,77,83,71,95,80,
+    82,69,70,73,88,114,176,0,0,0,114,179,0,0,0,218,
+    6,111,98,106,101,99,116,114,180,0,0,0,114,181,0,0,
+    0,114,182,0,0,0,114,189,0,0,0,114,193,0,0,0,
+    114,196,0,0,0,114,197,0,0,0,114,201,0,0,0,114,
+    203,0,0,0,114,10,0,0,0,114,10,0,0,0,114,10,
+    0,0,0,114,11,0,0,0,218,8,60,109,111,100,117,108,
+    101,62,8,0,0,0,115,94,0,0,0,4,17,4,2,8,
+    8,8,8,4,2,4,3,16,4,14,68,14,21,14,16,8,
+    37,8,17,8,11,14,8,8,11,8,12,8,16,8,36,14,
+    27,14,101,16,26,10,45,14,60,8,17,8,17,8,24,8,
+    29,8,23,8,15,14,73,14,77,14,13,8,9,8,9,10,
+    47,8,16,4,1,8,2,8,27,6,3,8,16,10,15,8,
+    31,8,27,18,35,8,7,8,47,
 };


From webhook-mailer at python.org  Wed Aug  9 09:37:23 2017
From: webhook-mailer at python.org (Paul Moore)
Date: Wed, 09 Aug 2017 13:37:23 -0000
Subject: [Python-checkins] bpo-31072: Add filter to zipapp (#3021)
Message-ID: <mailman.7.1502285845.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/b811d664defed085d16951088afb579fb649c58d
commit: b811d664defed085d16951088afb579fb649c58d
branch: master
author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
committer: Paul Moore <p.f.moore at gmail.com>
date: 2017-08-09T14:37:17+01:00
summary:

bpo-31072: Add filter to zipapp (#3021)

bpo-31072: Add a filter argument to zipapp.create_archive (GH-3021)

* Add an include_file argument to allow callers to decide which files to include
* Document the new argument

files:
A Misc/NEWS.d/next/Library/2017-08-09-13-45-23.bpo-31072.NLXDPV.rst
M Doc/library/zipapp.rst
M Lib/test/test_zipapp.py
M Lib/zipapp.py
M Misc/ACKS

diff --git a/Doc/library/zipapp.rst b/Doc/library/zipapp.rst
index 71753cb9a0d..993c2ccc398 100644
--- a/Doc/library/zipapp.rst
+++ b/Doc/library/zipapp.rst
@@ -98,7 +98,8 @@ Python API
 The module defines two convenience functions:
 
 
-.. function:: create_archive(source, target=None, interpreter=None, main=None)
+.. function:: create_archive(source, target=None, interpreter=None, main=None,
+                             include_file=None)
 
    Create an application archive from *source*.  The source can be any
    of the following:
@@ -143,6 +144,10 @@ The module defines two convenience functions:
    contain a ``__main__.py`` file, as otherwise the resulting archive
    would not be executable.
 
+   The *include_file* argument specifies a callback function that is passed the
+   relative path to the file in order to determine which files to store when
+   being called against a directory.
+
    If a file object is specified for *source* or *target*, it is the
    caller's responsibility to close it after calling create_archive.
 
diff --git a/Lib/test/test_zipapp.py b/Lib/test/test_zipapp.py
index d8d44375bdd..47eed5f4a6c 100644
--- a/Lib/test/test_zipapp.py
+++ b/Lib/test/test_zipapp.py
@@ -53,6 +53,23 @@ def test_create_archive_with_subdirs(self):
             self.assertIn('foo/', z.namelist())
             self.assertIn('bar/', z.namelist())
 
+    def test_create_archive_with_include_file(self):
+        # Test packing a directory and using include_file to specify which files to include.
+        def skip_pyc_files(file):
+            return '.pyc' not in str(file)
+        source = self.tmpdir / 'source'
+        source.mkdir()
+        (source / '__main__.py').touch()
+        (source / 'test.py').touch()
+        (source / 'test.pyc').touch()
+        target = self.tmpdir / 'source.pyz'
+
+        zipapp.create_archive(source, target, include_file=skip_pyc_files)
+        with zipfile.ZipFile(target, 'r') as z:
+            self.assertIn('__main__.py', z.namelist())
+            self.assertIn('test.py', z.namelist())
+            self.assertNotIn('test.pyc', z.namelist())
+
     def test_create_archive_default_target(self):
         # Test packing a directory to the default name.
         source = self.tmpdir / 'source'
diff --git a/Lib/zipapp.py b/Lib/zipapp.py
index c23b788d1c9..bf15b6806dd 100644
--- a/Lib/zipapp.py
+++ b/Lib/zipapp.py
@@ -73,7 +73,8 @@ def _copy_archive(archive, new_archive, interpreter=None):
         os.chmod(new_archive, os.stat(new_archive).st_mode | stat.S_IEXEC)
 
 
-def create_archive(source, target=None, interpreter=None, main=None):
+def create_archive(source, target=None, interpreter=None, main=None,
+                   include_file=None):
     """Create an application archive from SOURCE.
 
     The SOURCE can be the name of a directory, or a filename or a file-like
@@ -135,7 +136,8 @@ def create_archive(source, target=None, interpreter=None, main=None):
         with zipfile.ZipFile(fd, 'w') as z:
             for child in source.rglob('*'):
                 arcname = child.relative_to(source).as_posix()
-                z.write(child, arcname)
+                if include_file is None or include_file(pathlib.Path(arcname)):
+                    z.write(child, arcname)
             if main_py:
                 z.writestr('__main__.py', main_py.encode('utf-8'))
 
diff --git a/Misc/ACKS b/Misc/ACKS
index e340392d8e1..d6088b3f5d9 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1253,6 +1253,7 @@ Brian Quinlan
 Anders Qvist
 Thomas Rachel
 Ram Rachum
+Jeffrey Rackauckas
 J?r?me Radix
 Burton Radons
 Abhilash Raj
diff --git a/Misc/NEWS.d/next/Library/2017-08-09-13-45-23.bpo-31072.NLXDPV.rst b/Misc/NEWS.d/next/Library/2017-08-09-13-45-23.bpo-31072.NLXDPV.rst
new file mode 100644
index 00000000000..8c96201210f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-09-13-45-23.bpo-31072.NLXDPV.rst
@@ -0,0 +1 @@
+Add an ``include_file`` parameter to ``zipapp.create_archive()``


From webhook-mailer at python.org  Wed Aug  9 10:54:57 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 09 Aug 2017 14:54:57 -0000
Subject: [Python-checkins] [2.7] bpo-31150: Wait for child process in
 test_forkinthread to avoid thread reaped warnings (#3042)
Message-ID: <mailman.8.1502290498.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/425680bbd2dc14ef8dc5d1928f44fc7cc43018c4
commit: 425680bbd2dc14ef8dc5d1928f44fc7cc43018c4
branch: 2.7
author: Ammar Askar <ammar_askar at hotmail.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-08-09T16:54:53+02:00
summary:

[2.7] bpo-31150: Wait for child process in test_forkinthread to avoid thread reaped warnings (#3042)

files:
M Lib/test/test_thread.py

diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index 2f9abe078fc..c8caa5ddff0 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -245,6 +245,8 @@ def thread1():
                 os._exit(0)
             else: # parent
                 os.close(self.write_fd)
+                pid, status = os.waitpid(pid, 0)
+                self.assertEqual(status, 0)
 
         thread.start_new_thread(thread1, ())
         self.assertEqual(os.read(self.read_fd, 2), "OK",


From webhook-mailer at python.org  Wed Aug  9 10:59:25 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 09 Aug 2017 14:59:25 -0000
Subject: [Python-checkins] [3.6] bpo-31150: Wait for child process in
 test_forkinthread to avoid thread reaped warnings (#3041)
Message-ID: <mailman.9.1502290767.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/4388b4257abf3b9c348cf4db8c6144dcc07f3e98
commit: 4388b4257abf3b9c348cf4db8c6144dcc07f3e98
branch: 3.6
author: Ammar Askar <ammar_askar at hotmail.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-08-09T16:59:21+02:00
summary:

[3.6] bpo-31150: Wait for child process in test_forkinthread to avoid thread reaped warnings (#3041)

files:
M Lib/test/test_thread.py

diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index 3909b75ccd4..2e2655aee7f 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -239,6 +239,8 @@ def thread1():
                     os._exit(0)
             else: # parent
                 os.close(self.write_fd)
+                pid, status = os.waitpid(pid, 0)
+                self.assertEqual(status, 0)
 
         thread.start_new_thread(thread1, ())
         self.assertEqual(os.read(self.read_fd, 2), b"OK",


From webhook-mailer at python.org  Wed Aug  9 11:01:18 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 09 Aug 2017 15:01:18 -0000
Subject: [Python-checkins] bpo-31159: fix language switch regex on unknown
 yet built languages. (#3039)
Message-ID: <mailman.10.1502290879.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/122081deef86174beee965be1207fa46ea23533d
commit: 122081deef86174beee965be1207fa46ea23533d
branch: master
author: Julien Palard <julien at palard.fr>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-08-09T17:01:15+02:00
summary:

bpo-31159: fix language switch regex on unknown yet built languages. (#3039)

This fix a regex issue (a missing non-matching group around an 'or'
list) and the specific possible case where a translation is built but
not yet in known by the picker, but not explicitly listing possible
languages in the regex.

files:
M Doc/tools/static/switchers.js

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index de9e7b76f9e..ff23202a5e0 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -110,7 +110,7 @@
   // Returns the path segment of the language as a string, like 'fr/'
   // or '' if not found.
   function language_segment_from_url(url) {
-    var language_regexp = '\.org/(' + Object.keys(all_languages).join('|') + '/)';
+    var language_regexp = '\.org/([a-z]{2}(?:-[a-z]{2})?/)';
     var match = url.match(language_regexp);
     if (match !== null)
         return match[1];
@@ -120,7 +120,7 @@
   // Returns the path segment of the version as a string, like '3.6/'
   // or '' if not found.
   function version_segment_in_url(url) {
-    var language_segment = '(?:(?:' + Object.keys(all_languages).join('|') + ')/)';
+    var language_segment = '(?:[a-z]{2}(?:-[a-z]{2})?/)';
     var version_segment = '(?:(?:' + version_regexs.join('|') + ')/)';
     var version_regexp = '\\.org/' + language_segment + '?(' + version_segment + ')';
     var match = url.match(version_regexp);


From webhook-mailer at python.org  Wed Aug  9 11:44:22 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 09 Aug 2017 15:44:22 -0000
Subject: [Python-checkins] bpo-31160: Fix test_builtin for zombie process
 (#3043)
Message-ID: <mailman.11.1502293463.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/4baca1b0f7325032598cd38e7ceffc79b616d255
commit: 4baca1b0f7325032598cd38e7ceffc79b616d255
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-09T17:44:19+02:00
summary:

bpo-31160: Fix test_builtin for zombie process (#3043)

PtyTests.run_child() now calls os.waitpid() to read the exit status
of the child process to avoid creating zombie process and leaking
processes in the background.

files:
M Lib/test/test_builtin.py

diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index a83d20f4343..219a08abd3f 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -1568,6 +1568,10 @@ def run_child(self, child, terminal_input):
             self.fail("got %d lines in pipe but expected 2, child output was:\n%s"
                       % (len(lines), child_output))
         os.close(fd)
+
+        pid, status = os.waitpid(pid, 0)
+        self.assertEqual(status, 0)
+
         return lines
 
     def check_input_tty(self, prompt, terminal_input, stdio_encoding=None):


From webhook-mailer at python.org  Wed Aug  9 11:44:36 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 09 Aug 2017 15:44:36 -0000
Subject: [Python-checkins] bpo-31160: regrtest now reaps child processes
 (#3044)
Message-ID: <mailman.12.1502293477.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/e3510d74aacc477c30f42f2b941d69689bbc478e
commit: e3510d74aacc477c30f42f2b941d69689bbc478e
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-09T17:44:33+02:00
summary:

bpo-31160: regrtest now reaps child processes (#3044)

Add a post_test_cleanup() function which currently only calls
support.reap_children().

files:
M Lib/test/libregrtest/runtest.py

diff --git a/Lib/test/libregrtest/runtest.py b/Lib/test/libregrtest/runtest.py
index 0210409817b..dbd463435c7 100644
--- a/Lib/test/libregrtest/runtest.py
+++ b/Lib/test/libregrtest/runtest.py
@@ -146,6 +146,10 @@ def runtest(ns, test):
 runtest.stringio = None
 
 
+def post_test_cleanup():
+    support.reap_children()
+
+
 def runtest_inner(ns, test, display_failure=True):
     support.unload(test)
 
@@ -173,6 +177,7 @@ def test_runner():
             if ns.huntrleaks:
                 refleak = dash_R(the_module, test, test_runner, ns.huntrleaks)
             test_time = time.time() - start_time
+        post_test_cleanup()
     except support.ResourceDenied as msg:
         if not ns.quiet and not ns.pgo:
             print(test, "skipped --", msg, flush=True)


From webhook-mailer at python.org  Wed Aug  9 11:59:11 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 09 Aug 2017 15:59:11 -0000
Subject: [Python-checkins] bpo-31160: Fix test_random for zombie process
 (#3045)
Message-ID: <mailman.13.1502294351.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/da5e9301877346942fa4279612750d6a09e05153
commit: da5e9301877346942fa4279612750d6a09e05153
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-09T17:59:05+02:00
summary:

bpo-31160: Fix test_random for zombie process (#3045)

TestModule.test_after_fork() now calls os.waitpid() to read the exit
status of the child process to avoid creating a zombie process.

files:
M Lib/test/test_random.py

diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py
index f657b46b3a8..fbb1cf6696e 100644
--- a/Lib/test/test_random.py
+++ b/Lib/test/test_random.py
@@ -907,7 +907,9 @@ def __init__(self, newarg=None):
     def test_after_fork(self):
         # Test the global Random instance gets reseeded in child
         r, w = os.pipe()
-        if os.fork() == 0:
+        pid = os.fork()
+        if pid == 0:
+            # child process
             try:
                 val = random.getrandbits(128)
                 with open(w, "w") as f:
@@ -915,12 +917,16 @@ def test_after_fork(self):
             finally:
                 os._exit(0)
         else:
+            # parent process
             os.close(w)
             val = random.getrandbits(128)
             with open(r, "r") as f:
                 child_val = eval(f.read())
             self.assertNotEqual(val, child_val)
 
+            pid, status = os.waitpid(pid, 0)
+            self.assertEqual(status, 0)
+
 
 if __name__ == "__main__":
     unittest.main()


From webhook-mailer at python.org  Wed Aug  9 17:08:25 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 09 Aug 2017 21:08:25 -0000
Subject: [Python-checkins] bpo-31160: test_builtin: don't check waitpid()
 status (#3050)
Message-ID: <mailman.14.1502312906.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/3ca9f50f96cfa5c1b7aa56639042531b57f07fbb
commit: 3ca9f50f96cfa5c1b7aa56639042531b57f07fbb
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-09T23:08:22+02:00
summary:

bpo-31160: test_builtin: don't check waitpid() status (#3050)

files:
M Lib/test/test_builtin.py

diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 219a08abd3f..9d949b74cb8 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -1569,8 +1569,8 @@ def run_child(self, child, terminal_input):
                       % (len(lines), child_output))
         os.close(fd)
 
-        pid, status = os.waitpid(pid, 0)
-        self.assertEqual(status, 0)
+        # Wait until the child process completes
+        os.waitpid(pid, 0)
 
         return lines
 


From lp_benchmark_robot at intel.com  Wed Aug  9 20:08:12 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Wed, 9 Aug 2017 17:08:12 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-09
Message-ID: <fad6f295-9840-49ec-8048-1a37378a34a6@orsmsx105.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-09 03:03:42-07:00.
  - commit:		88eee44
  - previous commit:	733d0f6
  - revision date:	2017-08-09 10:51:43+02:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.179% |  +0.304%   |  +4.226%   |  +7.833%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 0.814% |  +0.069%   |  +22.190%  |  +10.335%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 2.776% |  -0.789%   |  +23.208%  |  +10.188%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.681% |  -0.046%   |  +21.007%  |  +10.941%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 3.057% |  -0.039%   |  +2.742%   |  +16.127%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 2.241% |  +0.040%   |  +11.225%  |  +10.034%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 1.767% |  -0.060%   |  +5.930%   |  +11.533%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.342% |  +0.009%   |  +4.374%   |  +5.394%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.187% |  -0.011%   |  +6.911%   |  +18.684%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 2.526% |  +0.396%   |  +9.605%   |  +12.644%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.361% |  -0.231%   |  +3.966%   |  +6.856%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 1.231% |  -0.163%   |  +4.765%   |  +5.990%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.819% |  +0.227%   |  +3.020%   |  +6.090%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.422% |  -0.020%   |  +8.688%   |  +12.245%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.489% |  +0.510%   |  +7.158%   |  +9.955%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.848% |  +0.002%   |  +6.118%   |  +11.023%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.335% |  +0.060%   |  +9.107%   |  +11.806%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.811% |  +0.134%   |  +7.551%   |  +11.112%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.460% |  -0.124%   |  +4.267%   |  +10.005%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 1.144% |  +0.503%   |  +2.942%   |  +10.947%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.655% |  +0.126%   |  +8.419%   |  +11.939%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 3.146% |  -0.661%   |  +46.753%  |  +11.743%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.274% |  -0.074%   |  +9.155%   |  +13.396%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.613% |  +0.028%   |  +18.817%  |  +11.645%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 5.798% |  -0.114%   |  +5.739%   |  +14.363%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.004% |  -0.108%   |  +3.845%   |  +6.189%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 1.478% |  -0.029%   |  -2.149%   |  +3.048%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 1.070% |  -0.297%   |  +2.702%   |  +7.677%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.315% |  -0.555%   |  +5.129%   |  +10.416%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 2.543% |  -0.298%   |  +1.714%   |  +23.043%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.437% |  -0.041%   |  +2.516%   |  +18.405%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.957% |  -0.191%   |  +4.713%   |  +19.288%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.669% |  +0.697%   |  +11.916%  |  +9.672%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.155% |  -0.013%   |  +0.292%   |  +10.155%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.118% |  -0.107%   |  +9.200%   |  +4.800%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.099% |  -0.105%   |  +1.019%   |  +4.660%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 0.812% |  +0.200%   |  +9.552%   |  +13.384%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.846% |  -0.909%   |  -10.557%  |  +13.905%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.452% |  +0.243%   |  +1.728%   |  +8.439%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.078% |  -0.243%   |  +0.545%   |  +3.024%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.229% |  -0.232%   |  +11.258%  |  +3.481%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.787% |  -0.501%   |  +7.837%   |  +14.285%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.520% |  +0.088%   |  +0.731%   |  +1.813%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.347% |  -0.424%   |  +26.831%  |  +8.898%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.869% |  -0.265%   |  +3.142%   |  +6.873%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 1.435% |  -0.291%   |  +12.933%  |  +10.112%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 3.021% |  -0.429%   |  -0.731%   |  +0.608%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.314% |  +0.152%   |  +5.863%   |  +1.659%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.350% |  -0.531%   |  +4.970%   |  +8.136%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.232% |  -0.594%   |  +4.808%   |  +5.314%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.731% |  +0.448%   |  +3.111%   |  +7.274%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.376% |  -0.353%   |  +12.238%  |  +9.142%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.337% |  -0.019%   |  +10.546%  |  +6.852%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.728% |  +0.786%   |  +12.115%  |  +9.844%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.647% |  -2.062%   |  +12.678%  |  +10.611%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 3.735% |  -0.128%   |  +23.859%  |  +9.220%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.210% |  -0.196%   |  +5.724%   |  +5.707%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.357% |  -0.243%   |  +0.576%   |  -0.098%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 7.619% |  -0.013%   |  +9.097%   |  +20.811%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.967% |  -0.078%   |  -1.879%   |  +16.299%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 2.395% |  +0.277%   |  +6.552%   |  +7.226%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.139% |  -0.256%   |  +5.844%   |  +6.995%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 1.997% |  +0.231%   |  +2.667%   |  +5.300%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 2.634% |  +0.028%   |  -5.479%   |  +10.135%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.614% |  +0.013%   |  +6.527%   |  +7.756%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-09

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Wed Aug  9 21:07:28 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Thu, 10 Aug 2017 01:07:28 -0000
Subject: [Python-checkins] bpo-19903: IDLE: Calltips changed to use
 inspect.signature (#2822)
Message-ID: <mailman.15.1502327250.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/3b0f620c1a2a21272a9e2aeca6ca1d1ac10f8162
commit: 3b0f620c1a2a21272a9e2aeca6ca1d1ac10f8162
branch: master
author: Louie Lu <git at louie.lu>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-08-09T20:58:13-04:00
summary:

bpo-19903: IDLE: Calltips changed to use inspect.signature (#2822)

Idlelib.calltips.get_argspec now uses inspect.signature instead of inspect.getfullargspec, like help() does.  This improves the signature in the call tip in a few different cases, including builtins converted to provide a signature.  A message is added if the object is not callable, has an invalid signature, or if it has positional-only parameters.
Patch by Louie Lu.

files:
A Misc/NEWS.d/next/IDLE/2017-08-03-14-08-42.bpo-19903.sqE1FS.rst
M Lib/idlelib/calltips.py
M Lib/idlelib/idle_test/test_calltips.py

diff --git a/Lib/idlelib/calltips.py b/Lib/idlelib/calltips.py
index a8a3abe6c69..49625eac158 100644
--- a/Lib/idlelib/calltips.py
+++ b/Lib/idlelib/calltips.py
@@ -123,6 +123,8 @@ def get_entity(expression):
 _INDENT = ' '*4  # for wrapped signatures
 _first_param = re.compile(r'(?<=\()\w*\,?\s*')
 _default_callable_argspec = "See source or doc"
+_invalid_method = "invalid method signature"
+_argument_positional = "\n['/' marks preceding arguments as positional-only]\n"
 
 
 def get_argspec(ob):
@@ -134,25 +136,30 @@ def get_argspec(ob):
     empty line or _MAX_LINES.    For builtins, this typically includes
     the arguments in addition to the return value.
     '''
-    argspec = ""
+    argspec = default = ""
     try:
         ob_call = ob.__call__
     except BaseException:
-        return argspec
-    if isinstance(ob, type):
-        fob = ob.__init__
-    elif isinstance(ob_call, types.MethodType):
-        fob = ob_call
-    else:
-        fob = ob
-    if isinstance(fob, (types.FunctionType, types.MethodType)):
-        argspec = inspect.formatargspec(*inspect.getfullargspec(fob))
-        if (isinstance(ob, (type, types.MethodType)) or
-                isinstance(ob_call, types.MethodType)):
-            argspec = _first_param.sub("", argspec)
+        return default
+
+    fob = ob_call if isinstance(ob_call, types.MethodType) else ob
+
+    try:
+        argspec = str(inspect.signature(fob))
+    except ValueError as err:
+        msg = str(err)
+        if msg.startswith(_invalid_method):
+            return _invalid_method
+
+    if '/' in argspec:
+        """Using AC's positional argument should add the explain"""
+        argspec += _argument_positional
+    if isinstance(fob, type) and argspec == '()':
+        """fob with no argument, use default callable argspec"""
+        argspec = _default_callable_argspec
 
     lines = (textwrap.wrap(argspec, _MAX_COLS, subsequent_indent=_INDENT)
-            if len(argspec) > _MAX_COLS else [argspec] if argspec else [])
+             if len(argspec) > _MAX_COLS else [argspec] if argspec else [])
 
     if isinstance(ob_call, types.MethodType):
         doc = ob_call.__doc__
@@ -171,6 +178,7 @@ def get_argspec(ob):
         argspec = _default_callable_argspec
     return argspec
 
+
 if __name__ == '__main__':
     from unittest import main
     main('idlelib.idle_test.test_calltips', verbosity=2)
diff --git a/Lib/idlelib/idle_test/test_calltips.py b/Lib/idlelib/idle_test/test_calltips.py
index 29b9f06faf8..fa92ece78ee 100644
--- a/Lib/idlelib/idle_test/test_calltips.py
+++ b/Lib/idlelib/idle_test/test_calltips.py
@@ -46,6 +46,7 @@ def test_builtins(self):
 
         # Python class that inherits builtin methods
         class List(list): "List() doc"
+
         # Simulate builtin with no docstring for default tip test
         class SB:  __call__ = None
 
@@ -53,18 +54,28 @@ def gtest(obj, out):
             self.assertEqual(signature(obj), out)
 
         if List.__doc__ is not None:
-            gtest(List, List.__doc__)
+            gtest(List, '(iterable=(), /)' + ct._argument_positional + '\n' +
+                  List.__doc__)
         gtest(list.__new__,
-               'Create and return a new object.  See help(type) for accurate signature.')
+               '(*args, **kwargs)\nCreate and return a new object.  See help(type) for accurate signature.')
         gtest(list.__init__,
+               '(self, /, *args, **kwargs)' + ct._argument_positional + '\n' +
                'Initialize self.  See help(type(self)) for accurate signature.')
-        append_doc =  "Append object to the end of the list."
-        gtest(list.append, append_doc)
-        gtest([].append, append_doc)
-        gtest(List.append, append_doc)
+        append_doc = ct._argument_positional + "\nAppend object to the end of the list."
+        gtest(list.append, '(self, object, /)' + append_doc)
+        gtest(List.append, '(self, object, /)' + append_doc)
+        gtest([].append, '(object, /)' + append_doc)
 
         gtest(types.MethodType, "method(function, instance)")
         gtest(SB(), default_tip)
+        import re
+        p = re.compile('')
+        gtest(re.sub, '''(pattern, repl, string, count=0, flags=0)\nReturn the string obtained by replacing the leftmost
+non-overlapping occurrences of the pattern in string by the
+replacement repl.  repl can be either a string or a callable;
+if a string, backslash escapes in it are processed.  If it is
+a callable, it's passed the match object and must return''')
+        gtest(p.sub, '''(repl, string, count=0)\nReturn the string obtained by replacing the leftmost non-overlapping occurrences o...''')
 
     def test_signature_wrap(self):
         if textwrap.TextWrapper.__doc__ is not None:
@@ -132,12 +143,20 @@ def test_starred_parameter(self):
         # test that starred first parameter is *not* removed from argspec
         class C:
             def m1(*args): pass
-            def m2(**kwds): pass
         c = C()
-        for meth, mtip  in ((C.m1, '(*args)'), (c.m1, "(*args)"),
-                                      (C.m2, "(**kwds)"), (c.m2, "(**kwds)"),):
+        for meth, mtip  in ((C.m1, '(*args)'), (c.m1, "(*args)"),):
             self.assertEqual(signature(meth), mtip)
 
+    def test_invalid_method_signature(self):
+        class C:
+            def m2(**kwargs): pass
+        class Test:
+            def __call__(*, a): pass
+
+        mtip = ct._invalid_method
+        self.assertEqual(signature(C().m2), mtip)
+        self.assertEqual(signature(Test()), mtip)
+
     def test_non_ascii_name(self):
         # test that re works to delete a first parameter name that
         # includes non-ascii chars, such as various forms of A.
@@ -156,17 +175,23 @@ def test_attribute_exception(self):
         class NoCall:
             def __getattr__(self, name):
                 raise BaseException
-        class Call(NoCall):
+        class CallA(NoCall):
+            def __call__(oui, a, b, c):
+                pass
+        class CallB(NoCall):
             def __call__(self, ci):
                 pass
-        for meth, mtip  in ((NoCall, default_tip), (Call, default_tip),
-                            (NoCall(), ''), (Call(), '(ci)')):
+
+        for meth, mtip  in ((NoCall, default_tip), (CallA, default_tip),
+                            (NoCall(), ''), (CallA(), '(a, b, c)'),
+                            (CallB(), '(ci)')):
             self.assertEqual(signature(meth), mtip)
 
     def test_non_callables(self):
         for obj in (0, 0.0, '0', b'0', [], {}):
             self.assertEqual(signature(obj), '')
 
+
 class Get_entityTest(unittest.TestCase):
     def test_bad_entity(self):
         self.assertIsNone(ct.get_entity('1/0'))
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-03-14-08-42.bpo-19903.sqE1FS.rst b/Misc/NEWS.d/next/IDLE/2017-08-03-14-08-42.bpo-19903.sqE1FS.rst
new file mode 100644
index 00000000000..f25fc80c3dd
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-03-14-08-42.bpo-19903.sqE1FS.rst
@@ -0,0 +1,3 @@
+IDLE: Calltips use `inspect.signature` instead of `inspect.getfullargspec`.
+This improves calltips for builtins converted to use Argument Clinic.
+Patch by Louie Lu.


From webhook-mailer at python.org  Thu Aug 10 00:46:32 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Thu, 10 Aug 2017 04:46:32 -0000
Subject: [Python-checkins] [3.6] bpo-19903: IDLE: Calltips changed to use
 inspect.signature (GH-2822) (#3053)
Message-ID: <mailman.16.1502340395.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/646f6c3096abfe5bde13f039ebf32bce5baf083a
commit: 646f6c3096abfe5bde13f039ebf32bce5baf083a
branch: 3.6
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-10T00:46:29-04:00
summary:

[3.6] bpo-19903: IDLE: Calltips changed to use inspect.signature (GH-2822) (#3053)

Idlelib.calltips.get_argspec now uses inspect.signature instead of inspect.getfullargspec, like help() does.  This improves the signature in the call tip in a few different cases, including builtins converted to provide a signature.  A message is added if the object is not callable, has an invalid signature, or if it has positional-only parameters.
Patch by Louie Lu..
(cherry picked from commit 3b0f620c1a2a21272a9e2aeca6ca1d1ac10f8162)

files:
A Misc/NEWS.d/next/IDLE/2017-08-03-14-08-42.bpo-19903.sqE1FS.rst
M Lib/idlelib/calltips.py
M Lib/idlelib/idle_test/test_calltips.py

diff --git a/Lib/idlelib/calltips.py b/Lib/idlelib/calltips.py
index a8a3abe6c69..49625eac158 100644
--- a/Lib/idlelib/calltips.py
+++ b/Lib/idlelib/calltips.py
@@ -123,6 +123,8 @@ def get_entity(expression):
 _INDENT = ' '*4  # for wrapped signatures
 _first_param = re.compile(r'(?<=\()\w*\,?\s*')
 _default_callable_argspec = "See source or doc"
+_invalid_method = "invalid method signature"
+_argument_positional = "\n['/' marks preceding arguments as positional-only]\n"
 
 
 def get_argspec(ob):
@@ -134,25 +136,30 @@ def get_argspec(ob):
     empty line or _MAX_LINES.    For builtins, this typically includes
     the arguments in addition to the return value.
     '''
-    argspec = ""
+    argspec = default = ""
     try:
         ob_call = ob.__call__
     except BaseException:
-        return argspec
-    if isinstance(ob, type):
-        fob = ob.__init__
-    elif isinstance(ob_call, types.MethodType):
-        fob = ob_call
-    else:
-        fob = ob
-    if isinstance(fob, (types.FunctionType, types.MethodType)):
-        argspec = inspect.formatargspec(*inspect.getfullargspec(fob))
-        if (isinstance(ob, (type, types.MethodType)) or
-                isinstance(ob_call, types.MethodType)):
-            argspec = _first_param.sub("", argspec)
+        return default
+
+    fob = ob_call if isinstance(ob_call, types.MethodType) else ob
+
+    try:
+        argspec = str(inspect.signature(fob))
+    except ValueError as err:
+        msg = str(err)
+        if msg.startswith(_invalid_method):
+            return _invalid_method
+
+    if '/' in argspec:
+        """Using AC's positional argument should add the explain"""
+        argspec += _argument_positional
+    if isinstance(fob, type) and argspec == '()':
+        """fob with no argument, use default callable argspec"""
+        argspec = _default_callable_argspec
 
     lines = (textwrap.wrap(argspec, _MAX_COLS, subsequent_indent=_INDENT)
-            if len(argspec) > _MAX_COLS else [argspec] if argspec else [])
+             if len(argspec) > _MAX_COLS else [argspec] if argspec else [])
 
     if isinstance(ob_call, types.MethodType):
         doc = ob_call.__doc__
@@ -171,6 +178,7 @@ def get_argspec(ob):
         argspec = _default_callable_argspec
     return argspec
 
+
 if __name__ == '__main__':
     from unittest import main
     main('idlelib.idle_test.test_calltips', verbosity=2)
diff --git a/Lib/idlelib/idle_test/test_calltips.py b/Lib/idlelib/idle_test/test_calltips.py
index 97e15fe10e0..f6b71306ac8 100644
--- a/Lib/idlelib/idle_test/test_calltips.py
+++ b/Lib/idlelib/idle_test/test_calltips.py
@@ -46,6 +46,7 @@ def test_builtins(self):
 
         # Python class that inherits builtin methods
         class List(list): "List() doc"
+
         # Simulate builtin with no docstring for default tip test
         class SB:  __call__ = None
 
@@ -53,18 +54,29 @@ def gtest(obj, out):
             self.assertEqual(signature(obj), out)
 
         if List.__doc__ is not None:
-            gtest(List, List.__doc__)
+            gtest(List, List.__doc__)  # This and append_doc changed in 3.7.
         gtest(list.__new__,
-               'Create and return a new object.  See help(type) for accurate signature.')
+               '(*args, **kwargs)\nCreate and return a new object.'
+               '  See help(type) for accurate signature.')
         gtest(list.__init__,
+               '(self, /, *args, **kwargs)' + ct._argument_positional + '\n' +
                'Initialize self.  See help(type(self)) for accurate signature.')
-        append_doc =  "L.append(object) -> None -- append object to end" #see3.7
+
+        append_doc =  "L.append(object) -> None -- append object to end"
         gtest(list.append, append_doc)
         gtest([].append, append_doc)
         gtest(List.append, append_doc)
 
         gtest(types.MethodType, "method(function, instance)")
         gtest(SB(), default_tip)
+        import re
+        p = re.compile('')
+        gtest(re.sub, '''(pattern, repl, string, count=0, flags=0)\nReturn the string obtained by replacing the leftmost
+non-overlapping occurrences of the pattern in string by the
+replacement repl.  repl can be either a string or a callable;
+if a string, backslash escapes in it are processed.  If it is
+a callable, it's passed the match object and must return''')
+        gtest(p.sub, '''(repl, string, count=0)\nReturn the string obtained by replacing the leftmost non-overlapping occurrences o...''')
 
     def test_signature_wrap(self):
         if textwrap.TextWrapper.__doc__ is not None:
@@ -132,12 +144,20 @@ def test_starred_parameter(self):
         # test that starred first parameter is *not* removed from argspec
         class C:
             def m1(*args): pass
-            def m2(**kwds): pass
         c = C()
-        for meth, mtip  in ((C.m1, '(*args)'), (c.m1, "(*args)"),
-                                      (C.m2, "(**kwds)"), (c.m2, "(**kwds)"),):
+        for meth, mtip  in ((C.m1, '(*args)'), (c.m1, "(*args)"),):
             self.assertEqual(signature(meth), mtip)
 
+    def test_invalid_method_signature(self):
+        class C:
+            def m2(**kwargs): pass
+        class Test:
+            def __call__(*, a): pass
+
+        mtip = ct._invalid_method
+        self.assertEqual(signature(C().m2), mtip)
+        self.assertEqual(signature(Test()), mtip)
+
     def test_non_ascii_name(self):
         # test that re works to delete a first parameter name that
         # includes non-ascii chars, such as various forms of A.
@@ -156,17 +176,23 @@ def test_attribute_exception(self):
         class NoCall:
             def __getattr__(self, name):
                 raise BaseException
-        class Call(NoCall):
+        class CallA(NoCall):
+            def __call__(oui, a, b, c):
+                pass
+        class CallB(NoCall):
             def __call__(self, ci):
                 pass
-        for meth, mtip  in ((NoCall, default_tip), (Call, default_tip),
-                            (NoCall(), ''), (Call(), '(ci)')):
+
+        for meth, mtip  in ((NoCall, default_tip), (CallA, default_tip),
+                            (NoCall(), ''), (CallA(), '(a, b, c)'),
+                            (CallB(), '(ci)')):
             self.assertEqual(signature(meth), mtip)
 
     def test_non_callables(self):
         for obj in (0, 0.0, '0', b'0', [], {}):
             self.assertEqual(signature(obj), '')
 
+
 class Get_entityTest(unittest.TestCase):
     def test_bad_entity(self):
         self.assertIsNone(ct.get_entity('1/0'))
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-03-14-08-42.bpo-19903.sqE1FS.rst b/Misc/NEWS.d/next/IDLE/2017-08-03-14-08-42.bpo-19903.sqE1FS.rst
new file mode 100644
index 00000000000..f25fc80c3dd
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-03-14-08-42.bpo-19903.sqE1FS.rst
@@ -0,0 +1,3 @@
+IDLE: Calltips use `inspect.signature` instead of `inspect.getfullargspec`.
+This improves calltips for builtins converted to use Argument Clinic.
+Patch by Louie Lu.


From solipsis at pitrou.net  Thu Aug 10 05:05:07 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 10 Aug 2017 09:05:07 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=3
Message-ID: <20170810090506.112854.A2DFAAE9A7583F93@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_fork leaked [-2, 1, 0] memory blocks, sum=-1
test_multiprocessing_forkserver leaked [1, -2, 1] memory blocks, sum=0


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogV4Zp7U', '--timeout', '7200']

From webhook-mailer at python.org  Thu Aug 10 06:37:42 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 10 Aug 2017 10:37:42 -0000
Subject: [Python-checkins] bpo-31173: Rewrite WSTOPSIG test of
 test_subprocess (#3055)
Message-ID: <mailman.17.1502361464.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/7b7c6dcfff6a35333988a3c74c895ed19dff2e09
commit: 7b7c6dcfff6a35333988a3c74c895ed19dff2e09
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-10T12:37:39+02:00
summary:

bpo-31173: Rewrite WSTOPSIG test of test_subprocess (#3055)

The current test_child_terminated_in_stopped_state() function test
creates a child process which calls ptrace(PTRACE_TRACEME, 0, 0) and
then crash (SIGSEGV). The problem is that calling os.waitpid() in the
parent process is not enough to close the process: the child process
remains alive and so the unit test leaks a child process in a
strange state. Closing the child process requires non-trivial code,
maybe platform specific.

Remove the functional test and replaces it with an unit test which
mocks os.waitpid() using a new _testcapi.W_STOPCODE() function to
test the WIFSTOPPED() path.

files:
M Lib/test/test_subprocess.py
M Modules/_testcapimodule.c

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index d152826213e..1d2d15c7a24 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -29,6 +29,11 @@
 except ImportError:
     threading = None
 
+try:
+    import _testcapi
+except ImportError:
+    _testcapi = None
+
 if support.PGO:
     raise unittest.SkipTest("test is not helpful for PGO")
 
@@ -2565,42 +2570,24 @@ def test_communicate_BrokenPipeError_stdin_close_with_timeout(self):
             proc.communicate(timeout=999)
             mock_proc_stdin.close.assert_called_once_with()
 
-    @unittest.skipIf(not ctypes, 'ctypes module required')
-    @unittest.skipIf(not sys.executable, 'Test requires sys.executable')
-    def test_child_terminated_in_stopped_state(self):
+    @unittest.skipUnless(_testcapi is not None
+                         and hasattr(_testcapi, 'W_STOPCODE'),
+                         'need _testcapi.W_STOPCODE')
+    def test_stopped(self):
         """Test wait() behavior when waitpid returns WIFSTOPPED; issue29335."""
-        PTRACE_TRACEME = 0  # From glibc and MacOS (PT_TRACE_ME).
-        libc_name = ctypes.util.find_library('c')
-        libc = ctypes.CDLL(libc_name)
-        if not hasattr(libc, 'ptrace'):
-            raise unittest.SkipTest('ptrace() required')
-
-        code = textwrap.dedent(f"""
-             import ctypes
-             import faulthandler
-             from test.support import SuppressCrashReport
-
-             libc = ctypes.CDLL({libc_name!r})
-             libc.ptrace({PTRACE_TRACEME}, 0, 0)
-        """)
-
-        child = subprocess.Popen([sys.executable, '-c', code])
-        if child.wait() != 0:
-            raise unittest.SkipTest('ptrace() failed - unable to test')
-
-        code += textwrap.dedent(f"""
-             with SuppressCrashReport():
-                # Crash the process
-                faulthandler._sigsegv()
-        """)
-        child = subprocess.Popen([sys.executable, '-c', code])
-        try:
-            returncode = child.wait()
-        except:
-            child.kill()  # Clean up the hung stopped process.
-            raise
-        self.assertNotEqual(0, returncode)
-        self.assertLess(returncode, 0)  # signal death, likely SIGSEGV.
+        args = [sys.executable, '-c', 'pass']
+        proc = subprocess.Popen(args)
+
+        # Wait until the real process completes to avoid zombie process
+        pid = proc.pid
+        pid, status = os.waitpid(pid, 0)
+        self.assertEqual(status, 0)
+
+        status = _testcapi.W_STOPCODE(3)
+        with mock.patch('subprocess.os.waitpid', return_value=(pid, status)):
+            returncode = proc.wait()
+
+        self.assertEqual(returncode, -3)
 
 
 @unittest.skipUnless(mswindows, "Windows specific tests")
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 655669050dd..95c10184159 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -18,6 +18,10 @@
 #  include <winsock2.h>         /* struct timeval */
 #endif
 
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>           /* For W_STOPCODE */
+#endif
+
 #ifdef WITH_THREAD
 #include "pythread.h"
 #endif /* WITH_THREAD */
@@ -4272,6 +4276,7 @@ test_pyobject_fastcallkeywords(PyObject *self, PyObject *args)
     return _PyObject_FastCallKeywords(func, stack, nargs, kwnames);
 }
 
+
 static PyObject*
 stack_pointer(PyObject *self, PyObject *args)
 {
@@ -4280,6 +4285,20 @@ stack_pointer(PyObject *self, PyObject *args)
 }
 
 
+#ifdef W_STOPCODE
+static PyObject*
+py_w_stopcode(PyObject *self, PyObject *args)
+{
+    int sig, status;
+    if (!PyArg_ParseTuple(args, "i", &sig)) {
+        return NULL;
+    }
+    status = W_STOPCODE(sig);
+    return PyLong_FromLong(status);
+}
+#endif
+
+
 static PyMethodDef TestMethods[] = {
     {"raise_exception",         raise_exception,                 METH_VARARGS},
     {"raise_memoryerror",   (PyCFunction)raise_memoryerror,  METH_NOARGS},
@@ -4493,6 +4512,9 @@ static PyMethodDef TestMethods[] = {
     {"pyobject_fastcalldict", test_pyobject_fastcalldict, METH_VARARGS},
     {"pyobject_fastcallkeywords", test_pyobject_fastcallkeywords, METH_VARARGS},
     {"stack_pointer", stack_pointer, METH_NOARGS},
+#ifdef W_STOPCODE
+    {"W_STOPCODE", py_w_stopcode, METH_VARARGS},
+#endif
     {NULL, NULL} /* sentinel */
 };
 


From webhook-mailer at python.org  Thu Aug 10 07:05:09 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 10 Aug 2017 11:05:09 -0000
Subject: [Python-checkins] bpo-31160: test_tempfile: Fix reap_children()
 warning (#3056)
Message-ID: <mailman.18.1502363111.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/6c8c2943d996b59a48d331f61f22cbe72933910e
commit: 6c8c2943d996b59a48d331f61f22cbe72933910e
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-10T13:05:06+02:00
summary:

bpo-31160: test_tempfile: Fix reap_children() warning (#3056)

TestRandomNameSequence.test_process_awareness() now calls
os.waitpid() to avoid leaking a zombie process.

files:
M Lib/test/test_tempfile.py

diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index d0cf04b0cb6..710756bde64 100644
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -78,7 +78,6 @@ def setUp(self):
     def tearDown(self):
         self._warnings_manager.__exit__(None, None, None)
 
-
     def nameCheck(self, name, dir, pre, suf):
         (ndir, nbase) = os.path.split(name)
         npre  = nbase[:len(pre)]
@@ -184,12 +183,15 @@ def test_process_awareness(self):
         try:
             pid = os.fork()
             if not pid:
+                # child process
                 os.close(read_fd)
                 os.write(write_fd, next(self.r).encode("ascii"))
                 os.close(write_fd)
                 # bypass the normal exit handlers- leave those to
                 # the parent.
                 os._exit(0)
+
+            # parent process
             parent_value = next(self.r)
             child_value = os.read(read_fd, len(parent_value)).decode("ascii")
         finally:
@@ -200,6 +202,10 @@ def test_process_awareness(self):
                     os.kill(pid, signal.SIGKILL)
                 except OSError:
                     pass
+
+                # Read the process exit status to avoid zombie process
+                os.waitpid(pid, 0)
+
             os.close(read_fd)
             os.close(write_fd)
         self.assertNotEqual(child_value, parent_value)


From webhook-mailer at python.org  Thu Aug 10 09:28:19 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 10 Aug 2017 13:28:19 -0000
Subject: [Python-checkins] bpo-31151: Add
 socketserver.ForkingMixIn.server_close() (#3057)
Message-ID: <mailman.19.1502371701.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/aa8ec34ad52bb3b274ce91169e1bc4a598655049
commit: aa8ec34ad52bb3b274ce91169e1bc4a598655049
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-10T15:28:16+02:00
summary:

bpo-31151: Add socketserver.ForkingMixIn.server_close() (#3057)

* Add socketserver.ForkingMixIn.server_close()

bpo-31151: socketserver.ForkingMixIn.server_close() now waits until
all child processes completed to prevent leaking zombie processes.

* Fix test on Windows which doesn't have ForkingMixIn

files:
A Misc/NEWS.d/next/Library/2017-08-10-13-20-02.bpo-31151.730VBI.rst
M Lib/socketserver.py
M Lib/test/test_socketserver.py

diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index 6e1ae9fddda..df171149501 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -547,7 +547,7 @@ class ForkingMixIn:
         active_children = None
         max_children = 40
 
-        def collect_children(self):
+        def collect_children(self, *, blocking=False):
             """Internal routine to wait for children that have exited."""
             if self.active_children is None:
                 return
@@ -571,7 +571,8 @@ def collect_children(self):
             # Now reap all defunct children.
             for pid in self.active_children.copy():
                 try:
-                    pid, _ = os.waitpid(pid, os.WNOHANG)
+                    flags = 0 if blocking else os.WNOHANG
+                    pid, _ = os.waitpid(pid, flags)
                     # if the child hasn't exited yet, pid will be 0 and ignored by
                     # discard() below
                     self.active_children.discard(pid)
@@ -620,6 +621,10 @@ def process_request(self, request, client_address):
                     finally:
                         os._exit(status)
 
+        def server_close(self):
+            super().server_close()
+            self.collect_children(blocking=True)
+
 
 class ThreadingMixIn:
     """Mix-in class to handle each request in a new thread."""
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 140a6abf9ef..3d93566607d 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -144,6 +144,10 @@ def run_server(self, svrcls, hdlrbase, testfunc):
         t.join()
         server.server_close()
         self.assertEqual(-1, server.socket.fileno())
+        if HAVE_FORKING and isinstance(server, socketserver.ForkingMixIn):
+            # bpo-31151: Check that ForkingMixIn.server_close() waits until
+            # all children completed
+            self.assertFalse(server.active_children)
         if verbose: print("done")
 
     def stream_examine(self, proto, addr):
@@ -371,10 +375,7 @@ def wait_done(self):
 
 if HAVE_FORKING:
     class ForkingErrorTestServer(socketserver.ForkingMixIn, BaseErrorTestServer):
-        def wait_done(self):
-            [child] = self.active_children
-            os.waitpid(child, 0)
-            self.active_children.clear()
+        pass
 
 
 class SocketWriterTest(unittest.TestCase):
diff --git a/Misc/NEWS.d/next/Library/2017-08-10-13-20-02.bpo-31151.730VBI.rst b/Misc/NEWS.d/next/Library/2017-08-10-13-20-02.bpo-31151.730VBI.rst
new file mode 100644
index 00000000000..6eff63653ab
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-10-13-20-02.bpo-31151.730VBI.rst
@@ -0,0 +1,2 @@
+socketserver.ForkingMixIn.server_close() now waits until all child processes
+completed to prevent leaking zombie processes.


From webhook-mailer at python.org  Thu Aug 10 10:01:50 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 10 Aug 2017 14:01:50 -0000
Subject: [Python-checkins] Enhance support.reap_children() (#3036)
Message-ID: <mailman.20.1502373711.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/b5011479808b80545bdd1246725fc7940691b084
commit: b5011479808b80545bdd1246725fc7940691b084
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-10T16:01:47+02:00
summary:

Enhance support.reap_children() (#3036)

* reap_children() now sets environment_altered to True to detect bugs
  using python3 -m test --fail-env-changed
* Replace bare "except:" with "except OSError:" in reap_children()
* Write an unit test for reap_children() using a timeout of 60
  seconds

files:
M Lib/test/support/__init__.py
M Lib/test/test_support.py

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 7a4671c1b2b..0235498e2a9 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -2073,26 +2073,35 @@ def decorator(*args):
             threading_cleanup(*key)
     return decorator
 
+
 def reap_children():
     """Use this function at the end of test_main() whenever sub-processes
     are started.  This will help ensure that no extra children (zombies)
     stick around to hog resources and create problems when looking
     for refleaks.
     """
+    global environment_altered
+
+    # Need os.waitpid(-1, os.WNOHANG): Windows is not supported
+    if not (hasattr(os, 'waitpid') and hasattr(os, 'WNOHANG')):
+        return
+
     # Reap all our dead child processes so we don't leave zombies around.
     # These hog resources and might be causing some of the buildbots to die.
-    if hasattr(os, 'waitpid'):
-        any_process = -1
-        while True:
-            try:
-                # This will raise an exception on Windows.  That's ok.
-                pid, status = os.waitpid(any_process, os.WNOHANG)
-                if pid == 0:
-                    break
-                print("Warning -- reap_children() reaped child process %s"
-                      % pid, file=sys.stderr)
-            except:
-                break
+    while True:
+        try:
+            # Read the exit status of any child process which already completed
+            pid, status = os.waitpid(-1, os.WNOHANG)
+        except OSError:
+            break
+
+        if pid == 0:
+            break
+
+        print("Warning -- reap_children() reaped child process %s"
+              % pid, file=sys.stderr)
+        environment_altered = True
+
 
 @contextlib.contextmanager
 def start_threads(threads, unlock=None):
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 1e6b2b54e23..8632837780c 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -1,12 +1,15 @@
+import contextlib
+import errno
 import importlib
+import io
+import os
 import shutil
+import socket
 import stat
 import sys
-import os
-import unittest
-import socket
 import tempfile
-import errno
+import time
+import unittest
 from test import support
 
 TESTFN = support.TESTFN
@@ -378,6 +381,51 @@ def test_check__all__(self):
 
         self.assertRaises(AssertionError, support.check__all__, self, unittest)
 
+    @unittest.skipUnless(hasattr(os, 'waitpid') and hasattr(os, 'WNOHANG'),
+                         'need os.waitpid() and os.WNOHANG')
+    def test_reap_children(self):
+        # Make sure that there is no other pending child process
+        support.reap_children()
+
+        # Create a child process
+        pid = os.fork()
+        if pid == 0:
+            # child process: do nothing, just exit
+            os._exit(0)
+
+        t0 = time.monotonic()
+        deadline = time.monotonic() + 60.0
+
+        was_altered = support.environment_altered
+        try:
+            support.environment_altered = False
+            stderr = io.StringIO()
+
+            while True:
+                if time.monotonic() > deadline:
+                    self.fail("timeout")
+
+                with contextlib.redirect_stderr(stderr):
+                    support.reap_children()
+
+                # Use environment_altered to check if reap_children() found
+                # the child process
+                if support.environment_altered:
+                    break
+
+                # loop until the child process completed
+                time.sleep(0.100)
+
+            msg = "Warning -- reap_children() reaped child process %s" % pid
+            self.assertIn(msg, stderr.getvalue())
+            self.assertTrue(support.environment_altered)
+        finally:
+            support.environment_altered = was_altered
+
+        # Just in case, check again that there is no other
+        # pending child process
+        support.reap_children()
+
     # XXX -follows a list of untested API
     # make_legacy_pyc
     # is_resource_enabled
@@ -398,7 +446,6 @@ def test_check__all__(self):
     # run_doctest
     # threading_cleanup
     # reap_threads
-    # reap_children
     # strip_python_stderr
     # args_from_interpreter_flags
     # can_symlink


From webhook-mailer at python.org  Thu Aug 10 10:02:04 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 10 Aug 2017 14:02:04 -0000
Subject: [Python-checkins] [3.6] bpo-31160: Backport reap_children() fixes
 from master to 3.6 (#3060)
Message-ID: <mailman.21.1502373725.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/719a15b32587de6c4add4385ee3f84a20711340f
commit: 719a15b32587de6c4add4385ee3f84a20711340f
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-10T16:02:00+02:00
summary:

[3.6] bpo-31160: Backport reap_children() fixes from master to 3.6 (#3060)

* bpo-31160: Fix test_builtin for zombie process (#3043)

PtyTests.run_child() now calls os.waitpid() to read the exit status
of the child process to avoid creating zombie process and leaking
processes in the background.
(cherry picked from commit 4baca1b0f7325032598cd38e7ceffc79b616d255)

* bpo-31160: regrtest now reaps child processes (#3044)

Add a post_test_cleanup() function which currently only calls
support.reap_children().
(cherry picked from commit e3510d74aacc477c30f42f2b941d69689bbc478e)

* bpo-31160: test_builtin: don't check waitpid() status (#3050)

(cherry picked from commit 3ca9f50f96cfa5c1b7aa56639042531b57f07fbb)

* bpo-31160: test_tempfile: Fix reap_children() warning (#3056)

TestRandomNameSequence.test_process_awareness() now calls
os.waitpid() to avoid leaking a zombie process.
(cherry picked from commit 6c8c2943d996b59a48d331f61f22cbe72933910e)

files:
M Lib/test/libregrtest/runtest.py
M Lib/test/test_builtin.py
M Lib/test/test_tempfile.py

diff --git a/Lib/test/libregrtest/runtest.py b/Lib/test/libregrtest/runtest.py
index fda4ca1ebca..d716b83e235 100644
--- a/Lib/test/libregrtest/runtest.py
+++ b/Lib/test/libregrtest/runtest.py
@@ -143,6 +143,10 @@ def runtest(ns, test):
 runtest.stringio = None
 
 
+def post_test_cleanup():
+    support.reap_children()
+
+
 def runtest_inner(ns, test, display_failure=True):
     support.unload(test)
 
@@ -170,6 +174,7 @@ def test_runner():
             if ns.huntrleaks:
                 refleak = dash_R(the_module, test, test_runner, ns.huntrleaks)
             test_time = time.time() - start_time
+        post_test_cleanup()
     except support.ResourceDenied as msg:
         if not ns.quiet and not ns.pgo:
             print(test, "skipped --", msg, flush=True)
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 7a4b7eb9176..49c4a53c052 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -1560,6 +1560,10 @@ def run_child(self, child, terminal_input):
             self.fail("got %d lines in pipe but expected 2, child output was:\n%s"
                       % (len(lines), child_output))
         os.close(fd)
+
+        # Wait until the child process completes
+        os.waitpid(pid, 0)
+
         return lines
 
     def check_input_tty(self, prompt, terminal_input, stdio_encoding=None):
diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index d0cf04b0cb6..710756bde64 100644
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -78,7 +78,6 @@ def setUp(self):
     def tearDown(self):
         self._warnings_manager.__exit__(None, None, None)
 
-
     def nameCheck(self, name, dir, pre, suf):
         (ndir, nbase) = os.path.split(name)
         npre  = nbase[:len(pre)]
@@ -184,12 +183,15 @@ def test_process_awareness(self):
         try:
             pid = os.fork()
             if not pid:
+                # child process
                 os.close(read_fd)
                 os.write(write_fd, next(self.r).encode("ascii"))
                 os.close(write_fd)
                 # bypass the normal exit handlers- leave those to
                 # the parent.
                 os._exit(0)
+
+            # parent process
             parent_value = next(self.r)
             child_value = os.read(read_fd, len(parent_value)).decode("ascii")
         finally:
@@ -200,6 +202,10 @@ def test_process_awareness(self):
                     os.kill(pid, signal.SIGKILL)
                 except OSError:
                     pass
+
+                # Read the process exit status to avoid zombie process
+                os.waitpid(pid, 0)
+
             os.close(read_fd)
             os.close(write_fd)
         self.assertNotEqual(child_value, parent_value)


From webhook-mailer at python.org  Thu Aug 10 10:11:32 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 10 Aug 2017 14:11:32 -0000
Subject: [Python-checkins] PCbuild: downgrade pcbuild.sln to support VS 2010
 (#3031)
Message-ID: <mailman.22.1502374295.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/693790817a93701093ef93333be7abbb0d6d4309
commit: 693790817a93701093ef93333be7abbb0d6d4309
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-10T16:11:29+02:00
summary:

PCbuild: downgrade pcbuild.sln to support VS 2010 (#3031)

bpo-31133: Downgrade PCbuild/pcbuild.sln from format version 12.00 to
11.00 to support Visual Studio 2010 and newer, not only VS 2013 and
newer.

files:
M PCbuild/pcbuild.sln

diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
index 069116061f7..e03861bbf99 100644
--- a/PCbuild/pcbuild.sln
+++ b/PCbuild/pcbuild.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}"
 	ProjectSection(SolutionItems) = preProject


From webhook-mailer at python.org  Thu Aug 10 10:19:08 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 10 Aug 2017 14:19:08 -0000
Subject: [Python-checkins] regrtest: count also env changed as failures in
 progress (#3061)
Message-ID: <mailman.23.1502374748.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/b97d99cd7f9546493ecc995f003f7b0ba4ba3a17
commit: b97d99cd7f9546493ecc995f003f7b0ba4ba3a17
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-10T16:19:03+02:00
summary:

regrtest: count also env changed as failures in progress (#3061)

files:
M Lib/test/libregrtest/main.py

diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index bc8155bbff2..0b48bebb0d7 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -132,8 +132,9 @@ def display_progress(self, test_index, test):
 
         # "[ 51/405/1] test_tcl passed"
         line = f"{test_index:{self.test_count_width}}{self.test_count}"
-        if self.bad and not self.ns.pgo:
-            line = f"{line}/{len(self.bad)}"
+        fails = len(self.bad) + len(self.environment_changed)
+        if fails and not self.ns.pgo:
+            line = f"{line}/{fails}"
         line = f"[{line}] {test}"
 
         # add the system load prefix: "load avg: 1.80 "


From webhook-mailer at python.org  Thu Aug 10 10:45:43 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 10 Aug 2017 14:45:43 -0000
Subject: [Python-checkins] [2.7] bpo-31160: Backport reap_children fixes
 from master to 2.7 (#3063)
Message-ID: <mailman.24.1502376345.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/1247e2cda514d7a73187e0b53ec8c35d87a34a84
commit: 1247e2cda514d7a73187e0b53ec8c35d87a34a84
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-10T16:45:38+02:00
summary:

[2.7] bpo-31160: Backport reap_children fixes from master to 2.7 (#3063)

* bpo-31160: regrtest now reaps child processes (#3044)

Add a post_test_cleanup() function which currently only calls
support.reap_children().
(cherry picked from commit e3510d74aacc477c30f42f2b941d69689bbc478e)

* bpo-31160: test_tempfile: Fix reap_children() warning (#3056)

TestRandomNameSequence.test_process_awareness() now calls
os.waitpid() to avoid leaking a zombie process.
(cherry picked from commit 6c8c2943d996b59a48d331f61f22cbe72933910e)

files:
M Lib/test/regrtest.py
M Lib/test/test_tempfile.py

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 7a48475ee8a..7096de8469a 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1172,6 +1172,9 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         return False
 
 
+def post_test_cleanup():
+    test_support.reap_children()
+
 def runtest_inner(test, verbose, quiet, huntrleaks=False, pgo=False, testdir=None):
     test_support.unload(test)
     if verbose:
@@ -1205,6 +1208,7 @@ def runtest_inner(test, verbose, quiet, huntrleaks=False, pgo=False, testdir=Non
                     refleak = dash_R(the_module, test, indirect_test,
                         huntrleaks)
                 test_time = time.time() - start_time
+            post_test_cleanup()
         finally:
             sys.stdout = save_stdout
     except test_support.ResourceDenied, msg:
diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index 5c85cc9bd30..5c111a29ca6 100644
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -141,12 +141,15 @@ def test_process_awareness(self):
         try:
             pid = os.fork()
             if not pid:
+                # child process
                 os.close(read_fd)
                 os.write(write_fd, next(self.r).encode("ascii"))
                 os.close(write_fd)
                 # bypass the normal exit handlers- leave those to
                 # the parent.
                 os._exit(0)
+
+            # parent process
             parent_value = next(self.r)
             child_value = os.read(read_fd, len(parent_value)).decode("ascii")
         finally:
@@ -157,6 +160,10 @@ def test_process_awareness(self):
                     os.kill(pid, signal.SIGKILL)
                 except EnvironmentError:
                     pass
+
+                # Read the process exit status to avoid zombie process
+                os.waitpid(pid, 0)
+
             os.close(read_fd)
             os.close(write_fd)
         self.assertNotEqual(child_value, parent_value)


From webhook-mailer at python.org  Thu Aug 10 10:54:29 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 10 Aug 2017 14:54:29 -0000
Subject: [Python-checkins] =?utf-8?q?bpo-31159=3A_fix_language_switch_reg?=
 =?utf-8?q?ex_on_unknown_yet_built_languages=2E_=E2=80=A6_=28=233051=29?=
Message-ID: <mailman.25.1502376872.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/e8e7fba0b24582959feca9c31f2a72fc0251f83d
commit: e8e7fba0b24582959feca9c31f2a72fc0251f83d
branch: 3.6
author: Julien Palard <julien at palard.fr>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-08-10T16:54:26+02:00
summary:

bpo-31159: fix language switch regex on unknown yet built languages. ? (#3051)

* bpo-31159: fix language switch regex on unknown yet built languages. (#3039)

This fix a regex issue (a missing non-matching group around an 'or'
list) and the specific possible case where a translation is built but
not yet in known by the picker, but not explicitly listing possible
languages in the regex.
(cherry picked from commit 122081deef86174beee965be1207fa46ea23533d)

* bpo-31149: Doc: Add Japanese to the language switcher. (#3028)

(cherry picked from commit c82b7f332aff606af6c9c163da75f1e86514125e)

files:
M Doc/tools/static/switchers.js

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index 470ff6d33b7..ff23202a5e0 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -21,6 +21,7 @@
   var all_languages = {
       'en': 'English',
       'fr': 'Fran?ais',
+      'ja': 'Japanese',
   };
 
   function build_version_select(current_version, current_release) {
@@ -109,7 +110,7 @@
   // Returns the path segment of the language as a string, like 'fr/'
   // or '' if not found.
   function language_segment_from_url(url) {
-    var language_regexp = '\.org/(' + Object.keys(all_languages).join('|') + '/)';
+    var language_regexp = '\.org/([a-z]{2}(?:-[a-z]{2})?/)';
     var match = url.match(language_regexp);
     if (match !== null)
         return match[1];
@@ -119,7 +120,7 @@
   // Returns the path segment of the version as a string, like '3.6/'
   // or '' if not found.
   function version_segment_in_url(url) {
-    var language_segment = '(?:(?:' + Object.keys(all_languages).join('|') + ')/)';
+    var language_segment = '(?:[a-z]{2}(?:-[a-z]{2})?/)';
     var version_segment = '(?:(?:' + version_regexs.join('|') + ')/)';
     var version_regexp = '\\.org/' + language_segment + '?(' + version_segment + ')';
     var match = url.match(version_regexp);


From webhook-mailer at python.org  Thu Aug 10 11:36:54 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 10 Aug 2017 15:36:54 -0000
Subject: [Python-checkins] bpo-26762: _test_multiprocessing reports dangling
 (#3064)
Message-ID: <mailman.26.1502379415.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/957d0e9b59bd27ca7c473560634d8b5dbe66338c
commit: 957d0e9b59bd27ca7c473560634d8b5dbe66338c
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-10T17:36:50+02:00
summary:

bpo-26762: _test_multiprocessing reports dangling (#3064)

_test_multiprocessing now marks the test as ENV_CHANGED on dangling
process or thread.

files:
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index e18f7cd3d1d..cce3c0287e9 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -4329,12 +4329,14 @@ def tearDownClass(cls):
 
         processes = set(multiprocessing.process._dangling) - set(cls.dangling[0])
         if processes:
+            test.support.environment_altered = True
             print('Warning -- Dangling processes: %s' % processes,
                   file=sys.stderr)
         processes = None
 
         threads = set(threading._dangling) - set(cls.dangling[1])
         if threads:
+            test.support.environment_altered = True
             print('Warning -- Dangling threads: %s' % threads,
                   file=sys.stderr)
         threads = None
@@ -4402,6 +4404,7 @@ def tearDownClass(cls):
             t *= 2
             dt = time.monotonic() - start_time
             if dt >= 5.0:
+                test.support.environment_altered = True
                 print("Warning -- multiprocessing.Manager still has %s active "
                       "children after %s seconds"
                       % (multiprocessing.active_children(), dt),
@@ -4413,6 +4416,7 @@ def tearDownClass(cls):
             # This is not really an error since some tests do not
             # ensure that all processes which hold a reference to a
             # managed object have been joined.
+            test.support.environment_altered = True
             print('Warning -- Shared objects which still exist at manager '
                   'shutdown:')
             print(cls.manager._debug_info())
@@ -4511,6 +4515,7 @@ def tearDownModule():
         processes = set(multiprocessing.process._dangling) - set(dangling[0])
         if processes:
             need_sleep = True
+            test.support.environment_altered = True
             print('Warning -- Dangling processes: %s' % processes,
                   file=sys.stderr)
         processes = None
@@ -4518,6 +4523,7 @@ def tearDownModule():
         threads = set(threading._dangling) - set(dangling[1])
         if threads:
             need_sleep = True
+            test.support.environment_altered = True
             print('Warning -- Dangling threads: %s' % threads,
                   file=sys.stderr)
         threads = None


From webhook-mailer at python.org  Thu Aug 10 19:23:25 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 10 Aug 2017 23:23:25 -0000
Subject: [Python-checkins] bpo-31008: Fix asyncio test_wait_for_handle on
 Windows (#3065)
Message-ID: <mailman.27.1502407406.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/5659a72f487579be76335c09c8ba8b2f1800adde
commit: 5659a72f487579be76335c09c8ba8b2f1800adde
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-11T01:23:22+02:00
summary:

bpo-31008: Fix asyncio test_wait_for_handle on Windows (#3065)

files:
M Lib/test/test_asyncio/test_windows_events.py

diff --git a/Lib/test/test_asyncio/test_windows_events.py b/Lib/test/test_asyncio/test_windows_events.py
index 1afcae107b0..c72eef1afdb 100644
--- a/Lib/test/test_asyncio/test_windows_events.py
+++ b/Lib/test/test_asyncio/test_windows_events.py
@@ -118,7 +118,9 @@ def test_wait_for_handle(self):
 
         self.assertEqual(done, False)
         self.assertFalse(fut.result())
-        self.assertTrue(0.48 < elapsed < 0.9, elapsed)
+        # bpo-31008: Tolerate only 450 ms (at least 500 ms expected),
+        # because of bad clock resolution on Windows
+        self.assertTrue(0.45 <= elapsed <= 0.9, elapsed)
 
         _overlapped.SetEvent(event)
 


From webhook-mailer at python.org  Thu Aug 10 19:52:16 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 10 Aug 2017 23:52:16 -0000
Subject: [Python-checkins] bpo-31008: Fix asyncio test_wait_for_handle on
 Windows (#3065) (#3068)
Message-ID: <mailman.28.1502409137.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/270c3c62edd81c14fcdb6a24b4b518a777ec6534
commit: 270c3c62edd81c14fcdb6a24b4b518a777ec6534
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-11T01:52:13+02:00
summary:

bpo-31008: Fix asyncio test_wait_for_handle on Windows (#3065) (#3068)

(cherry picked from commit 5659a72f487579be76335c09c8ba8b2f1800adde)

files:
M Lib/test/test_asyncio/test_windows_events.py

diff --git a/Lib/test/test_asyncio/test_windows_events.py b/Lib/test/test_asyncio/test_windows_events.py
index 1afcae107b0..c72eef1afdb 100644
--- a/Lib/test/test_asyncio/test_windows_events.py
+++ b/Lib/test/test_asyncio/test_windows_events.py
@@ -118,7 +118,9 @@ def test_wait_for_handle(self):
 
         self.assertEqual(done, False)
         self.assertFalse(fut.result())
-        self.assertTrue(0.48 < elapsed < 0.9, elapsed)
+        # bpo-31008: Tolerate only 450 ms (at least 500 ms expected),
+        # because of bad clock resolution on Windows
+        self.assertTrue(0.45 <= elapsed <= 0.9, elapsed)
 
         _overlapped.SetEvent(event)
 


From lp_benchmark_robot at intel.com  Thu Aug 10 20:32:58 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Thu, 10 Aug 2017 17:32:58 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-10
Message-ID: <c0cf1609-d656-418a-b0cc-e18ceadaf202@orsmsx109.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-10 03:03:44-07:00.
  - commit:		3b0f620
  - previous commit:	88eee44
  - revision date:	2017-08-09 20:58:13-04:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.008% |  -0.006%   |  +4.220%   |  +7.491%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.663% |  -0.489%   |  +21.810%  |  +11.263%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 2.874% |  +0.842%   |  +23.854%  |  +10.840%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.502% |  +0.150%   |  +21.125%  |  +8.540%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 3.037% |  -0.343%   |  +2.408%   |  +15.105%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.808% |  +0.015%   |  +11.238%  |  +10.283%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 1.302% |  +0.425%   |  +6.330%   |  +10.888%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.509% |  -0.009%   |  +4.365%   |  +5.391%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.180% |  -1.066%   |  +5.919%   |  +19.619%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.044% |  -0.006%   |  +9.599%   |  +13.434%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.319% |  +0.674%   |  +4.613%   |  +6.050%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.522% |  -0.398%   |  +4.386%   |  +3.683%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.446% |  +0.147%   |  +3.163%   |  +6.332%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.750% |  -0.272%   |  +8.440%   |  +11.080%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.104% |  +0.239%   |  +7.381%   |  +9.135%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.881% |  +0.027%   |  +6.143%   |  +10.773%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.550% |  -0.106%   |  +9.011%   |  +11.315%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.310% |  +0.766%   |  +8.259%   |  +10.593%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 2.318% |  +0.007%   |  +4.273%   |  +8.878%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 1.393% |  -0.213%   |  +2.735%   |  +10.288%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.685% |  -0.236%   |  +8.204%   |  +13.151%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 3.012% |  +0.548%   |  +47.044%  |  +9.949%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.725% |  +0.551%   |  +9.655%   |  +14.191%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.430% |  -0.102%   |  +18.734%  |  +11.492%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 7.530% |  -1.175%   |  +4.632%   |  +14.319%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.363% |  -0.253%   |  +3.601%   |  +5.070%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.490% |  +0.223%   |  -1.922%   |  +1.872%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 1.465% |  -0.203%   |  +2.504%   |  +7.392%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.073% |  +0.203%   |  +5.322%   |  +8.194%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.120% |  -0.326%   |  +1.394%   |  +22.840%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.360% |  -0.028%   |  +2.489%   |  +23.205%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.883% |  +0.180%   |  +4.885%   |  +21.318%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 2.630% |  +0.489%   |  +12.347%  |  +9.147%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.244% |  +0.007%   |  +0.298%   |  +9.859%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.124% |  -0.153%   |  +9.061%   |  +4.697%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.094% |  +0.095%   |  +1.113%   |  +4.485%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.049% |  +0.039%   |  +9.587%   |  +13.373%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.871% |  +0.439%   |  -10.071%  |  +11.545%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 1.006% |  -0.281%   |  +1.452%   |  +8.761%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.692% |  +0.367%   |  +0.910%   |  +3.041%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.030% |  +0.047%   |  +11.300%  |  +4.267%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.943% |  -0.330%   |  +7.533%   |  +12.717%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.431% |  +0.137%   |  +0.867%   |  +1.022%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 2.668% |  -0.190%   |  +26.692%  |  +9.120%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.481% |  +0.216%   |  +3.351%   |  +4.555%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.795% |  +0.378%   |  +13.262%  |  +9.930%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 1.184% |  +0.362%   |  -0.367%   |  -1.029%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.281% |  -0.069%   |  +5.798%   |  +0.060%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.380% |  +0.232%   |  +5.190%   |  +6.664%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.224% |  +1.378%   |  +6.119%   |  +4.135%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.326% |  -0.574%   |  +2.555%   |  +8.069%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.197% |  +0.521%   |  +12.696%  |  +6.446%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.430% |  +0.270%   |  +10.788%  |  +5.748%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.356% |  +0.628%   |  +12.667%  |  +7.460%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.711% |  +1.591%   |  +14.067%  |  +8.332%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 5.955% |  -1.584%   |  +22.653%  |  +10.335%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.039% |  +0.470%   |  +6.167%   |  +4.611%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.565% |  +0.021%   |  +0.597%   |  +1.029%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle|10.200% |  -3.406%   |  +6.001%   |  +22.143%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.983% |  -0.926%   |  -2.823%   |  +16.447%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 3.231% |  -0.208%   |  +6.358%   |  +7.444%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.099% |  -0.020%   |  +5.826%   |  +7.430%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.262% |  -0.779%   |  +1.908%   |  +6.356%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 0.965% |  +0.541%   |  -4.909%   |  +9.884%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.621% |  -0.406%   |  +6.147%   |  +8.194%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-10

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Thu Aug 10 20:36:34 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 11 Aug 2017 00:36:34 -0000
Subject: [Python-checkins] bpo-31173: Rewrite WSTOPSIG test of
 test_subprocess (#3055) (#3070)
Message-ID: <mailman.29.1502411795.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/bc69d00288a0b1f5ef49dcfd60a91c5e9b5b81ae
commit: bc69d00288a0b1f5ef49dcfd60a91c5e9b5b81ae
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-11T02:36:30+02:00
summary:

bpo-31173: Rewrite WSTOPSIG test of test_subprocess (#3055) (#3070)

The current test_child_terminated_in_stopped_state() function test
creates a child process which calls ptrace(PTRACE_TRACEME, 0, 0) and
then crash (SIGSEGV). The problem is that calling os.waitpid() in the
parent process is not enough to close the process: the child process
remains alive and so the unit test leaks a child process in a
strange state. Closing the child process requires non-trivial code,
maybe platform specific.

Remove the functional test and replaces it with an unit test which
mocks os.waitpid() using a new _testcapi.W_STOPCODE() function to
test the WIFSTOPPED() path.
(cherry picked from commit 7b7c6dcfff6a35333988a3c74c895ed19dff2e09)

files:
M Lib/test/test_subprocess.py
M Modules/_testcapimodule.c

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 4072591b83e..4faf32e6361 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -29,6 +29,11 @@
 except ImportError:
     threading = None
 
+try:
+    import _testcapi
+except ImportError:
+    _testcapi = None
+
 if support.PGO:
     raise unittest.SkipTest("test is not helpful for PGO")
 
@@ -2567,42 +2572,24 @@ def test_communicate_BrokenPipeError_stdin_close_with_timeout(self):
             proc.communicate(timeout=999)
             mock_proc_stdin.close.assert_called_once_with()
 
-    @unittest.skipIf(not ctypes, 'ctypes module required')
-    @unittest.skipIf(not sys.executable, 'Test requires sys.executable')
-    def test_child_terminated_in_stopped_state(self):
+    @unittest.skipUnless(_testcapi is not None
+                         and hasattr(_testcapi, 'W_STOPCODE'),
+                         'need _testcapi.W_STOPCODE')
+    def test_stopped(self):
         """Test wait() behavior when waitpid returns WIFSTOPPED; issue29335."""
-        PTRACE_TRACEME = 0  # From glibc and MacOS (PT_TRACE_ME).
-        libc_name = ctypes.util.find_library('c')
-        libc = ctypes.CDLL(libc_name)
-        if not hasattr(libc, 'ptrace'):
-            raise unittest.SkipTest('ptrace() required')
-
-        code = textwrap.dedent(f"""
-             import ctypes
-             import faulthandler
-             from test.support import SuppressCrashReport
-
-             libc = ctypes.CDLL({libc_name!r})
-             libc.ptrace({PTRACE_TRACEME}, 0, 0)
-        """)
-
-        child = subprocess.Popen([sys.executable, '-c', code])
-        if child.wait() != 0:
-            raise unittest.SkipTest('ptrace() failed - unable to test')
-
-        code += textwrap.dedent(f"""
-             with SuppressCrashReport():
-                # Crash the process
-                faulthandler._sigsegv()
-        """)
-        child = subprocess.Popen([sys.executable, '-c', code])
-        try:
-            returncode = child.wait()
-        except:
-            child.kill()  # Clean up the hung stopped process.
-            raise
-        self.assertNotEqual(0, returncode)
-        self.assertLess(returncode, 0)  # signal death, likely SIGSEGV.
+        args = [sys.executable, '-c', 'pass']
+        proc = subprocess.Popen(args)
+
+        # Wait until the real process completes to avoid zombie process
+        pid = proc.pid
+        pid, status = os.waitpid(pid, 0)
+        self.assertEqual(status, 0)
+
+        status = _testcapi.W_STOPCODE(3)
+        with mock.patch('subprocess.os.waitpid', return_value=(pid, status)):
+            returncode = proc.wait()
+
+        self.assertEqual(returncode, -3)
 
 
 @unittest.skipUnless(mswindows, "Windows specific tests")
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index c3d829c7139..91fac1573d3 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -18,6 +18,10 @@
 #  include <winsock2.h>         /* struct timeval */
 #endif
 
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>           /* For W_STOPCODE */
+#endif
+
 #ifdef WITH_THREAD
 #include "pythread.h"
 #endif /* WITH_THREAD */
@@ -4148,6 +4152,20 @@ raise_SIGINT_then_send_None(PyObject *self, PyObject *args)
 }
 
 
+#ifdef W_STOPCODE
+static PyObject*
+py_w_stopcode(PyObject *self, PyObject *args)
+{
+    int sig, status;
+    if (!PyArg_ParseTuple(args, "i", &sig)) {
+        return NULL;
+    }
+    status = W_STOPCODE(sig);
+    return PyLong_FromLong(status);
+}
+#endif
+
+
 static PyMethodDef TestMethods[] = {
     {"raise_exception",         raise_exception,                 METH_VARARGS},
     {"raise_memoryerror",   (PyCFunction)raise_memoryerror,  METH_NOARGS},
@@ -4355,6 +4373,9 @@ static PyMethodDef TestMethods[] = {
     {"pyobject_fastcalldict", test_pyobject_fastcalldict, METH_VARARGS},
     {"pyobject_fastcallkeywords", test_pyobject_fastcallkeywords, METH_VARARGS},
     {"raise_SIGINT_then_send_None", raise_SIGINT_then_send_None, METH_VARARGS},
+#ifdef W_STOPCODE
+    {"W_STOPCODE", py_w_stopcode, METH_VARARGS},
+#endif
     {NULL, NULL} /* sentinel */
 };
 


From webhook-mailer at python.org  Thu Aug 10 21:45:14 2017
From: webhook-mailer at python.org (Mariatta)
Date: Fri, 11 Aug 2017 01:45:14 -0000
Subject: [Python-checkins] Fix typo in 3.7 What's New (GH-3069)
Message-ID: <mailman.30.1502415916.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/dadca480c5b7c5cf425d423316cd695bc5db3023
commit: dadca480c5b7c5cf425d423316cd695bc5db3023
branch: master
author: Daniel Himmelstein <daniel.himmelstein at gmail.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-08-10T18:45:12-07:00
summary:

Fix typo in 3.7 What's New (GH-3069)

Remove unneeded word `to`.

files:
M Doc/whatsnew/3.7.rst

diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index 21e9c568ae4..a92ad9f1df4 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -247,7 +247,7 @@ Peterson.)
 urllib.parse
 ------------
 
-:func:`urllib.parse.quote` has been updated to from RFC 2396 to RFC 3986,
+:func:`urllib.parse.quote` has been updated from RFC 2396 to RFC 3986,
 adding `~` to the set of characters that is never quoted by default.
 (Contributed by Christian Theune and Ratnadeep Debnath in :issue:`16285`.)
 


From solipsis at pitrou.net  Fri Aug 11 05:05:28 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 11 Aug 2017 09:05:28 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=4
Message-ID: <20170811090524.83029.E8EACC33C65F7969@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_functools leaked [0, 3, 1] memory blocks, sum=4


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogOzCX8i', '--timeout', '7200']

From webhook-mailer at python.org  Fri Aug 11 08:38:43 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 11 Aug 2017 12:38:43 -0000
Subject: [Python-checkins] bpo-31173: Rewrite WSTOPSIG test of
 test_subprocess (#3055) (#3071)
Message-ID: <mailman.31.1502455125.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/4dea06531ece28dffc1452de2694fb22e99b45f9
commit: 4dea06531ece28dffc1452de2694fb22e99b45f9
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-11T14:38:37+02:00
summary:

bpo-31173: Rewrite WSTOPSIG test of test_subprocess (#3055) (#3071)

The current test_child_terminated_in_stopped_state() function test
creates a child process which calls ptrace(PTRACE_TRACEME, 0, 0) and
then crash (SIGSEGV). The problem is that calling os.waitpid() in the
parent process is not enough to close the process: the child process
remains alive and so the unit test leaks a child process in a
strange state. Closing the child process requires non-trivial code,
maybe platform specific.

Remove the functional test and replaces it with an unit test which
mocks os.waitpid() using a new _testcapi.W_STOPCODE() function to
test the WIFSTOPPED() path.
(cherry picked from commit 7b7c6dcfff6a35333988a3c74c895ed19dff2e09)

files:
M Lib/test/test_subprocess.py
M Modules/_testcapimodule.c

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 77633376eb5..ce3372354cf 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -28,6 +28,11 @@
 except ImportError:
     threading = None
 
+try:
+    import _testcapi
+except ImportError:
+    _testcapi = None
+
 mswindows = (sys.platform == "win32")
 
 #
@@ -1265,40 +1270,28 @@ def test_pipe_cloexec(self):
 
         self.assertEqual(p2.returncode, 0, "Unexpected error: " + repr(stderr))
 
-    @unittest.skipIf(not ctypes, 'ctypes module required')
-    @unittest.skipIf(not sys.executable, 'Test requires sys.executable')
-    def test_child_terminated_in_stopped_state(self):
+    @unittest.skipUnless(_testcapi is not None
+                         and hasattr(_testcapi, 'W_STOPCODE'),
+                         'need _testcapi.W_STOPCODE')
+    def test_stopped(self):
         """Test wait() behavior when waitpid returns WIFSTOPPED; issue29335."""
-        PTRACE_TRACEME = 0  # From glibc and MacOS (PT_TRACE_ME).
-        libc_name = ctypes.util.find_library('c')
-        libc = ctypes.CDLL(libc_name)
-        if not hasattr(libc, 'ptrace'):
-            raise unittest.SkipTest('ptrace() required')
-
-        code = textwrap.dedent("""
-             import ctypes
-             from test.support import _crash_python
-
-             libc = ctypes.CDLL({libc_name!r})
-             libc.ptrace({PTRACE_TRACEME}, 0, 0)
-        """.format(libc_name=libc_name, PTRACE_TRACEME=PTRACE_TRACEME))
-
-        child = subprocess.Popen([sys.executable, '-c', code])
-        if child.wait() != 0:
-            raise unittest.SkipTest('ptrace() failed - unable to test')
-
-        code += textwrap.dedent("""
-             # Crash the process
-             _crash_python()
-        """)
-        child = subprocess.Popen([sys.executable, '-c', code])
-        try:
-            returncode = child.wait()
-        except:
-            child.kill()  # Clean up the hung stopped process.
-            raise
-        self.assertNotEqual(0, returncode)
-        self.assertLess(returncode, 0)  # signal death, likely SIGSEGV.
+        args = [sys.executable, '-c', 'pass']
+        proc = subprocess.Popen(args)
+
+        # Wait until the real process completes to avoid zombie process
+        pid = proc.pid
+        pid, status = os.waitpid(pid, 0)
+        self.assertEqual(status, 0)
+
+        status = _testcapi.W_STOPCODE(3)
+
+        def mock_waitpid(pid, flags):
+            return (pid, status)
+
+        with test_support.swap_attr(os, 'waitpid', mock_waitpid):
+            returncode = proc.wait()
+
+        self.assertEqual(returncode, -3)
 
 
 @unittest.skipUnless(mswindows, "Windows specific tests")
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index a68d839a7f7..a5e3f07667d 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -15,6 +15,10 @@
 #  include <crtdbg.h>
 #endif
 
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>           /* For W_STOPCODE */
+#endif
+
 #ifdef WITH_THREAD
 #include "pythread.h"
 #endif /* WITH_THREAD */
@@ -2523,6 +2527,7 @@ msvcrt_CrtSetReportMode(PyObject* self, PyObject *args)
     return PyInt_FromLong(res);
 }
 
+
 static PyObject*
 msvcrt_CrtSetReportFile(PyObject* self, PyObject *args)
 {
@@ -2540,6 +2545,20 @@ msvcrt_CrtSetReportFile(PyObject* self, PyObject *args)
 #endif
 
 
+#ifdef W_STOPCODE
+static PyObject*
+py_w_stopcode(PyObject *self, PyObject *args)
+{
+    int sig, status;
+    if (!PyArg_ParseTuple(args, "i", &sig)) {
+        return NULL;
+    }
+    status = W_STOPCODE(sig);
+    return PyLong_FromLong(status);
+}
+#endif
+
+
 static PyMethodDef TestMethods[] = {
     {"raise_exception",         raise_exception,                 METH_VARARGS},
     {"set_errno",               set_errno,                       METH_VARARGS},
@@ -2656,6 +2675,9 @@ static PyMethodDef TestMethods[] = {
     {"CrtSetReportMode", (PyCFunction)msvcrt_CrtSetReportMode, METH_VARARGS},
     {"CrtSetReportFile", (PyCFunction)msvcrt_CrtSetReportFile, METH_VARARGS},
 #endif
+#ifdef W_STOPCODE
+    {"W_STOPCODE", py_w_stopcode, METH_VARARGS},
+#endif
     {NULL, NULL} /* sentinel */
 };
 


From webhook-mailer at python.org  Fri Aug 11 11:14:34 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 11 Aug 2017 15:14:34 -0000
Subject: [Python-checkins] bpo-31067: test_subprocess calls reap_children()
 (#2931) (#3073)
Message-ID: <mailman.32.1502464476.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/504939fdf4ebdff47aacfab7876754edeb57bbe1
commit: 504939fdf4ebdff47aacfab7876754edeb57bbe1
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-11T17:14:31+02:00
summary:

bpo-31067: test_subprocess calls reap_children() (#2931) (#3073)

test_subprocess now also calls reap_children() in tearDown(), not
only on setUp().
(cherry picked from commit cc42c121eb5346f673247f95dac575aadb77d66c)

files:
M Lib/test/test_subprocess.py

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index ce3372354cf..a5a727efd62 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -57,6 +57,8 @@ def tearDown(self):
             inst.wait()
         subprocess._cleanup()
         self.assertFalse(subprocess._active, "subprocess._active not empty")
+        self.doCleanups()
+        test_support.reap_children()
 
     def assertStderrEqual(self, stderr, expected, msg=None):
         # In a debug build, stuff like "[6580 refs]" is printed to stderr at


From webhook-mailer at python.org  Fri Aug 11 11:14:39 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 11 Aug 2017 15:14:39 -0000
Subject: [Python-checkins] bpo-31067: test_subprocess calls reap_children()
 (#2931) (#3074)
Message-ID: <mailman.33.1502464481.2819.python-checkins@python.org>

https://github.com/python/cpython/commit/f2d769d539279f01a6589dd3a0d5865dd00e13b0
commit: f2d769d539279f01a6589dd3a0d5865dd00e13b0
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-11T17:14:37+02:00
summary:

bpo-31067: test_subprocess calls reap_children() (#2931) (#3074)

test_subprocess now also calls reap_children() in tearDown(), not
only on setUp().
(cherry picked from commit cc42c121eb5346f673247f95dac575aadb77d66c)

files:
M Lib/test/test_subprocess.py

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 4faf32e6361..004f1f01ab5 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -61,6 +61,8 @@ def tearDown(self):
             inst.wait()
         subprocess._cleanup()
         self.assertFalse(subprocess._active, "subprocess._active not empty")
+        self.doCleanups()
+        support.reap_children()
 
     def assertStderrEqual(self, stderr, expected, msg=None):
         # In a debug build, stuff like "[6580 refs]" is printed to stderr at


From lp_benchmark_robot at intel.com  Fri Aug 11 20:38:00 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Fri, 11 Aug 2017 17:38:00 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-11
Message-ID: <81bb26fc-6ff4-4f47-8076-eaf330bd24dc@orsmsx109.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-11 03:03:46-07:00.
  - commit:		dadca48
  - previous commit:	3b0f620
  - revision date:	2017-08-10 18:45:12-07:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.138% |  +0.143%   |  +4.358%   |  +7.602%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.610% |  -0.135%   |  +21.704%  |  +13.663%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 1.832% |  +0.405%   |  +24.163%  |  +12.085%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.689% |  -0.102%   |  +21.045%  |  +12.410%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.423% |  -0.315%   |  +2.101%   |  +15.818%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 2.159% |  -0.019%   |  +11.222%  |  +11.089%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 2.619% |  -0.427%   |  +5.930%   |  +10.716%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.395% |  +0.149%   |  +4.507%   |  +4.446%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.405% |  +0.837%   |  +6.706%   |  +19.499%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 3.815% |  +0.352%   |  +9.917%   |  +13.139%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.159% |  -0.041%   |  +4.574%   |  +6.896%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.336% |  +0.719%   |  +5.074%   |  +5.043%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.774% |  -0.139%   |  +3.029%   |  +7.158%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.458% |  +0.491%   |  +8.889%   |  +11.578%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.798% |  +0.116%   |  +7.488%   |  +7.685%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.761% |  -0.207%   |  +5.949%   |  +11.932%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.380% |  +0.201%   |  +9.195%   |  +10.953%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.656% |  -0.287%   |  +7.996%   |  +10.424%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.177% |  +0.330%   |  +4.589%   |  +9.417%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 1.044% |  +0.351%   |  +3.076%   |  +10.810%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.296% |  +0.522%   |  +8.683%   |  +13.489%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.927% |  +0.097%   |  +47.096%  |  +12.835%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.466% |  +0.483%   |  +10.091%  |  +11.560%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.395% |  +0.115%   |  +18.827%  |  +12.199%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 5.940% |  +1.914%   |  +6.458%   |  +13.070%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.267% |  +0.128%   |  +3.724%   |  +5.783%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.590% |  +0.003%   |  -1.919%   |  +2.653%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 1.841% |  +0.050%   |  +2.553%   |  +6.261%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.003% |  -0.339%   |  +5.001%   |  +9.721%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.322% |  -0.586%   |  +0.816%   |  +22.430%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.189% |  -0.028%   |  +2.461%   |  +19.004%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 1.119% |  +0.379%   |  +5.245%   |  +19.541%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 5.407% |  -1.265%   |  +11.237%  |  +10.993%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.203% |  -0.008%   |  +0.291%   |  +10.253%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.130% |  +0.016%   |  +9.076%   |  +5.129%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.096% |  +0.022%   |  +1.134%   |  +4.832%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 0.931% |  -0.095%   |  +9.502%   |  +13.821%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.873% |  -0.252%   |  -10.349%  |  +9.820%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 1.411% |  -0.096%   |  +1.357%   |  +8.336%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.064% |  -0.419%   |  +0.495%   |  +3.255%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 0.703% |  +0.156%   |  +11.438%  |  +3.316%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.593% |  -0.007%   |  +7.526%   |  +15.049%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 2.631% |  -0.590%   |  +0.282%   |  +2.911%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.647% |  +0.249%   |  +26.874%  |  +8.910%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 3.034% |  -0.470%   |  +2.897%   |  +7.970%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 1.206% |  -0.120%   |  +13.158%  |  +9.655%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 2.033% |  -0.373%   |  -0.742%   |  +2.548%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.527% |  -0.216%   |  +5.594%   |  +3.112%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.212% |  +0.225%   |  +5.404%   |  +6.807%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.098% |  -0.552%   |  +5.602%   |  +5.506%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 3.575% |  +1.394%   |  +3.913%   |  +8.388%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.126% |  +0.175%   |  +12.849%  |  +7.623%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.514% |  -0.331%   |  +10.492%  |  +6.657%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.722% |  -0.045%   |  +12.627%  |  +8.473%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.615% |  -0.223%   |  +13.876%  |  +8.825%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 3.705% |  +1.170%   |  +23.558%  |  +7.781%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.215% |  -0.275%   |  +5.909%   |  +4.608%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.604% |  +0.038%   |  +0.635%   |  +0.922%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle|10.242% |  -0.013%   |  +5.989%   |  +23.183%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 1.173% |  -0.788%   |  -3.634%   |  +19.273%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 0.840% |  +1.032%   |  +7.325%   |  +7.214%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.578% |  -0.178%   |  +5.658%   |  +8.459%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.208% |  -0.110%   |  +1.800%   |  +6.270%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 3.400% |  -1.360%   |  -6.336%   |  +10.024%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.246% |  +0.419%   |  +6.541%   |  +8.110%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-11

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From solipsis at pitrou.net  Sat Aug 12 05:05:28 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 12 Aug 2017 09:05:28 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=13
Message-ID: <20170812090527.86199.C5A6AEFFA512FB5B@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [7, -7, 8] memory blocks, sum=8
test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_spawn leaked [-1, 0, 2] memory blocks, sum=1


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogtF1GoI', '--timeout', '7200']

From webhook-mailer at python.org  Sat Aug 12 05:19:36 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Sat, 12 Aug 2017 09:19:36 -0000
Subject: [Python-checkins] bpo-30747: Attempt to fix atomic load/store
 (#2383)
Message-ID: <mailman.0.1502529577.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/e664d7f89d2b9960d9049237136396e824795cac
commit: e664d7f89d2b9960d9049237136396e824795cac
branch: master
author: P?r Bj?rklund <per.bjorklund at gmail.com>
committer: Antoine Pitrou <pitrou at free.fr>
date: 2017-08-12T11:19:30+02:00
summary:

bpo-30747: Attempt to fix atomic load/store (#2383)

_Py_atomic_* are currently not implemented as atomic operations
when building with MSVC. This patch attempts to implement parts
of the functionality required.

files:
A Misc/NEWS.d/next/Core and Builtins/2017-08-08-12-00-29.bpo-30747.g2kZRT.rst
M Include/pyatomic.h

diff --git a/Include/pyatomic.h b/Include/pyatomic.h
index 893d30d2eb0..832d951f843 100644
--- a/Include/pyatomic.h
+++ b/Include/pyatomic.h
@@ -10,6 +10,12 @@
 #include <stdatomic.h>
 #endif
 
+
+#if defined(_MSC_VER) 
+#include <intrin.h>
+#include <immintrin.h>
+#endif
+
 /* This is modeled after the atomics interface from C1x, according to
  * the draft at
  * http://www.open-std.org/JTC1/SC22/wg14/www/docs/n1425.pdf.
@@ -87,8 +93,9 @@ typedef struct _Py_atomic_int {
             || (ORDER) == __ATOMIC_CONSUME),                  \
      __atomic_load_n(&(ATOMIC_VAL)->_value, ORDER))
 
-#else
-
+/* Only support GCC (for expression statements) and x86 (for simple
+ * atomic semantics) and MSVC x86/x64/ARM */
+#elif defined(__GNUC__) && (defined(__i386__) || defined(__amd64))
 typedef enum _Py_memory_order {
     _Py_memory_order_relaxed,
     _Py_memory_order_acquire,
@@ -105,9 +112,6 @@ typedef struct _Py_atomic_int {
     int _value;
 } _Py_atomic_int;
 
-/* Only support GCC (for expression statements) and x86 (for simple
- * atomic semantics) for now */
-#if defined(__GNUC__) && (defined(__i386__) || defined(__amd64))
 
 static __inline__ void
 _Py_atomic_signal_fence(_Py_memory_order order)
@@ -127,7 +131,7 @@ _Py_atomic_thread_fence(_Py_memory_order order)
 static __inline__ void
 _Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
 {
-    (void)address;		/* shut up -Wunused-parameter */
+    (void)address;              /* shut up -Wunused-parameter */
     switch(order) {
     case _Py_memory_order_release:
     case _Py_memory_order_acq_rel:
@@ -219,7 +223,291 @@ _Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
         result; \
     })
 
-#else  /* !gcc x86 */
+#elif defined(_MSC_VER) 
+/*  _Interlocked* functions provide a full memory barrier and are therefore
+    enough for acq_rel and seq_cst. If the HLE variants aren't available
+    in hardware they will fall back to a full memory barrier as well.
+
+    This might affect performance but likely only in some very specific and
+    hard to meassure scenario.
+*/
+#if defined(_M_IX86) || defined(_M_X64)
+typedef enum _Py_memory_order {
+    _Py_memory_order_relaxed,
+    _Py_memory_order_acquire,
+    _Py_memory_order_release,
+    _Py_memory_order_acq_rel,
+    _Py_memory_order_seq_cst
+} _Py_memory_order;
+
+typedef struct _Py_atomic_address {
+    volatile uintptr_t _value;
+} _Py_atomic_address;
+
+typedef struct _Py_atomic_int {
+    volatile int _value;
+} _Py_atomic_int;
+
+
+#if defined(_M_X64) 
+#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) \
+    switch (ORDER) { \
+    case _Py_memory_order_acquire: \
+      _InterlockedExchange64_HLEAcquire((__int64 volatile*)ATOMIC_VAL, (__int64)NEW_VAL); \
+      break; \
+    case _Py_memory_order_release: \
+      _InterlockedExchange64_HLERelease((__int64 volatile*)ATOMIC_VAL, (__int64)NEW_VAL); \
+      break; \
+    default: \
+      _InterlockedExchange64((__int64 volatile*)ATOMIC_VAL, (__int64)NEW_VAL); \
+      break; \
+  }
+#else
+#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) ((void)0);
+#endif
+
+#define _Py_atomic_store_32bit(ATOMIC_VAL, NEW_VAL, ORDER) \
+  switch (ORDER) { \
+  case _Py_memory_order_acquire: \
+    _InterlockedExchange_HLEAcquire((volatile long*)ATOMIC_VAL, (int)NEW_VAL); \
+    break; \
+  case _Py_memory_order_release: \
+    _InterlockedExchange_HLERelease((volatile long*)ATOMIC_VAL, (int)NEW_VAL); \
+    break; \
+  default: \
+    _InterlockedExchange((volatile long*)ATOMIC_VAL, (int)NEW_VAL); \
+    break; \
+  }
+
+#if defined(_M_X64)
+/*  This has to be an intptr_t for now.
+    gil_created() uses -1 as a sentinel value, if this returns
+    a uintptr_t it will do an unsigned compare and crash
+*/
+inline intptr_t _Py_atomic_load_64bit(volatile uintptr_t* value, int order) {
+    uintptr_t old;
+    switch (order) {
+    case _Py_memory_order_acquire:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange64_HLEAcquire(value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_release:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange64_HLERelease(value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_relaxed:
+      old = *value;
+      break;
+    default:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange64(value, old, old) != old);
+      break;
+    }
+    }
+    return old; 
+}
+
+#else
+#define _Py_atomic_load_64bit(ATOMIC_VAL, ORDER) *ATOMIC_VAL
+#endif
+
+inline int _Py_atomic_load_32bit(volatile int* value, int order) {
+    int old;
+    switch (order) {
+    case _Py_memory_order_acquire:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange_HLEAcquire(value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_release:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange_HLERelease(value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_relaxed:
+      old = *value;
+      break;
+    default:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange(value, old, old) != old);
+      break;
+    }
+    }
+    return old; 
+}
+
+#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
+  if (sizeof(*ATOMIC_VAL._value) == 8) { \
+    _Py_atomic_store_64bit(ATOMIC_VAL._value, NEW_VAL, ORDER) } else { \
+    _Py_atomic_store_32bit(ATOMIC_VAL._value, NEW_VAL, ORDER) } 
+
+#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
+  ( \
+    sizeof(*(ATOMIC_VAL._value)) == 8 ? \
+    _Py_atomic_load_64bit(ATOMIC_VAL._value, ORDER) : \
+    _Py_atomic_load_32bit(ATOMIC_VAL._value, ORDER) \
+  )
+#elif defined(_M_ARM) || defined(_M_ARM64)
+typedef enum _Py_memory_order {
+    _Py_memory_order_relaxed,
+    _Py_memory_order_acquire,
+    _Py_memory_order_release,
+    _Py_memory_order_acq_rel,
+    _Py_memory_order_seq_cst
+} _Py_memory_order;
+
+typedef struct _Py_atomic_address {
+    volatile uintptr_t _value;
+} _Py_atomic_address;
+
+typedef struct _Py_atomic_int {
+    volatile int _value;
+} _Py_atomic_int;
+
+
+#if defined(_M_ARM64) 
+#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) \
+    switch (ORDER) { \
+    case _Py_memory_order_acquire: \
+      _InterlockedExchange64_acq((__int64 volatile*)ATOMIC_VAL, (__int64)NEW_VAL); \
+      break; \
+    case _Py_memory_order_release: \
+      _InterlockedExchange64_rel((__int64 volatile*)ATOMIC_VAL, (__int64)NEW_VAL); \
+      break; \
+    default: \
+      _InterlockedExchange64((__int64 volatile*)ATOMIC_VAL, (__int64)NEW_VAL); \
+      break; \
+  }
+#else
+#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) ((void)0);
+#endif
+
+#define _Py_atomic_store_32bit(ATOMIC_VAL, NEW_VAL, ORDER) \
+  switch (ORDER) { \
+  case _Py_memory_order_acquire: \
+    _InterlockedExchange_acq((volatile long*)ATOMIC_VAL, (int)NEW_VAL); \
+    break; \
+  case _Py_memory_order_release: \
+    _InterlockedExchange_rel((volatile long*)ATOMIC_VAL, (int)NEW_VAL); \
+    break; \
+  default: \
+    _InterlockedExchange((volatile long*)ATOMIC_VAL, (int)NEW_VAL); \
+    break; \
+  }
+
+#if defined(_M_ARM64)
+/*  This has to be an intptr_t for now.
+    gil_created() uses -1 as a sentinel value, if this returns
+    a uintptr_t it will do an unsigned compare and crash
+*/
+inline intptr_t _Py_atomic_load_64bit(volatile uintptr_t* value, int order) {
+    uintptr_t old;
+    switch (order) {
+    case _Py_memory_order_acquire:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange64_acq(value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_release:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange64_rel(value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_relaxed:
+      old = *value;
+      break;
+    default:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange64(value, old, old) != old);
+      break;
+    }
+    }
+    return old; 
+}
+
+#else
+#define _Py_atomic_load_64bit(ATOMIC_VAL, ORDER) *ATOMIC_VAL
+#endif
+
+inline int _Py_atomic_load_32bit(volatile int* value, int order) {
+    int old;
+    switch (order) {
+    case _Py_memory_order_acquire:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange_acq(value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_release:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange_rel(value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_relaxed:
+      old = *value;
+      break;
+    default:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange(value, old, old) != old);
+      break;
+    }
+    }
+    return old; 
+}
+
+#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
+  if (sizeof(*ATOMIC_VAL._value) == 8) { \
+    _Py_atomic_store_64bit(ATOMIC_VAL._value, NEW_VAL, ORDER) } else { \
+    _Py_atomic_store_32bit(ATOMIC_VAL._value, NEW_VAL, ORDER) } 
+
+#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
+  ( \
+    sizeof(*(ATOMIC_VAL._value)) == 8 ? \
+    _Py_atomic_load_64bit(ATOMIC_VAL._value, ORDER) : \
+    _Py_atomic_load_32bit(ATOMIC_VAL._value, ORDER) \
+  )
+#endif
+#else  /* !gcc x86  !_msc_ver */
+typedef enum _Py_memory_order {
+    _Py_memory_order_relaxed,
+    _Py_memory_order_acquire,
+    _Py_memory_order_release,
+    _Py_memory_order_acq_rel,
+    _Py_memory_order_seq_cst
+} _Py_memory_order;
+
+typedef struct _Py_atomic_address {
+    uintptr_t _value;
+} _Py_atomic_address;
+
+typedef struct _Py_atomic_int {
+    int _value;
+} _Py_atomic_int;
 /* Fall back to other compilers and processors by assuming that simple
    volatile accesses are atomic.  This is false, so people should port
    this. */
@@ -229,8 +517,6 @@ _Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
     ((ATOMIC_VAL)->_value = NEW_VAL)
 #define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
     ((ATOMIC_VAL)->_value)
-
-#endif  /* !gcc x86 */
 #endif
 
 /* Standardized shortcuts. */
@@ -245,6 +531,5 @@ _Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
     _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, _Py_memory_order_relaxed)
 #define _Py_atomic_load_relaxed(ATOMIC_VAL) \
     _Py_atomic_load_explicit(ATOMIC_VAL, _Py_memory_order_relaxed)
-
 #endif  /* Py_BUILD_CORE */
 #endif  /* Py_ATOMIC_H */
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-08-12-00-29.bpo-30747.g2kZRT.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-08-12-00-29.bpo-30747.g2kZRT.rst
new file mode 100644
index 00000000000..04a726a7e69
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-08-12-00-29.bpo-30747.g2kZRT.rst	
@@ -0,0 +1,2 @@
+Add a non-dummy implementation of _Py_atomic_store and _Py_atomic_load on
+MSVC.


From webhook-mailer at python.org  Sat Aug 12 11:37:12 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Sat, 12 Aug 2017 15:37:12 -0000
Subject: [Python-checkins] bpo-5001,
 bpo-31169: Fix two uninformative asserts in
 multiprocessing/managers.py (#3078)
Message-ID: <mailman.1.1502552235.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/48d9823a0ebde4dfab8bc154bb6df462fb2ee403
commit: 48d9823a0ebde4dfab8bc154bb6df462fb2ee403
branch: master
author: Allen W. Smith, Ph.D <drallensmith at users.noreply.github.com>
committer: Antoine Pitrou <pitrou at free.fr>
date: 2017-08-12T17:37:09+02:00
summary:

bpo-5001, bpo-31169: Fix two uninformative asserts in multiprocessing/managers.py (#3078)

* Make error message more informative

Replace assertions in error-reporting code with more-informative version that doesn't cause confusion over where and what the error is.

* Additional clarification + get travis to check

* Change from SystemError to TypeError

As suggested in PR comment by @pitrou, changing from SystemError; TypeError appears appropriate.

* NEWS file installation; ACKS addition (will do my best to justify it by additional work)

files:
A Misc/NEWS.d/next/Library/2017-08-12-09-25-55.bpo-5001.huQi2Y.rst
M Lib/multiprocessing/managers.py
M Misc/ACKS

diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index cae1c10734b..c6722771b05 100644
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -84,14 +84,17 @@ def dispatch(c, id, methodname, args=(), kwds={}):
 def convert_to_error(kind, result):
     if kind == '#ERROR':
         return result
-    elif kind == '#TRACEBACK':
-        assert type(result) is str
-        return  RemoteError(result)
-    elif kind == '#UNSERIALIZABLE':
-        assert type(result) is str
-        return RemoteError('Unserializable message: %s\n' % result)
+    elif kind in ('#TRACEBACK', '#UNSERIALIZABLE'):
+        if not isinstance(result, str):
+            raise TypeError(
+                "Result {0!r} (kind '{1}') type is {2}, not str".format(
+                    result, kind, type(result)))
+        if kind == '#UNSERIALIZABLE':
+            return RemoteError('Unserializable message: %s\n' % result)
+        else:
+            return RemoteError(result)
     else:
-        return ValueError('Unrecognized message type')
+        return ValueError('Unrecognized message type {!r}'.format(kind))
 
 class RemoteError(Exception):
     def __str__(self):
diff --git a/Misc/ACKS b/Misc/ACKS
index d6088b3f5d9..6fc41b36b59 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1465,6 +1465,7 @@ Ville Skytt?
 Michael Sloan
 Nick Sloan
 V?clav ?milauer
+Allen W. Smith
 Christopher Smith
 Eric V. Smith
 Gregory P. Smith
diff --git a/Misc/NEWS.d/next/Library/2017-08-12-09-25-55.bpo-5001.huQi2Y.rst b/Misc/NEWS.d/next/Library/2017-08-12-09-25-55.bpo-5001.huQi2Y.rst
new file mode 100644
index 00000000000..f157d49a816
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-12-09-25-55.bpo-5001.huQi2Y.rst
@@ -0,0 +1,9 @@
+There are a number of uninformative asserts in the `multiprocessing` module,
+as noted in issue 5001. This change fixes two of the most potentially
+problematic ones, since they are in error-reporting code, in the
+`multiprocessing.managers.convert_to_error` function. (It also makes more
+informative a ValueError message.) The only potentially problematic change
+is that the AssertionError is now a TypeError; however, this should also
+help distinguish it from an AssertionError being *reported* by the
+function/its caller (such as in issue 31169). - Patch by Allen W. Smith
+(drallensmith on github).


From solipsis at pitrou.net  Sun Aug 13 05:05:33 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 13 Aug 2017 09:05:33 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=4
Message-ID: <20170813090532.61686.771E77D9CAB99DCD@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [-7, 1, 7] memory blocks, sum=1
test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_forkserver leaked [1, 0, -2] memory blocks, sum=-1


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogvX26G2', '--timeout', '7200']

From webhook-mailer at python.org  Sun Aug 13 17:44:55 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Sun, 13 Aug 2017 21:44:55 -0000
Subject: [Python-checkins] =?utf-8?q?bpo-31159=3A_fix_language_switch_reg?=
 =?utf-8?q?ex_on_unknown_yet_built_languages=2E_=E2=80=A6_=28=233051=29_?=
 =?utf-8?b?KCMzMDgxKQ==?=
Message-ID: <mailman.2.1502660698.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/fe8d9dc479a96ef490034107e7d4a6228b4be140
commit: fe8d9dc479a96ef490034107e7d4a6228b4be140
branch: 2.7
author: Julien Palard <julien at palard.fr>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-08-13T23:44:51+02:00
summary:

bpo-31159: fix language switch regex on unknown yet built languages. ? (#3051) (#3081)

* bpo-31159: fix language switch regex on unknown yet built languages. (#3039)

This fix a regex issue (a missing non-matching group around an 'or'
list) and the specific possible case where a translation is built but
not yet in known by the picker, but not explicitly listing possible
languages in the regex.
(cherry picked from commit 122081deef86174beee965be1207fa46ea23533d)

* bpo-31149: Doc: Add Japanese to the language switcher. (#3028)

(cherry picked from commit c82b7f332aff606af6c9c163da75f1e86514125e)

(cherry picked from commit e8e7fba0b24582959feca9c31f2a72fc0251f83d)

files:
M Doc/tools/static/switchers.js

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index 470ff6d33b7..ff23202a5e0 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -21,6 +21,7 @@
   var all_languages = {
       'en': 'English',
       'fr': 'Fran?ais',
+      'ja': 'Japanese',
   };
 
   function build_version_select(current_version, current_release) {
@@ -109,7 +110,7 @@
   // Returns the path segment of the language as a string, like 'fr/'
   // or '' if not found.
   function language_segment_from_url(url) {
-    var language_regexp = '\.org/(' + Object.keys(all_languages).join('|') + '/)';
+    var language_regexp = '\.org/([a-z]{2}(?:-[a-z]{2})?/)';
     var match = url.match(language_regexp);
     if (match !== null)
         return match[1];
@@ -119,7 +120,7 @@
   // Returns the path segment of the version as a string, like '3.6/'
   // or '' if not found.
   function version_segment_in_url(url) {
-    var language_segment = '(?:(?:' + Object.keys(all_languages).join('|') + ')/)';
+    var language_segment = '(?:[a-z]{2}(?:-[a-z]{2})?/)';
     var version_segment = '(?:(?:' + version_regexs.join('|') + ')/)';
     var version_regexp = '\\.org/' + language_segment + '?(' + version_segment + ')';
     var match = url.match(version_regexp);


From solipsis at pitrou.net  Mon Aug 14 05:06:13 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 14 Aug 2017 09:06:13 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=1
Message-ID: <20170814090612.86056.7F23070CEF864784@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [-7, 1, 0] memory blocks, sum=-6
test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_fork leaked [2, 0, 1] memory blocks, sum=3
test_multiprocessing_spawn leaked [-2, 2, 0] memory blocks, sum=0


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogb7G7bZ', '--timeout', '7200']

From webhook-mailer at python.org  Mon Aug 14 09:55:20 2017
From: webhook-mailer at python.org (larryhastings)
Date: Mon, 14 Aug 2017 13:55:20 -0000
Subject: [Python-checkins] bpo-31106: Fix handling of erros in
 posix_fallocate() and posix_fadvise() (#3000) (#3000)
Message-ID: <mailman.3.1502718922.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/d4b93e21c2664d6a78e0656e7a7be0807be1c352
commit: d4b93e21c2664d6a78e0656e7a7be0807be1c352
branch: master
author: ????????? ???? <socketpair at gmail.com>
committer: larryhastings <larry at hastings.org>
date: 2017-08-14T06:55:16-07:00
summary:

bpo-31106: Fix handling of erros in posix_fallocate() and posix_fadvise() (#3000) (#3000)

files:
M Lib/test/test_posix.py
M Modules/posixmodule.c

diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index 148c0641a99..dba50e02d94 100644
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -298,6 +298,16 @@ def test_posix_fallocate(self):
         finally:
             os.close(fd)
 
+    # issue31106 - posix_fallocate() does not set error in errno.
+    @unittest.skipUnless(hasattr(posix, 'posix_fallocate'),
+        "test needs posix.posix_fallocate()")
+    def test_posix_fallocate_errno(self):
+        try:
+            posix.posix_fallocate(-42, 0, 10)
+        except OSError as inst:
+            if inst.errno != errno.EBADF:
+                raise
+
     @unittest.skipUnless(hasattr(posix, 'posix_fadvise'),
         "test needs posix.posix_fadvise()")
     def test_posix_fadvise(self):
@@ -307,6 +317,15 @@ def test_posix_fadvise(self):
         finally:
             os.close(fd)
 
+    @unittest.skipUnless(hasattr(posix, 'posix_fadvise'),
+        "test needs posix.posix_fadvise()")
+    def test_posix_fadvise_errno(self):
+        try:
+            posix.posix_fadvise(-42, 0, 0, posix.POSIX_FADV_WILLNEED)
+        except OSError as inst:
+            if inst.errno != errno.EBADF:
+                raise
+
     @unittest.skipUnless(os.utime in os.supports_fd, "test needs fd support in os.utime")
     def test_utime_with_fd(self):
         now = time.time()
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 2e5e79a8d36..f0577874334 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -8917,11 +8917,16 @@ os_posix_fallocate_impl(PyObject *module, int fd, Py_off_t offset,
         Py_BEGIN_ALLOW_THREADS
         result = posix_fallocate(fd, offset, length);
         Py_END_ALLOW_THREADS
-    } while (result != 0 && errno == EINTR &&
-             !(async_err = PyErr_CheckSignals()));
-    if (result != 0)
-        return (!async_err) ? posix_error() : NULL;
-    Py_RETURN_NONE;
+    } while (result == EINTR && !(async_err = PyErr_CheckSignals()));
+
+    if (result == 0)
+        Py_RETURN_NONE;
+
+    if (async_err)
+        return NULL;
+
+    errno = result;
+    return posix_error();
 }
 #endif /* HAVE_POSIX_FALLOCATE) && !POSIX_FADVISE_AIX_BUG */
 
@@ -8959,11 +8964,16 @@ os_posix_fadvise_impl(PyObject *module, int fd, Py_off_t offset,
         Py_BEGIN_ALLOW_THREADS
         result = posix_fadvise(fd, offset, length, advice);
         Py_END_ALLOW_THREADS
-    } while (result != 0 && errno == EINTR &&
-             !(async_err = PyErr_CheckSignals()));
-    if (result != 0)
-        return (!async_err) ? posix_error() : NULL;
-    Py_RETURN_NONE;
+    } while (result == EINTR && !(async_err = PyErr_CheckSignals()));
+
+    if (result == 0)
+        Py_RETURN_NONE;
+
+    if (async_err)
+        return NULL;
+
+    errno = result;
+    return posix_error();
 }
 #endif /* HAVE_POSIX_FADVISE && !POSIX_FADVISE_AIX_BUG */
 


From webhook-mailer at python.org  Mon Aug 14 14:39:49 2017
From: webhook-mailer at python.org (R. David Murray)
Date: Mon, 14 Aug 2017 18:39:49 -0000
Subject: [Python-checkins] bpo-30824: Add mimetype for .json (#3048)
Message-ID: <mailman.4.1502735991.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/8204b903683f9e0f037ccfaa87622716019914d7
commit: 8204b903683f9e0f037ccfaa87622716019914d7
branch: master
author: Nate Tangsurat <e4r7hbug at gmail.com>
committer: R. David Murray <rdmurray at bitdance.com>
date: 2017-08-14T14:39:45-04:00
summary:

bpo-30824: Add mimetype for .json (#3048)

files:
M Lib/mimetypes.py

diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index 3d686948645..5919b45a9b4 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -439,6 +439,7 @@ def _default_mime_types():
         '.jpeg'   : 'image/jpeg',
         '.jpg'    : 'image/jpeg',
         '.js'     : 'application/javascript',
+        '.json'   : 'application/json',
         '.ksh'    : 'text/plain',
         '.latex'  : 'application/x-latex',
         '.m1v'    : 'video/mpeg',


From webhook-mailer at python.org  Mon Aug 14 14:54:56 2017
From: webhook-mailer at python.org (Mariatta)
Date: Mon, 14 Aug 2017 18:54:56 -0000
Subject: [Python-checkins] bpo-31191: Improve grammar in threading.Barrier
 docs (GH-3080)
Message-ID: <mailman.5.1502736898.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/143be366295038b36fc32c44b8e1b48a375eab56
commit: 143be366295038b36fc32c44b8e1b48a375eab56
branch: master
author: Saurabh Chaturvedi <saurabh.chaturvedi63 at gmail.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-08-14T11:54:53-07:00
summary:

bpo-31191: Improve grammar in threading.Barrier docs (GH-3080)

files:
M Doc/library/threading.rst

diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index cda859fe4cb..021e29e7124 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -875,8 +875,8 @@ Barrier Objects
 This class provides a simple synchronization primitive for use by a fixed number
 of threads that need to wait for each other.  Each of the threads tries to pass
 the barrier by calling the :meth:`~Barrier.wait` method and will block until
-all of the threads have made the call.  At this points, the threads are released
-simultaneously.
+all of the threads have made their :meth:`~Barrier.wait` calls. At this point,
+the threads are released simultaneously.
 
 The barrier can be reused any number of times for the same number of threads.
 


From webhook-mailer at python.org  Mon Aug 14 18:14:20 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Mon, 14 Aug 2017 22:14:20 -0000
Subject: [Python-checkins] bpo-30983: eval frame rename in pep 0523 broke
 gdb's python extension (#2803)
Message-ID: <mailman.6.1502748861.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/2e0f4db114424a00354eab889ba8f7334a2ab8f0
commit: 2e0f4db114424a00354eab889ba8f7334a2ab8f0
branch: master
author: Bruno "Polaco" Penteado <polaco at gmail.com>
committer: ?ukasz Langa <lukasz at langa.pl>
date: 2017-08-14T15:14:17-07:00
summary:

bpo-30983: eval frame rename in pep 0523 broke gdb's python extension (#2803)

pep 0523 renames PyEval_EvalFrameEx to _PyEval_EvalFrameDefault while the gdb python extension only looks for PyEval_EvalFrameEx to understand if it is dealing with a frame.

Final effect is that attaching gdb to a python3.6 process doesnt resolve python objects. Eg. py-list and py-bt dont work properly.

This patch fixes that. Tested locally on python3.6

files:
M Tools/gdb/libpython.py

diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index cc23b8402df..7c8874a7ace 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -1502,8 +1502,10 @@ def is_python_frame(self):
         return False
 
     def is_evalframeex(self):
-        '''Is this a PyEval_EvalFrameEx frame?'''
-        if self._gdbframe.name() == 'PyEval_EvalFrameEx':
+        '''Is this a PyEval_EvalFrameEx or _PyEval_EvalFrameDefault (PEP 0523)
+        frame?'''
+        if self._gdbframe.name() in ('PyEval_EvalFrameEx',
+                                     '_PyEval_EvalFrameDefault'):
             '''
             I believe we also need to filter on the inline
             struct frame_id.inline_depth, only regarding frames with


From webhook-mailer at python.org  Mon Aug 14 18:43:45 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Mon, 14 Aug 2017 22:43:45 -0000
Subject: [Python-checkins] Add Bruno Penteado to ACKS (#3091)
Message-ID: <mailman.7.1502750626.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/f978405b3f092e4005b92ba1dbaab15f609b3bb0
commit: f978405b3f092e4005b92ba1dbaab15f609b3bb0
branch: master
author: ?ukasz Langa <lukasz at langa.pl>
committer: GitHub <noreply at github.com>
date: 2017-08-14T15:43:42-07:00
summary:

Add Bruno Penteado to ACKS (#3091)

files:
M Misc/ACKS

diff --git a/Misc/ACKS b/Misc/ACKS
index 6fc41b36b59..c55d09ac67c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1184,6 +1184,7 @@ Berker Peksag
 Andreas Pelme
 Steven Pemberton
 Bo Peng
+Bruno "Polaco" Penteado
 Santiago Peres?n
 George Peristerakis
 Thomas Perl


From webhook-mailer at python.org  Mon Aug 14 19:06:31 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Mon, 14 Aug 2017 23:06:31 -0000
Subject: [Python-checkins] [3.6] bpo-30983: eval frame rename in pep 0523
 broke gdb's python extension (GH-2803) (#3090)
Message-ID: <mailman.8.1502751993.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/09b77165e3fffa7b7ff160ad06042cdcfa004bf5
commit: 09b77165e3fffa7b7ff160ad06042cdcfa004bf5
branch: 3.6
author: ?ukasz Langa <lukasz at langa.pl>
committer: GitHub <noreply at github.com>
date: 2017-08-14T16:06:28-07:00
summary:

[3.6] bpo-30983: eval frame rename in pep 0523 broke gdb's python extension (GH-2803) (#3090)

pep 0523 renames PyEval_EvalFrameEx to _PyEval_EvalFrameDefault while the gdb python extension only looks for PyEval_EvalFrameEx to understand if it is dealing with a frame.

Final effect is that attaching gdb to a python3.6 process doesnt resolve python objects. Eg. py-list and py-bt dont work properly.

This patch fixes that. Tested locally on python3.6
(cherry picked from commit 2e0f4db114)

files:
A Misc/NEWS.d/next/Tools-Demos/2017-08-14-15-37-38.bpo-30983.A7UzX8.rst
M Tools/gdb/libpython.py

diff --git a/Misc/NEWS.d/next/Tools-Demos/2017-08-14-15-37-38.bpo-30983.A7UzX8.rst b/Misc/NEWS.d/next/Tools-Demos/2017-08-14-15-37-38.bpo-30983.A7UzX8.rst
new file mode 100644
index 00000000000..44c5e1c6967
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2017-08-14-15-37-38.bpo-30983.A7UzX8.rst
@@ -0,0 +1,4 @@
+With PEP 523, gdb's Python integration stopped working properly for frames
+using the ``_PyEval_EvalFrameDefault`` function.  Affected functionality
+included `py-list` and `py-bt`.  This is now fixed.  Patch by Bruno "Polaco"
+Penteado.
diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index 31ae8117c78..40e0a677cd0 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -1502,8 +1502,10 @@ def is_python_frame(self):
         return False
 
     def is_evalframeex(self):
-        '''Is this a PyEval_EvalFrameEx frame?'''
-        if self._gdbframe.name() == 'PyEval_EvalFrameEx':
+        '''Is this a PyEval_EvalFrameEx or _PyEval_EvalFrameDefault (PEP 0523)
+        frame?'''
+        if self._gdbframe.name() in ('PyEval_EvalFrameEx',
+                                     '_PyEval_EvalFrameDefault'):
             '''
             I believe we also need to filter on the inline
             struct frame_id.inline_depth, only regarding frames with


From lp_benchmark_robot at intel.com  Mon Aug 14 20:48:46 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Mon, 14 Aug 2017 17:48:46 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-14
Message-ID: <091720d7-38d6-4c96-b0a7-348b482442b3@orsmsx107.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-14 03:03:53-07:00.
  - commit:		48d9823
  - previous commit:	dadca48
  - revision date:	2017-08-12 17:37:09+02:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.171% |  -0.154%   |  +4.210%   |  +8.254%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 2.117% |  -0.318%   |  +21.455%  |  +10.257%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 1.847% |  -0.598%   |  +23.709%  |  +9.927%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.885% |  +0.100%   |  +21.124%  |  +8.076%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 1.436% |  +0.845%   |  +2.928%   |  +13.847%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 2.455% |  -0.270%   |  +10.982%  |  +9.757%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.886% |  +0.175%   |  +6.095%   |  +11.640%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.785% |  -0.325%   |  +4.197%   |  +5.437%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.538% |  -1.122%   |  +5.659%   |  +20.197%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.849% |  -0.639%   |  +9.342%   |  +13.914%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 2.034% |  -0.415%   |  +4.177%   |  +6.989%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.497% |  -0.559%   |  +4.543%   |  +5.528%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.703% |  -0.038%   |  +2.992%   |  +6.065%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.222% |  +0.220%   |  +9.090%   |  +10.725%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.749% |  -0.171%   |  +7.329%   |  +9.693%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.842% |  +0.288%   |  +6.219%   |  +10.837%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.511% |  -0.175%   |  +9.036%   |  +11.862%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.455% |  +0.492%   |  +8.449%   |  +10.749%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.528% |  -0.077%   |  +4.516%   |  +9.472%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 3.144% |  -0.205%   |  +2.878%   |  +9.798%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.667% |  +0.274%   |  +8.933%   |  +12.458%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.766% |  +0.356%   |  +47.284%  |  +10.056%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.468% |  +0.167%   |  +10.241%  |  +12.760%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 1.258% |  -0.241%   |  +18.632%  |  +12.121%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 6.578% |  -1.165%   |  +5.368%   |  +14.562%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 3.524% |  +0.959%   |  +4.648%   |  +4.878%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.384% |  +0.020%   |  -1.899%   |  -0.451%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 2.728% |  -0.759%   |  +1.813%   |  +9.265%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.466% |  -0.355%   |  +4.664%   |  +9.816%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 2.296% |  +0.032%   |  +0.848%   |  +22.215%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.503% |  +0.033%   |  +2.494%   |  +19.753%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.956% |  -0.030%   |  +5.217%   |  +18.827%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.616% |  +1.049%   |  +12.169%  |  +9.986%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.162% |  +0.011%   |  +0.301%   |  +9.529%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.125% |  -0.081%   |  +9.002%   |  +4.741%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.090% |  -0.083%   |  +1.052%   |  +4.559%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.182% |  -0.185%   |  +9.334%   |  +13.413%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.936% |  +0.278%   |  -10.042%  |  +13.606%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 1.089% |  +0.080%   |  +1.436%   |  +9.348%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.104% |  +0.332%   |  +0.824%   |  +3.156%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 0.857% |  -0.116%   |  +11.336%  |  +3.485%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.473% |  +0.582%   |  +8.064%   |  +13.323%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.354% |  +0.615%   |  +0.896%   |  +1.460%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.289% |  +0.288%   |  +27.084%  |  +8.934%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.329% |  +0.325%   |  +3.213%   |  +7.817%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.727% |  +0.036%   |  +13.189%  |  +9.197%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 2.874% |  -0.029%   |  -0.771%   |  -0.617%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.393% |  +0.135%   |  +5.721%   |  +0.153%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.349% |  +0.010%   |  +5.413%   |  +8.464%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.664% |  +0.437%   |  +6.014%   |  +4.499%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.342% |  -0.874%   |  +3.074%   |  +7.336%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.147% |  -0.510%   |  +12.405%  |  +8.356%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.493% |  -0.128%   |  +10.377%  |  +6.471%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.900% |  -0.711%   |  +12.006%  |  +9.458%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.549% |  -0.284%   |  +13.631%  |  +9.223%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 4.230% |  -0.102%   |  +23.480%  |  +9.544%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.117% |  +0.060%   |  +5.965%   |  +5.409%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.371% |  -0.008%   |  +0.627%   |  +0.268%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 9.273% |  +1.941%   |  +7.814%   |  +20.261%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 1.605% |  +0.190%   |  -3.436%   |  +17.826%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 0.946% |  -0.129%   |  +7.205%   |  +6.335%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.227% |  +0.119%   |  +5.770%   |  +8.755%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.208% |  +0.666%   |  +2.453%   |  +5.665%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 1.454% |  +0.979%   |  -5.294%   |  +9.941%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.369% |  -0.022%   |  +6.520%   |  +8.903%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-14

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Mon Aug 14 21:21:49 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Tue, 15 Aug 2017 01:21:49 -0000
Subject: [Python-checkins] bpo-31002: IDLE: Add tests for configdialog keys
 tab (#2996)
Message-ID: <mailman.9.1502760110.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/2f8964634918bdf09107c49a2d5ca62460091e54
commit: 2f8964634918bdf09107c49a2d5ca62460091e54
branch: master
author: Cheryl Sabella <cheryl.sabella at gmail.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-08-14T21:21:43-04:00
summary:

bpo-31002: IDLE: Add tests for configdialog keys tab (#2996)

Patch by Cheryl Sabella.

files:
A Misc/NEWS.d/next/IDLE/2017-08-03-17-54-02.bpo-31002.kUSgTE.rst
M Lib/idlelib/configdialog.py
M Lib/idlelib/idle_test/test_configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 63172371a5e..66219f1820e 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -251,25 +251,24 @@ def create_page_highlight(self):
             delete_custom_theme: Ativate default [button_delete_custom_theme].
             save_new_theme: Save to userCfg['theme'] (is function).
 
-        Widget Structure:  (*) widgets bound to self
-            frame
-                frame_custom: LabelFrame
-                    (*)highlight_sample: Text
-                    (*)frame_color_set: Frame
-                        button_set_color: Button
-                        (*)opt_menu_highlight_target: DynOptionMenu - highlight_target
-                    frame_fg_bg_toggle: Frame
-                        (*)radio_fg: Radiobutton - fg_bg_toggle
-                        (*)radio_bg: Radiobutton - fg_bg_toggle
-                    button_save_custom_theme: Button
-                frame_theme: LabelFrame
-                    theme_type_title: Label
-                    (*)radio_theme_builtin: Radiobutton - is_builtin_theme
-                    (*)radio_theme_custom: Radiobutton - is_builtin_theme
-                    (*)opt_menu_theme_builtin: DynOptionMenu - builtin_theme
-                    (*)opt_menu_theme_custom: DynOptionMenu - custom_theme
-                    (*)button_delete_custom_theme: Button
-                    (*)new_custom_theme: Label
+        Widgets of highlights page frame:  (*) widgets bound to self
+            frame_custom: LabelFrame
+                (*)highlight_sample: Text
+                (*)frame_color_set: Frame
+                    button_set_color: Button
+                    (*)opt_menu_highlight_target: DynOptionMenu - highlight_target
+                frame_fg_bg_toggle: Frame
+                    (*)radio_fg: Radiobutton - fg_bg_toggle
+                    (*)radio_bg: Radiobutton - fg_bg_toggle
+                button_save_custom_theme: Button
+            frame_theme: LabelFrame
+                theme_type_title: Label
+                (*)radio_theme_builtin: Radiobutton - is_builtin_theme
+                (*)radio_theme_custom: Radiobutton - is_builtin_theme
+                (*)opt_menu_theme_builtin: DynOptionMenu - builtin_theme
+                (*)opt_menu_theme_custom: DynOptionMenu - custom_theme
+                (*)button_delete_custom_theme: Button
+                (*)new_custom_theme: Label
         """
         self.theme_elements={
             'Normal Text': ('normal', '00'),
@@ -796,52 +795,92 @@ def delete_custom_theme(self):
     def create_page_keys(self):
         """Return frame of widgets for Keys tab.
 
+        Enable users to provisionally change both individual and sets of
+        keybindings (shortcut keys). Except for features implemented as
+        extensions, keybindings are stored in complete sets called
+        keysets. Built-in keysets in idlelib/config-keys.def are fixed
+        as far as the dialog is concerned. Any keyset can be used as the
+        base for a new custom keyset, stored in .idlerc/config-keys.cfg.
+
+        Function load_key_cfg() initializes tk variables and keyset
+        lists and calls load_keys_list for the current keyset.
+        Radiobuttons builtin_keyset_on and custom_keyset_on toggle var
+        keyset_source, which controls if the current set of keybindings
+        are from a builtin or custom keyset. DynOptionMenus builtinlist
+        and customlist contain lists of the builtin and custom keysets,
+        respectively, and the current item from each list is stored in
+        vars builtin_name and custom_name.
+
+        Button delete_custom_keys invokes delete_custom_keys() to delete
+        a custom keyset from idleConf.userCfg['keys'] and changes.  Button
+        save_custom_keys invokes save_as_new_key_set() which calls
+        get_new_keys_name() and create_new_key_set() to save a custom keyset
+        and its keybindings to idleConf.userCfg['keys'].
+
+        Listbox bindingslist contains all of the keybindings for the
+        selected keyset.  The keybindings are loaded in load_keys_list()
+        and are pairs of (event, [keys]) where keys can be a list
+        of one or more key combinations to bind to the same event.
+        Mouse button 1 click invokes on_bindingslist_select(), which
+        allows button_new_keys to be clicked.
+
+        So, an item is selected in listbindings, which activates
+        button_new_keys, and clicking button_new_keys calls function
+        get_new_keys().  Function get_new_keys() gets the key mappings from the
+        current keyset for the binding event item that was selected.  The
+        function then displays another dialog, GetKeysDialog, with the
+        selected binding event and current keys and always new key sequences
+        to be entered for that binding event.  If the keys aren't
+        changed, nothing happens.  If the keys are changed and the keyset
+        is a builtin, function get_new_keys_name() will be called
+        for input of a custom keyset name.  If no name is given, then the
+        change to the keybinding will abort and no updates will be made.  If
+        a custom name is entered in the prompt or if the current keyset was
+        already custom (and thus didn't require a prompt), then
+        idleConf.userCfg['keys'] is updated in function create_new_key_set()
+        with the change to the event binding.  The item listing in bindingslist
+        is updated with the new keys.  Var keybinding is also set which invokes
+        the callback function, var_changed_keybinding, to add the change to
+        the 'keys' or 'extensions' changes tracker based on the binding type.
+
         Tk Variables:
-            builtin_keys: Menu variable for built-in keybindings.
-            custom_keys: Menu variable for custom keybindings.
-            are_keys_builtin: Selector for built-in or custom keybindings.
             keybinding: Action/key bindings.
 
         Methods:
-            load_key_config: Set table.
             load_keys_list: Reload active set.
-            keybinding_selected: Bound to list_bindings button release.
-            get_new_keys: Command for button_new_keys.
-            get_new_keys_name: Call popup.
             create_new_key_set: Combine active keyset and changes.
-            set_keys_type: Command for are_keys_builtin.
-            delete_custom_keys: Command for button_delete_custom_keys.
-            save_as_new_key_set: Command for button_save_custom_keys.
+            set_keys_type: Command for keyset_source.
             save_new_key_set: Save to idleConf.userCfg['keys'] (is function).
             deactivate_current_config: Remove keys bindings in editors.
 
-        Widget Structure:  (*) widgets bound to self
-            frame
-                frame_custom: LabelFrame
-                    frame_target: Frame
-                        target_title: Label
-                        scroll_target_y: Scrollbar
-                        scroll_target_x: Scrollbar
-                        (*)list_bindings: ListBox
-                        (*)button_new_keys: Button
-                frame_key_sets: LabelFrame
-                    frames[0]: Frame
-                        (*)radio_keys_builtin: Radiobutton - are_keys_builtin
-                        (*)radio_keys_custom: Radiobutton - are_keys_builtin
-                        (*)opt_menu_keys_builtin: DynOptionMenu - builtin_keys
-                        (*)opt_menu_keys_custom: DynOptionMenu - custom_keys
-                        (*)new_custom_keys: Label
-                    frames[1]: Frame
-                        (*)button_delete_custom_keys: Button
-                        button_save_custom_keys: Button
+        Widgets for keys page frame:  (*) widgets bound to self
+            frame_key_sets: LabelFrame
+                frames[0]: Frame
+                    (*)builtin_keyset_on: Radiobutton - var keyset_source
+                    (*)custom_keyset_on: Radiobutton - var keyset_source
+                    (*)builtinlist: DynOptionMenu - var builtin_name,
+                            func keybinding_selected
+                    (*)customlist: DynOptionMenu - var custom_name,
+                            func keybinding_selected
+                    (*)keys_message: Label
+                frames[1]: Frame
+                    (*)button_delete_custom_keys: Button - delete_custom_keys
+                    (*)button_save_custom_keys: Button -  save_as_new_key_set
+            frame_custom: LabelFrame
+                frame_target: Frame
+                    target_title: Label
+                    scroll_target_y: Scrollbar
+                    scroll_target_x: Scrollbar
+                    (*)bindingslist: ListBox - on_bindingslist_select
+                    (*)button_new_keys: Button - get_new_keys & ..._name
         """
         parent = self.parent
-        self.builtin_keys = tracers.add(
-                StringVar(parent), self.var_changed_builtin_keys)
-        self.custom_keys = tracers.add(
-                StringVar(parent), self.var_changed_custom_keys)
-        self.are_keys_builtin = tracers.add(
-                BooleanVar(parent), self.var_changed_are_keys_builtin)
+        self.builtin_name = tracers.add(
+                StringVar(parent), self.var_changed_builtin_name)
+        self.custom_name = tracers.add(
+                StringVar(parent), self.var_changed_custom_name)
+        self.keyset_source = tracers.add(
+                BooleanVar(parent), self.var_changed_keyset_source)
         self.keybinding = tracers.add(
                 StringVar(parent), self.var_changed_keybinding)
 
@@ -858,36 +897,37 @@ def create_page_keys(self):
         target_title = Label(frame_target, text='Action - Key(s)')
         scroll_target_y = Scrollbar(frame_target)
         scroll_target_x = Scrollbar(frame_target, orient=HORIZONTAL)
-        self.list_bindings = Listbox(
+        self.bindingslist = Listbox(
                 frame_target, takefocus=FALSE, exportselection=FALSE)
-        self.list_bindings.bind('<ButtonRelease-1>', self.keybinding_selected)
-        scroll_target_y.config(command=self.list_bindings.yview)
-        scroll_target_x.config(command=self.list_bindings.xview)
-        self.list_bindings.config(yscrollcommand=scroll_target_y.set)
-        self.list_bindings.config(xscrollcommand=scroll_target_x.set)
+        self.bindingslist.bind('<ButtonRelease-1>',
+                               self.on_bindingslist_select)
+        scroll_target_y['command'] = self.bindingslist.yview
+        scroll_target_x['command'] = self.bindingslist.xview
+        self.bindingslist['yscrollcommand'] = scroll_target_y.set
+        self.bindingslist['xscrollcommand'] = scroll_target_x.set
         self.button_new_keys = Button(
                 frame_custom, text='Get New Keys for Selection',
                 command=self.get_new_keys, state=DISABLED)
         #frame_key_sets
         frames = [Frame(frame_key_sets, padx=2, pady=2, borderwidth=0)
                   for i in range(2)]
-        self.radio_keys_builtin = Radiobutton(
-                frames[0], variable=self.are_keys_builtin, value=1,
+        self.builtin_keyset_on = Radiobutton(
+                frames[0], variable=self.keyset_source, value=1,
                 command=self.set_keys_type, text='Use a Built-in Key Set')
-        self.radio_keys_custom = Radiobutton(
-                frames[0], variable=self.are_keys_builtin,  value=0,
+        self.custom_keyset_on = Radiobutton(
+                frames[0], variable=self.keyset_source, value=0,
                 command=self.set_keys_type, text='Use a Custom Key Set')
-        self.opt_menu_keys_builtin = DynOptionMenu(
-                frames[0], self.builtin_keys, None, command=None)
-        self.opt_menu_keys_custom = DynOptionMenu(
-                frames[0], self.custom_keys, None, command=None)
+        self.builtinlist = DynOptionMenu(
+                frames[0], self.builtin_name, None, command=None)
+        self.customlist = DynOptionMenu(
+                frames[0], self.custom_name, None, command=None)
         self.button_delete_custom_keys = Button(
                 frames[1], text='Delete Custom Key Set',
                 command=self.delete_custom_keys)
-        button_save_custom_keys = Button(
+        self.button_save_custom_keys = Button(
                 frames[1], text='Save as New Custom Key Set',
                 command=self.save_as_new_key_set)
-        self.new_custom_keys = Label(frames[0], bd=2)
+        self.keys_message = Label(frames[0], bd=2)
 
         ##widget packing
         #body
@@ -900,17 +940,17 @@ def create_page_keys(self):
         frame_target.columnconfigure(0, weight=1)
         frame_target.rowconfigure(1, weight=1)
         target_title.grid(row=0, column=0, columnspan=2, sticky=W)
-        self.list_bindings.grid(row=1, column=0, sticky=NSEW)
+        self.bindingslist.grid(row=1, column=0, sticky=NSEW)
         scroll_target_y.grid(row=1, column=1, sticky=NS)
         scroll_target_x.grid(row=2, column=0, sticky=EW)
         #frame_key_sets
-        self.radio_keys_builtin.grid(row=0, column=0, sticky=W+NS)
-        self.radio_keys_custom.grid(row=1, column=0, sticky=W+NS)
-        self.opt_menu_keys_builtin.grid(row=0, column=1, sticky=NSEW)
-        self.opt_menu_keys_custom.grid(row=1, column=1, sticky=NSEW)
-        self.new_custom_keys.grid(row=0, column=2, sticky=NSEW, padx=5, pady=5)
+        self.builtin_keyset_on.grid(row=0, column=0, sticky=W+NS)
+        self.custom_keyset_on.grid(row=1, column=0, sticky=W+NS)
+        self.builtinlist.grid(row=0, column=1, sticky=NSEW)
+        self.customlist.grid(row=1, column=1, sticky=NSEW)
+        self.keys_message.grid(row=0, column=2, sticky=NSEW, padx=5, pady=5)
         self.button_delete_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
-        button_save_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
+        self.button_save_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
         frames[0].pack(side=TOP, fill=BOTH, expand=True)
         frames[1].pack(side=TOP, fill=X, expand=True, pady=2)
         return frame
@@ -918,35 +958,35 @@ def create_page_keys(self):
     def load_key_cfg(self):
         "Load current configuration settings for the keybinding options."
         # Set current keys type radiobutton.
-        self.are_keys_builtin.set(idleConf.GetOption(
+        self.keyset_source.set(idleConf.GetOption(
                 'main', 'Keys', 'default', type='bool', default=1))
         # Set current keys.
         current_option = idleConf.CurrentKeys()
         # Load available keyset option menus.
-        if self.are_keys_builtin.get():  # Default theme selected.
+        if self.keyset_source.get():  # Default theme selected.
             item_list = idleConf.GetSectionList('default', 'keys')
             item_list.sort()
-            self.opt_menu_keys_builtin.SetMenu(item_list, current_option)
+            self.builtinlist.SetMenu(item_list, current_option)
             item_list = idleConf.GetSectionList('user', 'keys')
             item_list.sort()
             if not item_list:
-                self.radio_keys_custom['state'] = DISABLED
-                self.custom_keys.set('- no custom keys -')
+                self.custom_keyset_on['state'] = DISABLED
+                self.custom_name.set('- no custom keys -')
             else:
-                self.opt_menu_keys_custom.SetMenu(item_list, item_list[0])
+                self.customlist.SetMenu(item_list, item_list[0])
         else:  # User key set selected.
             item_list = idleConf.GetSectionList('user', 'keys')
             item_list.sort()
-            self.opt_menu_keys_custom.SetMenu(item_list, current_option)
+            self.customlist.SetMenu(item_list, current_option)
             item_list = idleConf.GetSectionList('default', 'keys')
             item_list.sort()
-            self.opt_menu_keys_builtin.SetMenu(item_list, idleConf.default_keys())
+            self.builtinlist.SetMenu(item_list, idleConf.default_keys())
         self.set_keys_type()
         # Load keyset element list.
         keyset_name = idleConf.CurrentKeys()
         self.load_keys_list(keyset_name)
 
-    def var_changed_builtin_keys(self, *params):
+    def var_changed_builtin_name(self, *params):
         "Process selection of builtin key set."
         old_keys = (
             'IDLE Classic Windows',
@@ -954,40 +994,41 @@ def var_changed_builtin_keys(self, *params):
             'IDLE Classic Mac',
             'IDLE Classic OSX',
         )
-        value = self.builtin_keys.get()
+        value = self.builtin_name.get()
         if value not in old_keys:
             if idleConf.GetOption('main', 'Keys', 'name') not in old_keys:
                 changes.add_option('main', 'Keys', 'name', old_keys[0])
             changes.add_option('main', 'Keys', 'name2', value)
-            self.new_custom_keys.config(text='New key set, see Help',
-                                        fg='#500000')
+            self.keys_message['text'] = 'New key set, see Help'
+            self.keys_message['fg'] = '#500000'
         else:
             changes.add_option('main', 'Keys', 'name', value)
             changes.add_option('main', 'Keys', 'name2', '')
-            self.new_custom_keys.config(text='', fg='black')
+            self.keys_message['text'] = ''
+            self.keys_message['fg'] = 'black'
         self.load_keys_list(value)
 
-    def var_changed_custom_keys(self, *params):
+    def var_changed_custom_name(self, *params):
         "Process selection of custom key set."
-        value = self.custom_keys.get()
+        value = self.custom_name.get()
         if value != '- no custom keys -':
             changes.add_option('main', 'Keys', 'name', value)
             self.load_keys_list(value)
 
-    def var_changed_are_keys_builtin(self, *params):
+    def var_changed_keyset_source(self, *params):
         "Process toggle between builtin key set and custom key set."
-        value = self.are_keys_builtin.get()
+        value = self.keyset_source.get()
         changes.add_option('main', 'Keys', 'default', value)
         if value:
-            self.var_changed_builtin_keys()
+            self.var_changed_builtin_name()
         else:
-            self.var_changed_custom_keys()
+            self.var_changed_custom_name()
 
     def var_changed_keybinding(self, *params):
         "Store change to a keybinding."
         value = self.keybinding.get()
-        key_set = self.custom_keys.get()
-        event = self.list_bindings.get(ANCHOR).split()[0]
+        key_set = self.custom_name.get()
+        event = self.bindingslist.get(ANCHOR).split()[0]
         if idleConf.IsCoreBinding(event):
             changes.add_option('keys', key_set, event, value)
         else:  # Event is an extension binding.
@@ -997,14 +1038,14 @@ def var_changed_keybinding(self, *params):
 
     def set_keys_type(self):
         "Set available screen options based on builtin or custom key set."
-        if self.are_keys_builtin.get():
-            self.opt_menu_keys_builtin['state'] = NORMAL
-            self.opt_menu_keys_custom['state'] = DISABLED
+        if self.keyset_source.get():
+            self.builtinlist['state'] = NORMAL
+            self.customlist['state'] = DISABLED
             self.button_delete_custom_keys['state'] = DISABLED
         else:
-            self.opt_menu_keys_builtin['state'] = DISABLED
-            self.radio_keys_custom['state'] = NORMAL
-            self.opt_menu_keys_custom['state'] = NORMAL
+            self.builtinlist['state'] = DISABLED
+            self.custom_keyset_on['state'] = NORMAL
+            self.customlist['state'] = NORMAL
             self.button_delete_custom_keys['state'] = NORMAL
 
     def get_new_keys(self):
@@ -1016,13 +1057,13 @@ def get_new_keys(self):
         changed, then a name for a custom key set needs to be
         entered for the change to be applied.
         """
-        list_index = self.list_bindings.index(ANCHOR)
-        binding = self.list_bindings.get(list_index)
+        list_index = self.bindingslist.index(ANCHOR)
+        binding = self.bindingslist.get(list_index)
         bind_name = binding.split()[0]
-        if self.are_keys_builtin.get():
-            current_key_set_name = self.builtin_keys.get()
+        if self.keyset_source.get():
+            current_key_set_name = self.builtin_name.get()
         else:
-            current_key_set_name = self.custom_keys.get()
+            current_key_set_name = self.custom_name.get()
         current_bindings = idleConf.GetCurrentKeySet()
         if current_key_set_name in changes['keys']:  # unsaved changes
             key_set_changes = changes['keys'][current_key_set_name]
@@ -1032,24 +1073,24 @@ def get_new_keys(self):
         new_keys = GetKeysDialog(self, 'Get New Keys', bind_name,
                 current_key_sequences).result
         if new_keys:
-            if self.are_keys_builtin.get():  # Current key set is a built-in.
+            if self.keyset_source.get():  # Current key set is a built-in.
                 message = ('Your changes will be saved as a new Custom Key Set.'
                            ' Enter a name for your new Custom Key Set below.')
                 new_keyset = self.get_new_keys_name(message)
                 if not new_keyset:  # User cancelled custom key set creation.
-                    self.list_bindings.select_set(list_index)
-                    self.list_bindings.select_anchor(list_index)
+                    self.bindingslist.select_set(list_index)
+                    self.bindingslist.select_anchor(list_index)
                     return
                 else:  # Create new custom key set based on previously active key set.
                     self.create_new_key_set(new_keyset)
-            self.list_bindings.delete(list_index)
-            self.list_bindings.insert(list_index, bind_name+' - '+new_keys)
-            self.list_bindings.select_set(list_index)
-            self.list_bindings.select_anchor(list_index)
+            self.bindingslist.delete(list_index)
+            self.bindingslist.insert(list_index, bind_name+' - '+new_keys)
+            self.bindingslist.select_set(list_index)
+            self.bindingslist.select_anchor(list_index)
             self.keybinding.set(new_keys)
         else:
-            self.list_bindings.select_set(list_index)
-            self.list_bindings.select_anchor(list_index)
+            self.bindingslist.select_set(list_index)
+            self.bindingslist.select_anchor(list_index)
 
     def get_new_keys_name(self, message):
         "Return new key set name from query popup."
@@ -1065,21 +1106,20 @@ def save_as_new_key_set(self):
         if new_keys_name:
             self.create_new_key_set(new_keys_name)
 
-    def keybinding_selected(self, event):
+    def on_bindingslist_select(self, event):
         "Activate button to assign new keys to selected action."
         self.button_new_keys['state'] = NORMAL
 
     def create_new_key_set(self, new_key_set_name):
         """Create a new custom key set with the given name.
 
-        Create the new key set based on the previously active set
-        with the current changes applied.  Once it is saved, then
-        activate the new key set.
+        Copy the bindings/keys from the previously active keyset
+        to the new keyset and activate the new custom keyset.
         """
-        if self.are_keys_builtin.get():
-            prev_key_set_name = self.builtin_keys.get()
+        if self.keyset_source.get():
+            prev_key_set_name = self.builtin_name.get()
         else:
-            prev_key_set_name = self.custom_keys.get()
+            prev_key_set_name = self.custom_name.get()
         prev_keys = idleConf.GetCoreKeys(prev_key_set_name)
         new_keys = {}
         for event in prev_keys:  # Add key set to changed items.
@@ -1096,8 +1136,8 @@ def create_new_key_set(self, new_key_set_name):
         # Change GUI over to the new key set.
         custom_key_list = idleConf.GetSectionList('user', 'keys')
         custom_key_list.sort()
-        self.opt_menu_keys_custom.SetMenu(custom_key_list, new_key_set_name)
-        self.are_keys_builtin.set(0)
+        self.customlist.SetMenu(custom_key_list, new_key_set_name)
+        self.keyset_source.set(0)
         self.set_keys_type()
 
     def load_keys_list(self, keyset_name):
@@ -1105,14 +1145,14 @@ def load_keys_list(self, keyset_name):
 
         An action/key binding can be selected to change the key binding.
         """
-        reselect = 0
-        if self.list_bindings.curselection():
-            reselect = 1
-            list_index = self.list_bindings.index(ANCHOR)
+        reselect = False
+        if self.bindingslist.curselection():
+            reselect = True
+            list_index = self.bindingslist.index(ANCHOR)
         keyset = idleConf.GetKeySet(keyset_name)
         bind_names = list(keyset.keys())
         bind_names.sort()
-        self.list_bindings.delete(0, END)
+        self.bindingslist.delete(0, END)
         for bind_name in bind_names:
             key = ' '.join(keyset[bind_name])
             bind_name = bind_name[2:-2]  # Trim off the angle brackets.
@@ -1120,17 +1160,21 @@ def load_keys_list(self, keyset_name):
                 # Handle any unsaved changes to this key set.
                 if bind_name in changes['keys'][keyset_name]:
                     key = changes['keys'][keyset_name][bind_name]
-            self.list_bindings.insert(END, bind_name+' - '+key)
+            self.bindingslist.insert(END, bind_name+' - '+key)
         if reselect:
-            self.list_bindings.see(list_index)
-            self.list_bindings.select_set(list_index)
-            self.list_bindings.select_anchor(list_index)
+            self.bindingslist.see(list_index)
+            self.bindingslist.select_set(list_index)
+            self.bindingslist.select_anchor(list_index)
 
     def save_new_key_set(self, keyset_name, keyset):
         """Save a newly created core key set.
 
+        Add keyset to idleConf.userCfg['keys'], not to disk.
+        If the keyset doesn't exist, it is created.  The
+        binding/keys are taken from the keyset argument.
+
         keyset_name - string, the name of the new key set
-        keyset - dictionary containing the new key set
+        keyset - dictionary containing the new keybindings
         """
         if not idleConf.userCfg['keys'].has_section(keyset_name):
             idleConf.userCfg['keys'].add_section(keyset_name)
@@ -1145,7 +1189,7 @@ def delete_custom_keys(self):
         reverts to the default.  The custom key set is permanently
         deleted from the config file.
         """
-        keyset_name=self.custom_keys.get()
+        keyset_name=self.custom_name.get()
         delmsg = 'Are you sure you wish to delete the key set %r ?'
         if not tkMessageBox.askyesno(
                 'Delete Key Set',  delmsg % keyset_name, parent=self):
@@ -1157,14 +1201,14 @@ def delete_custom_keys(self):
         item_list = idleConf.GetSectionList('user', 'keys')
         item_list.sort()
         if not item_list:
-            self.radio_keys_custom['state'] = DISABLED
-            self.opt_menu_keys_custom.SetMenu(item_list, '- no custom keys -')
+            self.custom_keyset_on['state'] = DISABLED
+            self.customlist.SetMenu(item_list, '- no custom keys -')
         else:
-            self.opt_menu_keys_custom.SetMenu(item_list, item_list[0])
+            self.customlist.SetMenu(item_list, item_list[0])
         # Revert to default key set.
-        self.are_keys_builtin.set(idleConf.defaultCfg['main']
+        self.keyset_source.set(idleConf.defaultCfg['main']
                                 .Get('Keys', 'default'))
-        self.builtin_keys.set(idleConf.defaultCfg['main'].Get('Keys', 'name')
+        self.builtin_name.set(idleConf.defaultCfg['main'].Get('Keys', 'name')
                              or idleConf.default_keys())
         # User can't back out of these changes, they must be applied now.
         changes.save_all()
@@ -1438,22 +1482,21 @@ def create_page_font_tab(self):
         which invokes the default callback to add an entry to
         changes.  Load_tab_cfg initializes space_num to default.
 
-        Widget Structure:  (*) widgets bound to self
-            frame (of tab_pages)
-                frame_font: LabelFrame
-                    frame_font_name: Frame
-                        font_name_title: Label
-                        (*)fontlist: ListBox - font_name
-                        scroll_font: Scrollbar
-                    frame_font_param: Frame
-                        font_size_title: Label
-                        (*)sizelist: DynOptionMenu - font_size
-                        (*)bold_toggle: Checkbutton - font_bold
-                    frame_font_sample: Frame
-                        (*)font_sample: Label
-                frame_indent: LabelFrame
-                        indent_title: Label
-                        (*)indent_scale: Scale - space_num
+        Widgets for FontPage(Frame):  (*) widgets bound to self
+            frame_font: LabelFrame
+                frame_font_name: Frame
+                    font_name_title: Label
+                    (*)fontlist: ListBox - font_name
+                    scroll_font: Scrollbar
+                frame_font_param: Frame
+                    font_size_title: Label
+                    (*)sizelist: DynOptionMenu - font_size
+                    (*)bold_toggle: Checkbutton - font_bold
+                frame_font_sample: Frame
+                    (*)font_sample: Label
+            frame_indent: LabelFrame
+                    indent_title: Label
+                    (*)indent_scale: Scale - space_num
         """
         self.font_name = tracers.add(StringVar(self), self.var_changed_font)
         self.font_size = tracers.add(StringVar(self), self.var_changed_font)
@@ -1633,30 +1676,29 @@ def create_page_general(self):
         set_add_delete_state. All but load call update_help_changes to
         rewrite changes['main']['HelpFiles'].
 
-        Widget Structure:  (*) widgets bound to self
-            frame
-                frame_run: LabelFrame
-                    startup_title: Label
-                    (*)startup_editor_on: Radiobutton - startup_edit
-                    (*)startup_shell_on: Radiobutton - startup_edit
-                frame_save: LabelFrame
-                    run_save_title: Label
-                    (*)save_ask_on: Radiobutton - autosave
-                    (*)save_auto_on: Radiobutton - autosave
-                frame_win_size: LabelFrame
-                    win_size_title: Label
-                    win_width_title: Label
-                    (*)win_width_int: Entry - win_width
-                    win_height_title: Label
-                    (*)win_height_int: Entry - win_height
-                frame_help: LabelFrame
-                    frame_helplist: Frame
-                        frame_helplist_buttons: Frame
-                            (*)button_helplist_edit
-                            (*)button_helplist_add
-                            (*)button_helplist_remove
-                        (*)helplist: ListBox
-                        scroll_helplist: Scrollbar
+        Widgets for GenPage(Frame):  (*) widgets bound to self
+            frame_run: LabelFrame
+                startup_title: Label
+                (*)startup_editor_on: Radiobutton - startup_edit
+                (*)startup_shell_on: Radiobutton - startup_edit
+            frame_save: LabelFrame
+                run_save_title: Label
+                (*)save_ask_on: Radiobutton - autosave
+                (*)save_auto_on: Radiobutton - autosave
+            frame_win_size: LabelFrame
+                win_size_title: Label
+                win_width_title: Label
+                (*)win_width_int: Entry - win_width
+                win_height_title: Label
+                (*)win_height_int: Entry - win_height
+            frame_help: LabelFrame
+                frame_helplist: Frame
+                    frame_helplist_buttons: Frame
+                        (*)button_helplist_edit
+                        (*)button_helplist_add
+                        (*)button_helplist_remove
+                    (*)helplist: ListBox
+                    scroll_helplist: Scrollbar
         """
         self.startup_edit = tracers.add(
                 IntVar(self), ('main', 'General', 'editor-on-startup'))
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index cd78482150c..b07a65cf56a 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -1,7 +1,7 @@
 """Test idlelib.configdialog.
 
 Half the class creates dialog, half works with user customizations.
-Coverage: 63%.
+Coverage: 81%.
 """
 from idlelib import configdialog
 from test.support import requires
@@ -29,6 +29,7 @@
 mainpage = changes['main']
 highpage = changes['highlight']
 keyspage = changes['keys']
+extpage = changes['extensions']
 
 def setUpModule():
     global root, dialog
@@ -59,8 +60,6 @@ class FontPageTest(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         page = cls.page = dialog.fontpage
-        #dialog.note.insert(0, page, text='copy')
-        #dialog.note.add(page, text='copyfgfg')
         dialog.note.select(page)
         page.set_samples = Func()  # Mask instance method.
 
@@ -120,7 +119,7 @@ def test_fontlist_mouse(self):
         # Click on item should select that item.
         d = self.page
         if d.fontlist.size() < 2:
-            cls.skipTest('need at least 2 fonts')
+            self.skipTest('need at least 2 fonts')
         fontlist = d.fontlist
         fontlist.activate(0)
 
@@ -233,11 +232,391 @@ def setUp(self):
         changes.clear()
 
 
-class KeysTest(unittest.TestCase):
+class KeyTest(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        d = dialog
+        dialog.note.select(d.keyspage)
+        d.set_keys_type = Func()
+        d.load_keys_list = Func()
+
+    @classmethod
+    def tearDownClass(cls):
+        d = dialog
+        del d.set_keys_type, d.load_keys_list
 
     def setUp(self):
+        d = dialog
+        # The following is needed for test_load_key_cfg, _delete_custom_keys.
+        # This may indicate a defect in some test or function.
+        for section in idleConf.GetSectionList('user', 'keys'):
+            idleConf.userCfg['keys'].remove_section(section)
+        changes.clear()
+        d.set_keys_type.called = 0
+        d.load_keys_list.called = 0
+
+    def test_load_key_cfg(self):
+        tracers.detach()
+        d = dialog
+        eq = self.assertEqual
+
+        # Use builtin keyset with no user keysets created.
+        idleConf.CurrentKeys = mock.Mock(return_value='IDLE Classic OSX')
+        d.load_key_cfg()
+        self.assertTrue(d.keyset_source.get())
+        # builtinlist sets variable builtin_name to the CurrentKeys default.
+        eq(d.builtin_name.get(), 'IDLE Classic OSX')
+        eq(d.custom_name.get(), '- no custom keys -')
+        eq(d.custom_keyset_on['state'], DISABLED)
+        eq(d.set_keys_type.called, 1)
+        eq(d.load_keys_list.called, 1)
+        eq(d.load_keys_list.args, ('IDLE Classic OSX', ))
+
+        # Builtin keyset with non-empty user keyset list.
+        idleConf.SetOption('keys', 'test1', 'option', 'value')
+        idleConf.SetOption('keys', 'test2', 'option2', 'value2')
+        d.load_key_cfg()
+        eq(d.builtin_name.get(), 'IDLE Classic OSX')
+        eq(d.custom_name.get(), 'test1')
+        eq(d.set_keys_type.called, 2)
+        eq(d.load_keys_list.called, 2)
+        eq(d.load_keys_list.args, ('IDLE Classic OSX', ))
+
+        # Use custom keyset.
+        idleConf.CurrentKeys = mock.Mock(return_value='test2')
+        idleConf.default_keys = mock.Mock(return_value='IDLE Modern Unix')
+        idleConf.SetOption('main', 'Keys', 'default', '0')
+        d.load_key_cfg()
+        self.assertFalse(d.keyset_source.get())
+        eq(d.builtin_name.get(), 'IDLE Modern Unix')
+        eq(d.custom_name.get(), 'test2')
+        eq(d.set_keys_type.called, 3)
+        eq(d.load_keys_list.called, 3)
+        eq(d.load_keys_list.args, ('test2', ))
+
+        del idleConf.CurrentKeys, idleConf.default_keys
+        tracers.attach()
+
+    def test_keyset_source(self):
+        eq = self.assertEqual
+        d = dialog
+        # Test these separately.
+        d.var_changed_builtin_name = Func()
+        d.var_changed_custom_name = Func()
+        # Builtin selected.
+        d.builtin_keyset_on.invoke()
+        eq(mainpage, {'Keys': {'default': 'True'}})
+        eq(d.var_changed_builtin_name.called, 1)
+        eq(d.var_changed_custom_name.called, 0)
         changes.clear()
 
+        # Custom selected.
+        d.custom_keyset_on['state'] = NORMAL
+        d.custom_keyset_on.invoke()
+        self.assertEqual(mainpage, {'Keys': {'default': 'False'}})
+        eq(d.var_changed_builtin_name.called, 1)
+        eq(d.var_changed_custom_name.called, 1)
+        del d.var_changed_builtin_name, d.var_changed_custom_name
+
+    def test_builtin_name(self):
+        eq = self.assertEqual
+        d = dialog
+        idleConf.userCfg['main'].remove_section('Keys')
+        item_list = ['IDLE Classic Windows', 'IDLE Classic OSX',
+                     'IDLE Modern UNIX']
+
+        # Not in old_keys, defaults name to first item.
+        d.builtinlist.SetMenu(item_list, 'IDLE Modern UNIX')
+        eq(mainpage, {'Keys': {'name': 'IDLE Classic Windows',
+                               'name2': 'IDLE Modern UNIX'}})
+        eq(d.keys_message['text'], 'New key set, see Help')
+        eq(d.load_keys_list.called, 1)
+        eq(d.load_keys_list.args, ('IDLE Modern UNIX', ))
+
+        # Not in old keys - uses name2.
+        changes.clear()
+        idleConf.SetOption('main', 'Keys', 'name', 'IDLE Classic Unix')
+        d.builtinlist.SetMenu(item_list, 'IDLE Modern UNIX')
+        eq(mainpage, {'Keys': {'name2': 'IDLE Modern UNIX'}})
+        eq(d.keys_message['text'], 'New key set, see Help')
+        eq(d.load_keys_list.called, 2)
+        eq(d.load_keys_list.args, ('IDLE Modern UNIX', ))
+
+        # Builtin name in old_keys.
+        changes.clear()
+        d.builtinlist.SetMenu(item_list, 'IDLE Classic OSX')
+        eq(mainpage, {'Keys': {'name': 'IDLE Classic OSX', 'name2': ''}})
+        eq(d.keys_message['text'], '')
+        eq(d.load_keys_list.called, 3)
+        eq(d.load_keys_list.args, ('IDLE Classic OSX', ))
+
+    def test_custom_name(self):
+        d = dialog
+
+        # If no selections, doesn't get added.
+        d.customlist.SetMenu([], '- no custom keys -')
+        self.assertNotIn('Keys', mainpage)
+        self.assertEqual(d.load_keys_list.called, 0)
+
+        # Custom name selected.
+        changes.clear()
+        d.customlist.SetMenu(['a', 'b', 'c'], 'c')
+        self.assertEqual(mainpage, {'Keys': {'name': 'c'}})
+        self.assertEqual(d.load_keys_list.called, 1)
+
+    def test_keybinding(self):
+        d = dialog
+        d.custom_name.set('my custom keys')
+        d.bindingslist.delete(0, 'end')
+        d.bindingslist.insert(0, 'copy')
+        d.bindingslist.insert(1, 'expand-word')
+        d.bindingslist.selection_set(0)
+        d.bindingslist.selection_anchor(0)
+        # Core binding - adds to keys.
+        d.keybinding.set('<Key-F11>')
+        self.assertEqual(keyspage,
+                         {'my custom keys': {'copy': '<Key-F11>'}})
+        # Not a core binding - adds to extensions.
+        d.bindingslist.selection_set(1)
+        d.bindingslist.selection_anchor(1)
+        d.keybinding.set('<Key-F11>')
+        self.assertEqual(extpage,
+                         {'AutoExpand_cfgBindings': {'expand-word': '<Key-F11>'}})
+
+    def test_set_keys_type(self):
+        eq = self.assertEqual
+        d = dialog
+        del d.set_keys_type
+
+        # Builtin keyset selected.
+        d.keyset_source.set(True)
+        d.set_keys_type()
+        eq(d.builtinlist['state'], NORMAL)
+        eq(d.customlist['state'], DISABLED)
+        eq(d.button_delete_custom_keys['state'], DISABLED)
+
+        # Custom keyset selected.
+        d.keyset_source.set(False)
+        d.set_keys_type()
+        eq(d.builtinlist['state'], DISABLED)
+        eq(d.custom_keyset_on['state'], NORMAL)
+        eq(d.customlist['state'], NORMAL)
+        eq(d.button_delete_custom_keys['state'], NORMAL)
+        d.set_keys_type = Func()
+
+    def test_get_new_keys(self):
+        eq = self.assertEqual
+        d = dialog
+        orig_getkeysdialog = configdialog.GetKeysDialog
+        gkd = configdialog.GetKeysDialog = Func(return_self=True)
+        gnkn = d.get_new_keys_name = Func()
+
+        d.button_new_keys['state'] = NORMAL
+        d.bindingslist.delete(0, 'end')
+        d.bindingslist.insert(0, 'copy - <Control-Shift-Key-C>')
+        d.bindingslist.selection_set(0)
+        d.bindingslist.selection_anchor(0)
+        d.keybinding.set('Key-a')
+        d.keyset_source.set(True)  # Default keyset.
+
+        # Default keyset; no change to binding.
+        gkd.result = ''
+        d.button_new_keys.invoke()
+        eq(d.bindingslist.get('anchor'), 'copy - <Control-Shift-Key-C>')
+        # Keybinding isn't changed when there isn't a change entered.
+        eq(d.keybinding.get(), 'Key-a')
+
+        # Default keyset; binding changed.
+        gkd.result = '<Key-F11>'
+        # No keyset name selected therefore binding not saved.
+        gnkn.result = ''
+        d.button_new_keys.invoke()
+        eq(gnkn.called, 1)
+        eq(d.bindingslist.get('anchor'), 'copy - <Control-Shift-Key-C>')
+        # Keyset name selected.
+        gnkn.result = 'My New Key Set'
+        d.button_new_keys.invoke()
+        eq(d.custom_name.get(), gnkn.result)
+        eq(d.bindingslist.get('anchor'), 'copy - <Key-F11>')
+        eq(d.keybinding.get(), '<Key-F11>')
+
+        # User keyset; binding changed.
+        d.keyset_source.set(False)  # Custom keyset.
+        gnkn.called = 0
+        gkd.result = '<Key-p>'
+        d.button_new_keys.invoke()
+        eq(gnkn.called, 0)
+        eq(d.bindingslist.get('anchor'), 'copy - <Key-p>')
+        eq(d.keybinding.get(), '<Key-p>')
+
+        del d.get_new_keys_name
+        configdialog.GetKeysDialog = orig_getkeysdialog
+
+    def test_get_new_keys_name(self):
+        orig_sectionname = configdialog.SectionName
+        sn = configdialog.SectionName = Func(return_self=True)
+        d = dialog
+
+        sn.result = 'New Keys'
+        self.assertEqual(d.get_new_keys_name(''), 'New Keys')
+
+        configdialog.SectionName = orig_sectionname
+
+    def test_save_as_new_key_set(self):
+        d = dialog
+        gnkn = d.get_new_keys_name = Func()
+        d.keyset_source.set(True)
+
+        # No name entered.
+        gnkn.result = ''
+        d.button_save_custom_keys.invoke()
+
+        # Name entered.
+        gnkn.result = 'my new key set'
+        gnkn.called = 0
+        self.assertNotIn(gnkn.result, idleConf.userCfg['keys'])
+        d.button_save_custom_keys.invoke()
+        self.assertIn(gnkn.result, idleConf.userCfg['keys'])
+
+        del d.get_new_keys_name
+
+    def test_on_bindingslist_select(self):
+        d = dialog
+        b = d.bindingslist
+        b.delete(0, 'end')
+        b.insert(0, 'copy')
+        b.insert(1, 'find')
+        b.activate(0)
+
+        b.focus_force()
+        b.see(1)
+        b.update()
+        x, y, dx, dy = b.bbox(1)
+        x += dx // 2
+        y += dy // 2
+        b.event_generate('<Enter>', x=0, y=0)
+        b.event_generate('<Motion>', x=x, y=y)
+        b.event_generate('<Button-1>', x=x, y=y)
+        b.event_generate('<ButtonRelease-1>', x=x, y=y)
+        self.assertEqual(b.get('anchor'), 'find')
+        self.assertEqual(d.button_new_keys['state'], NORMAL)
+
+    def test_create_new_key_set_and_save_new_key_set(self):
+        eq = self.assertEqual
+        d = dialog
+
+        # Use default as previously active keyset.
+        d.keyset_source.set(True)
+        d.builtin_name.set('IDLE Classic Windows')
+        first_new = 'my new custom key set'
+        second_new = 'my second custom keyset'
+
+        # No changes, so keysets are an exact copy.
+        self.assertNotIn(first_new, idleConf.userCfg)
+        d.create_new_key_set(first_new)
+        eq(idleConf.GetSectionList('user', 'keys'), [first_new])
+        eq(idleConf.GetKeySet('IDLE Classic Windows'),
+           idleConf.GetKeySet(first_new))
+        eq(d.custom_name.get(), first_new)
+        self.assertFalse(d.keyset_source.get())  # Use custom set.
+        eq(d.set_keys_type.called, 1)
+
+        # Test that changed keybindings are in new keyset.
+        changes.add_option('keys', first_new, 'copy', '<Key-F11>')
+        self.assertNotIn(second_new, idleConf.userCfg)
+        d.create_new_key_set(second_new)
+        eq(idleConf.GetSectionList('user', 'keys'), [first_new, second_new])
+        self.assertNotEqual(idleConf.GetKeySet(first_new),
+                            idleConf.GetKeySet(second_new))
+        # Check that difference in keysets was in option `copy` from `changes`.
+        idleConf.SetOption('keys', first_new, 'copy', '<Key-F11>')
+        eq(idleConf.GetKeySet(first_new), idleConf.GetKeySet(second_new))
+
+    def test_load_keys_list(self):
+        eq = self.assertEqual
+        d = dialog
+        gks = idleConf.GetKeySet = Func()
+        del d.load_keys_list
+        b = d.bindingslist
+
+        b.delete(0, 'end')
+        b.insert(0, '<<find>>')
+        b.insert(1, '<<help>>')
+        gks.result = {'<<copy>>': ['<Control-Key-c>', '<Control-Key-C>'],
+                      '<<force-open-completions>>': ['<Control-Key-space>'],
+                      '<<spam>>': ['<Key-F11>']}
+        changes.add_option('keys', 'my keys', 'spam', '<Shift-Key-a>')
+        expected = ('copy - <Control-Key-c> <Control-Key-C>',
+                    'force-open-completions - <Control-Key-space>',
+                    'spam - <Shift-Key-a>')
+
+        # No current selection.
+        d.load_keys_list('my keys')
+        eq(b.get(0, 'end'), expected)
+        eq(b.get('anchor'), '')
+        eq(b.curselection(), ())
+
+        # Check selection.
+        b.selection_set(1)
+        b.selection_anchor(1)
+        d.load_keys_list('my keys')
+        eq(b.get(0, 'end'), expected)
+        eq(b.get('anchor'), 'force-open-completions - <Control-Key-space>')
+        eq(b.curselection(), (1, ))
+
+        # Change selection.
+        b.selection_set(2)
+        b.selection_anchor(2)
+        d.load_keys_list('my keys')
+        eq(b.get(0, 'end'), expected)
+        eq(b.get('anchor'), 'spam - <Shift-Key-a>')
+        eq(b.curselection(), (2, ))
+        d.load_keys_list = Func()
+
+        del idleConf.GetKeySet
+
+    def test_delete_custom_keys(self):
+        eq = self.assertEqual
+        d = dialog
+        d.button_delete_custom_keys['state'] = NORMAL
+        yesno = configdialog.tkMessageBox.askyesno = Func()
+        d.deactivate_current_config = Func()
+        d.activate_config_changes = Func()
+
+        keyset_name = 'spam key set'
+        idleConf.userCfg['keys'].SetOption(keyset_name, 'name', 'value')
+        keyspage[keyset_name] = {'option': 'True'}
+
+        # Force custom keyset.
+        d.keyset_source.set(False)
+        d.custom_name.set(keyset_name)
+
+        # Cancel deletion.
+        yesno.result = False
+        d.button_delete_custom_keys.invoke()
+        eq(yesno.called, 1)
+        eq(keyspage[keyset_name], {'option': 'True'})
+        eq(idleConf.GetSectionList('user', 'keys'), ['spam key set'])
+        eq(d.deactivate_current_config.called, 0)
+        eq(d.activate_config_changes.called, 0)
+        eq(d.set_keys_type.called, 0)
+
+        # Confirm deletion.
+        yesno.result = True
+        d.button_delete_custom_keys.invoke()
+        eq(yesno.called, 2)
+        self.assertNotIn(keyset_name, keyspage)
+        eq(idleConf.GetSectionList('user', 'keys'), [])
+        eq(d.custom_keyset_on['state'], DISABLED)
+        eq(d.custom_name.get(), '- no custom keys -')
+        eq(d.deactivate_current_config.called, 1)
+        eq(d.activate_config_changes.called, 1)
+        eq(d.set_keys_type.called, 1)
+
+        del d.activate_config_changes, d.deactivate_current_config
+        del configdialog.tkMessageBox.askyesno
+
 
 class GenPageTest(unittest.TestCase):
     """Test that general tab widgets enable users to make changes.
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-03-17-54-02.bpo-31002.kUSgTE.rst b/Misc/NEWS.d/next/IDLE/2017-08-03-17-54-02.bpo-31002.kUSgTE.rst
new file mode 100644
index 00000000000..1708be72b8b
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-03-17-54-02.bpo-31002.kUSgTE.rst
@@ -0,0 +1 @@
+Add tests for configdialog keys tab. Patch by Cheryl Sabella.


From webhook-mailer at python.org  Mon Aug 14 21:45:06 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Tue, 15 Aug 2017 01:45:06 -0000
Subject: [Python-checkins] [3.6] bpo-31002: IDLE: Add tests for configdialog
 keys tab (GH-2996) (#3092)
Message-ID: <mailman.10.1502761508.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/a31459008c5b3230363d155a2e8616664dc4f0c6
commit: a31459008c5b3230363d155a2e8616664dc4f0c6
branch: 3.6
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-14T21:45:02-04:00
summary:

[3.6] bpo-31002: IDLE: Add tests for configdialog keys tab (GH-2996) (#3092)

Patch by Cheryl Sabella.
(cherry picked from commit 2f89646)

files:
A Misc/NEWS.d/next/IDLE/2017-08-03-17-54-02.bpo-31002.kUSgTE.rst
M Lib/idlelib/configdialog.py
M Lib/idlelib/idle_test/test_configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index e634d5f3599..7c5f3c8ca4e 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -251,25 +251,24 @@ def create_page_highlight(self):
             delete_custom_theme: Ativate default [button_delete_custom_theme].
             save_new_theme: Save to userCfg['theme'] (is function).
 
-        Widget Structure:  (*) widgets bound to self
-            frame
-                frame_custom: LabelFrame
-                    (*)highlight_sample: Text
-                    (*)frame_color_set: Frame
-                        button_set_color: Button
-                        (*)opt_menu_highlight_target: DynOptionMenu - highlight_target
-                    frame_fg_bg_toggle: Frame
-                        (*)radio_fg: Radiobutton - fg_bg_toggle
-                        (*)radio_bg: Radiobutton - fg_bg_toggle
-                    button_save_custom_theme: Button
-                frame_theme: LabelFrame
-                    theme_type_title: Label
-                    (*)radio_theme_builtin: Radiobutton - is_builtin_theme
-                    (*)radio_theme_custom: Radiobutton - is_builtin_theme
-                    (*)opt_menu_theme_builtin: DynOptionMenu - builtin_theme
-                    (*)opt_menu_theme_custom: DynOptionMenu - custom_theme
-                    (*)button_delete_custom_theme: Button
-                    (*)new_custom_theme: Label
+        Widgets of highlights page frame:  (*) widgets bound to self
+            frame_custom: LabelFrame
+                (*)highlight_sample: Text
+                (*)frame_color_set: Frame
+                    button_set_color: Button
+                    (*)opt_menu_highlight_target: DynOptionMenu - highlight_target
+                frame_fg_bg_toggle: Frame
+                    (*)radio_fg: Radiobutton - fg_bg_toggle
+                    (*)radio_bg: Radiobutton - fg_bg_toggle
+                button_save_custom_theme: Button
+            frame_theme: LabelFrame
+                theme_type_title: Label
+                (*)radio_theme_builtin: Radiobutton - is_builtin_theme
+                (*)radio_theme_custom: Radiobutton - is_builtin_theme
+                (*)opt_menu_theme_builtin: DynOptionMenu - builtin_theme
+                (*)opt_menu_theme_custom: DynOptionMenu - custom_theme
+                (*)button_delete_custom_theme: Button
+                (*)new_custom_theme: Label
         """
         self.theme_elements={
             'Normal Text': ('normal', '00'),
@@ -796,52 +795,92 @@ def delete_custom_theme(self):
     def create_page_keys(self):
         """Return frame of widgets for Keys tab.
 
+        Enable users to provisionally change both individual and sets of
+        keybindings (shortcut keys). Except for features implemented as
+        extensions, keybindings are stored in complete sets called
+        keysets. Built-in keysets in idlelib/config-keys.def are fixed
+        as far as the dialog is concerned. Any keyset can be used as the
+        base for a new custom keyset, stored in .idlerc/config-keys.cfg.
+
+        Function load_key_cfg() initializes tk variables and keyset
+        lists and calls load_keys_list for the current keyset.
+        Radiobuttons builtin_keyset_on and custom_keyset_on toggle var
+        keyset_source, which controls if the current set of keybindings
+        are from a builtin or custom keyset. DynOptionMenus builtinlist
+        and customlist contain lists of the builtin and custom keysets,
+        respectively, and the current item from each list is stored in
+        vars builtin_name and custom_name.
+
+        Button delete_custom_keys invokes delete_custom_keys() to delete
+        a custom keyset from idleConf.userCfg['keys'] and changes.  Button
+        save_custom_keys invokes save_as_new_key_set() which calls
+        get_new_keys_name() and create_new_key_set() to save a custom keyset
+        and its keybindings to idleConf.userCfg['keys'].
+
+        Listbox bindingslist contains all of the keybindings for the
+        selected keyset.  The keybindings are loaded in load_keys_list()
+        and are pairs of (event, [keys]) where keys can be a list
+        of one or more key combinations to bind to the same event.
+        Mouse button 1 click invokes on_bindingslist_select(), which
+        allows button_new_keys to be clicked.
+
+        So, an item is selected in listbindings, which activates
+        button_new_keys, and clicking button_new_keys calls function
+        get_new_keys().  Function get_new_keys() gets the key mappings from the
+        current keyset for the binding event item that was selected.  The
+        function then displays another dialog, GetKeysDialog, with the
+        selected binding event and current keys and always new key sequences
+        to be entered for that binding event.  If the keys aren't
+        changed, nothing happens.  If the keys are changed and the keyset
+        is a builtin, function get_new_keys_name() will be called
+        for input of a custom keyset name.  If no name is given, then the
+        change to the keybinding will abort and no updates will be made.  If
+        a custom name is entered in the prompt or if the current keyset was
+        already custom (and thus didn't require a prompt), then
+        idleConf.userCfg['keys'] is updated in function create_new_key_set()
+        with the change to the event binding.  The item listing in bindingslist
+        is updated with the new keys.  Var keybinding is also set which invokes
+        the callback function, var_changed_keybinding, to add the change to
+        the 'keys' or 'extensions' changes tracker based on the binding type.
+
         Tk Variables:
-            builtin_keys: Menu variable for built-in keybindings.
-            custom_keys: Menu variable for custom keybindings.
-            are_keys_builtin: Selector for built-in or custom keybindings.
             keybinding: Action/key bindings.
 
         Methods:
-            load_key_config: Set table.
             load_keys_list: Reload active set.
-            keybinding_selected: Bound to list_bindings button release.
-            get_new_keys: Command for button_new_keys.
-            get_new_keys_name: Call popup.
             create_new_key_set: Combine active keyset and changes.
-            set_keys_type: Command for are_keys_builtin.
-            delete_custom_keys: Command for button_delete_custom_keys.
-            save_as_new_key_set: Command for button_save_custom_keys.
+            set_keys_type: Command for keyset_source.
             save_new_key_set: Save to idleConf.userCfg['keys'] (is function).
             deactivate_current_config: Remove keys bindings in editors.
 
-        Widget Structure:  (*) widgets bound to self
-            frame
-                frame_custom: LabelFrame
-                    frame_target: Frame
-                        target_title: Label
-                        scroll_target_y: Scrollbar
-                        scroll_target_x: Scrollbar
-                        (*)list_bindings: ListBox
-                        (*)button_new_keys: Button
-                frame_key_sets: LabelFrame
-                    frames[0]: Frame
-                        (*)radio_keys_builtin: Radiobutton - are_keys_builtin
-                        (*)radio_keys_custom: Radiobutton - are_keys_builtin
-                        (*)opt_menu_keys_builtin: DynOptionMenu - builtin_keys
-                        (*)opt_menu_keys_custom: DynOptionMenu - custom_keys
-                        (*)new_custom_keys: Label
-                    frames[1]: Frame
-                        (*)button_delete_custom_keys: Button
-                        button_save_custom_keys: Button
+        Widgets for keys page frame:  (*) widgets bound to self
+            frame_key_sets: LabelFrame
+                frames[0]: Frame
+                    (*)builtin_keyset_on: Radiobutton - var keyset_source
+                    (*)custom_keyset_on: Radiobutton - var keyset_source
+                    (*)builtinlist: DynOptionMenu - var builtin_name,
+                            func keybinding_selected
+                    (*)customlist: DynOptionMenu - var custom_name,
+                            func keybinding_selected
+                    (*)keys_message: Label
+                frames[1]: Frame
+                    (*)button_delete_custom_keys: Button - delete_custom_keys
+                    (*)button_save_custom_keys: Button -  save_as_new_key_set
+            frame_custom: LabelFrame
+                frame_target: Frame
+                    target_title: Label
+                    scroll_target_y: Scrollbar
+                    scroll_target_x: Scrollbar
+                    (*)bindingslist: ListBox - on_bindingslist_select
+                    (*)button_new_keys: Button - get_new_keys & ..._name
         """
         parent = self.parent
-        self.builtin_keys = tracers.add(
-                StringVar(parent), self.var_changed_builtin_keys)
-        self.custom_keys = tracers.add(
-                StringVar(parent), self.var_changed_custom_keys)
-        self.are_keys_builtin = tracers.add(
-                BooleanVar(parent), self.var_changed_are_keys_builtin)
+        self.builtin_name = tracers.add(
+                StringVar(parent), self.var_changed_builtin_name)
+        self.custom_name = tracers.add(
+                StringVar(parent), self.var_changed_custom_name)
+        self.keyset_source = tracers.add(
+                BooleanVar(parent), self.var_changed_keyset_source)
         self.keybinding = tracers.add(
                 StringVar(parent), self.var_changed_keybinding)
 
@@ -858,36 +897,37 @@ def create_page_keys(self):
         target_title = Label(frame_target, text='Action - Key(s)')
         scroll_target_y = Scrollbar(frame_target)
         scroll_target_x = Scrollbar(frame_target, orient=HORIZONTAL)
-        self.list_bindings = Listbox(
+        self.bindingslist = Listbox(
                 frame_target, takefocus=FALSE, exportselection=FALSE)
-        self.list_bindings.bind('<ButtonRelease-1>', self.keybinding_selected)
-        scroll_target_y.config(command=self.list_bindings.yview)
-        scroll_target_x.config(command=self.list_bindings.xview)
-        self.list_bindings.config(yscrollcommand=scroll_target_y.set)
-        self.list_bindings.config(xscrollcommand=scroll_target_x.set)
+        self.bindingslist.bind('<ButtonRelease-1>',
+                               self.on_bindingslist_select)
+        scroll_target_y['command'] = self.bindingslist.yview
+        scroll_target_x['command'] = self.bindingslist.xview
+        self.bindingslist['yscrollcommand'] = scroll_target_y.set
+        self.bindingslist['xscrollcommand'] = scroll_target_x.set
         self.button_new_keys = Button(
                 frame_custom, text='Get New Keys for Selection',
                 command=self.get_new_keys, state=DISABLED)
         #frame_key_sets
         frames = [Frame(frame_key_sets, padx=2, pady=2, borderwidth=0)
                   for i in range(2)]
-        self.radio_keys_builtin = Radiobutton(
-                frames[0], variable=self.are_keys_builtin, value=1,
+        self.builtin_keyset_on = Radiobutton(
+                frames[0], variable=self.keyset_source, value=1,
                 command=self.set_keys_type, text='Use a Built-in Key Set')
-        self.radio_keys_custom = Radiobutton(
-                frames[0], variable=self.are_keys_builtin,  value=0,
+        self.custom_keyset_on = Radiobutton(
+                frames[0], variable=self.keyset_source, value=0,
                 command=self.set_keys_type, text='Use a Custom Key Set')
-        self.opt_menu_keys_builtin = DynOptionMenu(
-                frames[0], self.builtin_keys, None, command=None)
-        self.opt_menu_keys_custom = DynOptionMenu(
-                frames[0], self.custom_keys, None, command=None)
+        self.builtinlist = DynOptionMenu(
+                frames[0], self.builtin_name, None, command=None)
+        self.customlist = DynOptionMenu(
+                frames[0], self.custom_name, None, command=None)
         self.button_delete_custom_keys = Button(
                 frames[1], text='Delete Custom Key Set',
                 command=self.delete_custom_keys)
-        button_save_custom_keys = Button(
+        self.button_save_custom_keys = Button(
                 frames[1], text='Save as New Custom Key Set',
                 command=self.save_as_new_key_set)
-        self.new_custom_keys = Label(frames[0], bd=2)
+        self.keys_message = Label(frames[0], bd=2)
 
         ##widget packing
         #body
@@ -900,17 +940,17 @@ def create_page_keys(self):
         frame_target.columnconfigure(0, weight=1)
         frame_target.rowconfigure(1, weight=1)
         target_title.grid(row=0, column=0, columnspan=2, sticky=W)
-        self.list_bindings.grid(row=1, column=0, sticky=NSEW)
+        self.bindingslist.grid(row=1, column=0, sticky=NSEW)
         scroll_target_y.grid(row=1, column=1, sticky=NS)
         scroll_target_x.grid(row=2, column=0, sticky=EW)
         #frame_key_sets
-        self.radio_keys_builtin.grid(row=0, column=0, sticky=W+NS)
-        self.radio_keys_custom.grid(row=1, column=0, sticky=W+NS)
-        self.opt_menu_keys_builtin.grid(row=0, column=1, sticky=NSEW)
-        self.opt_menu_keys_custom.grid(row=1, column=1, sticky=NSEW)
-        self.new_custom_keys.grid(row=0, column=2, sticky=NSEW, padx=5, pady=5)
+        self.builtin_keyset_on.grid(row=0, column=0, sticky=W+NS)
+        self.custom_keyset_on.grid(row=1, column=0, sticky=W+NS)
+        self.builtinlist.grid(row=0, column=1, sticky=NSEW)
+        self.customlist.grid(row=1, column=1, sticky=NSEW)
+        self.keys_message.grid(row=0, column=2, sticky=NSEW, padx=5, pady=5)
         self.button_delete_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
-        button_save_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
+        self.button_save_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
         frames[0].pack(side=TOP, fill=BOTH, expand=True)
         frames[1].pack(side=TOP, fill=X, expand=True, pady=2)
         return frame
@@ -918,35 +958,35 @@ def create_page_keys(self):
     def load_key_cfg(self):
         "Load current configuration settings for the keybinding options."
         # Set current keys type radiobutton.
-        self.are_keys_builtin.set(idleConf.GetOption(
+        self.keyset_source.set(idleConf.GetOption(
                 'main', 'Keys', 'default', type='bool', default=1))
         # Set current keys.
         current_option = idleConf.CurrentKeys()
         # Load available keyset option menus.
-        if self.are_keys_builtin.get():  # Default theme selected.
+        if self.keyset_source.get():  # Default theme selected.
             item_list = idleConf.GetSectionList('default', 'keys')
             item_list.sort()
-            self.opt_menu_keys_builtin.SetMenu(item_list, current_option)
+            self.builtinlist.SetMenu(item_list, current_option)
             item_list = idleConf.GetSectionList('user', 'keys')
             item_list.sort()
             if not item_list:
-                self.radio_keys_custom['state'] = DISABLED
-                self.custom_keys.set('- no custom keys -')
+                self.custom_keyset_on['state'] = DISABLED
+                self.custom_name.set('- no custom keys -')
             else:
-                self.opt_menu_keys_custom.SetMenu(item_list, item_list[0])
+                self.customlist.SetMenu(item_list, item_list[0])
         else:  # User key set selected.
             item_list = idleConf.GetSectionList('user', 'keys')
             item_list.sort()
-            self.opt_menu_keys_custom.SetMenu(item_list, current_option)
+            self.customlist.SetMenu(item_list, current_option)
             item_list = idleConf.GetSectionList('default', 'keys')
             item_list.sort()
-            self.opt_menu_keys_builtin.SetMenu(item_list, idleConf.default_keys())
+            self.builtinlist.SetMenu(item_list, idleConf.default_keys())
         self.set_keys_type()
         # Load keyset element list.
         keyset_name = idleConf.CurrentKeys()
         self.load_keys_list(keyset_name)
 
-    def var_changed_builtin_keys(self, *params):
+    def var_changed_builtin_name(self, *params):
         "Process selection of builtin key set."
         old_keys = (
             'IDLE Classic Windows',
@@ -954,40 +994,41 @@ def var_changed_builtin_keys(self, *params):
             'IDLE Classic Mac',
             'IDLE Classic OSX',
         )
-        value = self.builtin_keys.get()
+        value = self.builtin_name.get()
         if value not in old_keys:
             if idleConf.GetOption('main', 'Keys', 'name') not in old_keys:
                 changes.add_option('main', 'Keys', 'name', old_keys[0])
             changes.add_option('main', 'Keys', 'name2', value)
-            self.new_custom_keys.config(text='New key set, see Help',
-                                        fg='#500000')
+            self.keys_message['text'] = 'New key set, see Help'
+            self.keys_message['fg'] = '#500000'
         else:
             changes.add_option('main', 'Keys', 'name', value)
             changes.add_option('main', 'Keys', 'name2', '')
-            self.new_custom_keys.config(text='', fg='black')
+            self.keys_message['text'] = ''
+            self.keys_message['fg'] = 'black'
         self.load_keys_list(value)
 
-    def var_changed_custom_keys(self, *params):
+    def var_changed_custom_name(self, *params):
         "Process selection of custom key set."
-        value = self.custom_keys.get()
+        value = self.custom_name.get()
         if value != '- no custom keys -':
             changes.add_option('main', 'Keys', 'name', value)
             self.load_keys_list(value)
 
-    def var_changed_are_keys_builtin(self, *params):
+    def var_changed_keyset_source(self, *params):
         "Process toggle between builtin key set and custom key set."
-        value = self.are_keys_builtin.get()
+        value = self.keyset_source.get()
         changes.add_option('main', 'Keys', 'default', value)
         if value:
-            self.var_changed_builtin_keys()
+            self.var_changed_builtin_name()
         else:
-            self.var_changed_custom_keys()
+            self.var_changed_custom_name()
 
     def var_changed_keybinding(self, *params):
         "Store change to a keybinding."
         value = self.keybinding.get()
-        key_set = self.custom_keys.get()
-        event = self.list_bindings.get(ANCHOR).split()[0]
+        key_set = self.custom_name.get()
+        event = self.bindingslist.get(ANCHOR).split()[0]
         if idleConf.IsCoreBinding(event):
             changes.add_option('keys', key_set, event, value)
         else:  # Event is an extension binding.
@@ -997,14 +1038,14 @@ def var_changed_keybinding(self, *params):
 
     def set_keys_type(self):
         "Set available screen options based on builtin or custom key set."
-        if self.are_keys_builtin.get():
-            self.opt_menu_keys_builtin['state'] = NORMAL
-            self.opt_menu_keys_custom['state'] = DISABLED
+        if self.keyset_source.get():
+            self.builtinlist['state'] = NORMAL
+            self.customlist['state'] = DISABLED
             self.button_delete_custom_keys['state'] = DISABLED
         else:
-            self.opt_menu_keys_builtin['state'] = DISABLED
-            self.radio_keys_custom['state'] = NORMAL
-            self.opt_menu_keys_custom['state'] = NORMAL
+            self.builtinlist['state'] = DISABLED
+            self.custom_keyset_on['state'] = NORMAL
+            self.customlist['state'] = NORMAL
             self.button_delete_custom_keys['state'] = NORMAL
 
     def get_new_keys(self):
@@ -1016,13 +1057,13 @@ def get_new_keys(self):
         changed, then a name for a custom key set needs to be
         entered for the change to be applied.
         """
-        list_index = self.list_bindings.index(ANCHOR)
-        binding = self.list_bindings.get(list_index)
+        list_index = self.bindingslist.index(ANCHOR)
+        binding = self.bindingslist.get(list_index)
         bind_name = binding.split()[0]
-        if self.are_keys_builtin.get():
-            current_key_set_name = self.builtin_keys.get()
+        if self.keyset_source.get():
+            current_key_set_name = self.builtin_name.get()
         else:
-            current_key_set_name = self.custom_keys.get()
+            current_key_set_name = self.custom_name.get()
         current_bindings = idleConf.GetCurrentKeySet()
         if current_key_set_name in changes['keys']:  # unsaved changes
             key_set_changes = changes['keys'][current_key_set_name]
@@ -1032,24 +1073,24 @@ def get_new_keys(self):
         new_keys = GetKeysDialog(self, 'Get New Keys', bind_name,
                 current_key_sequences).result
         if new_keys:
-            if self.are_keys_builtin.get():  # Current key set is a built-in.
+            if self.keyset_source.get():  # Current key set is a built-in.
                 message = ('Your changes will be saved as a new Custom Key Set.'
                            ' Enter a name for your new Custom Key Set below.')
                 new_keyset = self.get_new_keys_name(message)
                 if not new_keyset:  # User cancelled custom key set creation.
-                    self.list_bindings.select_set(list_index)
-                    self.list_bindings.select_anchor(list_index)
+                    self.bindingslist.select_set(list_index)
+                    self.bindingslist.select_anchor(list_index)
                     return
                 else:  # Create new custom key set based on previously active key set.
                     self.create_new_key_set(new_keyset)
-            self.list_bindings.delete(list_index)
-            self.list_bindings.insert(list_index, bind_name+' - '+new_keys)
-            self.list_bindings.select_set(list_index)
-            self.list_bindings.select_anchor(list_index)
+            self.bindingslist.delete(list_index)
+            self.bindingslist.insert(list_index, bind_name+' - '+new_keys)
+            self.bindingslist.select_set(list_index)
+            self.bindingslist.select_anchor(list_index)
             self.keybinding.set(new_keys)
         else:
-            self.list_bindings.select_set(list_index)
-            self.list_bindings.select_anchor(list_index)
+            self.bindingslist.select_set(list_index)
+            self.bindingslist.select_anchor(list_index)
 
     def get_new_keys_name(self, message):
         "Return new key set name from query popup."
@@ -1065,21 +1106,20 @@ def save_as_new_key_set(self):
         if new_keys_name:
             self.create_new_key_set(new_keys_name)
 
-    def keybinding_selected(self, event):
+    def on_bindingslist_select(self, event):
         "Activate button to assign new keys to selected action."
         self.button_new_keys['state'] = NORMAL
 
     def create_new_key_set(self, new_key_set_name):
         """Create a new custom key set with the given name.
 
-        Create the new key set based on the previously active set
-        with the current changes applied.  Once it is saved, then
-        activate the new key set.
+        Copy the bindings/keys from the previously active keyset
+        to the new keyset and activate the new custom keyset.
         """
-        if self.are_keys_builtin.get():
-            prev_key_set_name = self.builtin_keys.get()
+        if self.keyset_source.get():
+            prev_key_set_name = self.builtin_name.get()
         else:
-            prev_key_set_name = self.custom_keys.get()
+            prev_key_set_name = self.custom_name.get()
         prev_keys = idleConf.GetCoreKeys(prev_key_set_name)
         new_keys = {}
         for event in prev_keys:  # Add key set to changed items.
@@ -1096,8 +1136,8 @@ def create_new_key_set(self, new_key_set_name):
         # Change GUI over to the new key set.
         custom_key_list = idleConf.GetSectionList('user', 'keys')
         custom_key_list.sort()
-        self.opt_menu_keys_custom.SetMenu(custom_key_list, new_key_set_name)
-        self.are_keys_builtin.set(0)
+        self.customlist.SetMenu(custom_key_list, new_key_set_name)
+        self.keyset_source.set(0)
         self.set_keys_type()
 
     def load_keys_list(self, keyset_name):
@@ -1105,14 +1145,14 @@ def load_keys_list(self, keyset_name):
 
         An action/key binding can be selected to change the key binding.
         """
-        reselect = 0
-        if self.list_bindings.curselection():
-            reselect = 1
-            list_index = self.list_bindings.index(ANCHOR)
+        reselect = False
+        if self.bindingslist.curselection():
+            reselect = True
+            list_index = self.bindingslist.index(ANCHOR)
         keyset = idleConf.GetKeySet(keyset_name)
         bind_names = list(keyset.keys())
         bind_names.sort()
-        self.list_bindings.delete(0, END)
+        self.bindingslist.delete(0, END)
         for bind_name in bind_names:
             key = ' '.join(keyset[bind_name])
             bind_name = bind_name[2:-2]  # Trim off the angle brackets.
@@ -1120,17 +1160,21 @@ def load_keys_list(self, keyset_name):
                 # Handle any unsaved changes to this key set.
                 if bind_name in changes['keys'][keyset_name]:
                     key = changes['keys'][keyset_name][bind_name]
-            self.list_bindings.insert(END, bind_name+' - '+key)
+            self.bindingslist.insert(END, bind_name+' - '+key)
         if reselect:
-            self.list_bindings.see(list_index)
-            self.list_bindings.select_set(list_index)
-            self.list_bindings.select_anchor(list_index)
+            self.bindingslist.see(list_index)
+            self.bindingslist.select_set(list_index)
+            self.bindingslist.select_anchor(list_index)
 
     def save_new_key_set(self, keyset_name, keyset):
         """Save a newly created core key set.
 
+        Add keyset to idleConf.userCfg['keys'], not to disk.
+        If the keyset doesn't exist, it is created.  The
+        binding/keys are taken from the keyset argument.
+
         keyset_name - string, the name of the new key set
-        keyset - dictionary containing the new key set
+        keyset - dictionary containing the new keybindings
         """
         if not idleConf.userCfg['keys'].has_section(keyset_name):
             idleConf.userCfg['keys'].add_section(keyset_name)
@@ -1145,7 +1189,7 @@ def delete_custom_keys(self):
         reverts to the default.  The custom key set is permanently
         deleted from the config file.
         """
-        keyset_name=self.custom_keys.get()
+        keyset_name=self.custom_name.get()
         delmsg = 'Are you sure you wish to delete the key set %r ?'
         if not tkMessageBox.askyesno(
                 'Delete Key Set',  delmsg % keyset_name, parent=self):
@@ -1157,14 +1201,14 @@ def delete_custom_keys(self):
         item_list = idleConf.GetSectionList('user', 'keys')
         item_list.sort()
         if not item_list:
-            self.radio_keys_custom['state'] = DISABLED
-            self.opt_menu_keys_custom.SetMenu(item_list, '- no custom keys -')
+            self.custom_keyset_on['state'] = DISABLED
+            self.customlist.SetMenu(item_list, '- no custom keys -')
         else:
-            self.opt_menu_keys_custom.SetMenu(item_list, item_list[0])
+            self.customlist.SetMenu(item_list, item_list[0])
         # Revert to default key set.
-        self.are_keys_builtin.set(idleConf.defaultCfg['main']
+        self.keyset_source.set(idleConf.defaultCfg['main']
                                 .Get('Keys', 'default'))
-        self.builtin_keys.set(idleConf.defaultCfg['main'].Get('Keys', 'name')
+        self.builtin_name.set(idleConf.defaultCfg['main'].Get('Keys', 'name')
                              or idleConf.default_keys())
         # User can't back out of these changes, they must be applied now.
         changes.save_all()
@@ -1438,22 +1482,21 @@ def create_page_font_tab(self):
         which invokes the default callback to add an entry to
         changes.  Load_tab_cfg initializes space_num to default.
 
-        Widget Structure:  (*) widgets bound to self
-            frame (of tab_pages)
-                frame_font: LabelFrame
-                    frame_font_name: Frame
-                        font_name_title: Label
-                        (*)fontlist: ListBox - font_name
-                        scroll_font: Scrollbar
-                    frame_font_param: Frame
-                        font_size_title: Label
-                        (*)sizelist: DynOptionMenu - font_size
-                        (*)bold_toggle: Checkbutton - font_bold
-                    frame_font_sample: Frame
-                        (*)font_sample: Label
-                frame_indent: LabelFrame
-                        indent_title: Label
-                        (*)indent_scale: Scale - space_num
+        Widgets for FontPage(Frame):  (*) widgets bound to self
+            frame_font: LabelFrame
+                frame_font_name: Frame
+                    font_name_title: Label
+                    (*)fontlist: ListBox - font_name
+                    scroll_font: Scrollbar
+                frame_font_param: Frame
+                    font_size_title: Label
+                    (*)sizelist: DynOptionMenu - font_size
+                    (*)bold_toggle: Checkbutton - font_bold
+                frame_font_sample: Frame
+                    (*)font_sample: Label
+            frame_indent: LabelFrame
+                    indent_title: Label
+                    (*)indent_scale: Scale - space_num
         """
         self.font_name = tracers.add(StringVar(self), self.var_changed_font)
         self.font_size = tracers.add(StringVar(self), self.var_changed_font)
@@ -1633,30 +1676,29 @@ def create_page_general(self):
         set_add_delete_state. All but load call update_help_changes to
         rewrite changes['main']['HelpFiles'].
 
-        Widget Structure:  (*) widgets bound to self
-            frame
-                frame_run: LabelFrame
-                    startup_title: Label
-                    (*)startup_editor_on: Radiobutton - startup_edit
-                    (*)startup_shell_on: Radiobutton - startup_edit
-                frame_save: LabelFrame
-                    run_save_title: Label
-                    (*)save_ask_on: Radiobutton - autosave
-                    (*)save_auto_on: Radiobutton - autosave
-                frame_win_size: LabelFrame
-                    win_size_title: Label
-                    win_width_title: Label
-                    (*)win_width_int: Entry - win_width
-                    win_height_title: Label
-                    (*)win_height_int: Entry - win_height
-                frame_help: LabelFrame
-                    frame_helplist: Frame
-                        frame_helplist_buttons: Frame
-                            (*)button_helplist_edit
-                            (*)button_helplist_add
-                            (*)button_helplist_remove
-                        (*)helplist: ListBox
-                        scroll_helplist: Scrollbar
+        Widgets for GenPage(Frame):  (*) widgets bound to self
+            frame_run: LabelFrame
+                startup_title: Label
+                (*)startup_editor_on: Radiobutton - startup_edit
+                (*)startup_shell_on: Radiobutton - startup_edit
+            frame_save: LabelFrame
+                run_save_title: Label
+                (*)save_ask_on: Radiobutton - autosave
+                (*)save_auto_on: Radiobutton - autosave
+            frame_win_size: LabelFrame
+                win_size_title: Label
+                win_width_title: Label
+                (*)win_width_int: Entry - win_width
+                win_height_title: Label
+                (*)win_height_int: Entry - win_height
+            frame_help: LabelFrame
+                frame_helplist: Frame
+                    frame_helplist_buttons: Frame
+                        (*)button_helplist_edit
+                        (*)button_helplist_add
+                        (*)button_helplist_remove
+                    (*)helplist: ListBox
+                    scroll_helplist: Scrollbar
         """
         self.startup_edit = tracers.add(
                 IntVar(self), ('main', 'General', 'editor-on-startup'))
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index cd78482150c..b07a65cf56a 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -1,7 +1,7 @@
 """Test idlelib.configdialog.
 
 Half the class creates dialog, half works with user customizations.
-Coverage: 63%.
+Coverage: 81%.
 """
 from idlelib import configdialog
 from test.support import requires
@@ -29,6 +29,7 @@
 mainpage = changes['main']
 highpage = changes['highlight']
 keyspage = changes['keys']
+extpage = changes['extensions']
 
 def setUpModule():
     global root, dialog
@@ -59,8 +60,6 @@ class FontPageTest(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         page = cls.page = dialog.fontpage
-        #dialog.note.insert(0, page, text='copy')
-        #dialog.note.add(page, text='copyfgfg')
         dialog.note.select(page)
         page.set_samples = Func()  # Mask instance method.
 
@@ -120,7 +119,7 @@ def test_fontlist_mouse(self):
         # Click on item should select that item.
         d = self.page
         if d.fontlist.size() < 2:
-            cls.skipTest('need at least 2 fonts')
+            self.skipTest('need at least 2 fonts')
         fontlist = d.fontlist
         fontlist.activate(0)
 
@@ -233,11 +232,391 @@ def setUp(self):
         changes.clear()
 
 
-class KeysTest(unittest.TestCase):
+class KeyTest(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        d = dialog
+        dialog.note.select(d.keyspage)
+        d.set_keys_type = Func()
+        d.load_keys_list = Func()
+
+    @classmethod
+    def tearDownClass(cls):
+        d = dialog
+        del d.set_keys_type, d.load_keys_list
 
     def setUp(self):
+        d = dialog
+        # The following is needed for test_load_key_cfg, _delete_custom_keys.
+        # This may indicate a defect in some test or function.
+        for section in idleConf.GetSectionList('user', 'keys'):
+            idleConf.userCfg['keys'].remove_section(section)
+        changes.clear()
+        d.set_keys_type.called = 0
+        d.load_keys_list.called = 0
+
+    def test_load_key_cfg(self):
+        tracers.detach()
+        d = dialog
+        eq = self.assertEqual
+
+        # Use builtin keyset with no user keysets created.
+        idleConf.CurrentKeys = mock.Mock(return_value='IDLE Classic OSX')
+        d.load_key_cfg()
+        self.assertTrue(d.keyset_source.get())
+        # builtinlist sets variable builtin_name to the CurrentKeys default.
+        eq(d.builtin_name.get(), 'IDLE Classic OSX')
+        eq(d.custom_name.get(), '- no custom keys -')
+        eq(d.custom_keyset_on['state'], DISABLED)
+        eq(d.set_keys_type.called, 1)
+        eq(d.load_keys_list.called, 1)
+        eq(d.load_keys_list.args, ('IDLE Classic OSX', ))
+
+        # Builtin keyset with non-empty user keyset list.
+        idleConf.SetOption('keys', 'test1', 'option', 'value')
+        idleConf.SetOption('keys', 'test2', 'option2', 'value2')
+        d.load_key_cfg()
+        eq(d.builtin_name.get(), 'IDLE Classic OSX')
+        eq(d.custom_name.get(), 'test1')
+        eq(d.set_keys_type.called, 2)
+        eq(d.load_keys_list.called, 2)
+        eq(d.load_keys_list.args, ('IDLE Classic OSX', ))
+
+        # Use custom keyset.
+        idleConf.CurrentKeys = mock.Mock(return_value='test2')
+        idleConf.default_keys = mock.Mock(return_value='IDLE Modern Unix')
+        idleConf.SetOption('main', 'Keys', 'default', '0')
+        d.load_key_cfg()
+        self.assertFalse(d.keyset_source.get())
+        eq(d.builtin_name.get(), 'IDLE Modern Unix')
+        eq(d.custom_name.get(), 'test2')
+        eq(d.set_keys_type.called, 3)
+        eq(d.load_keys_list.called, 3)
+        eq(d.load_keys_list.args, ('test2', ))
+
+        del idleConf.CurrentKeys, idleConf.default_keys
+        tracers.attach()
+
+    def test_keyset_source(self):
+        eq = self.assertEqual
+        d = dialog
+        # Test these separately.
+        d.var_changed_builtin_name = Func()
+        d.var_changed_custom_name = Func()
+        # Builtin selected.
+        d.builtin_keyset_on.invoke()
+        eq(mainpage, {'Keys': {'default': 'True'}})
+        eq(d.var_changed_builtin_name.called, 1)
+        eq(d.var_changed_custom_name.called, 0)
         changes.clear()
 
+        # Custom selected.
+        d.custom_keyset_on['state'] = NORMAL
+        d.custom_keyset_on.invoke()
+        self.assertEqual(mainpage, {'Keys': {'default': 'False'}})
+        eq(d.var_changed_builtin_name.called, 1)
+        eq(d.var_changed_custom_name.called, 1)
+        del d.var_changed_builtin_name, d.var_changed_custom_name
+
+    def test_builtin_name(self):
+        eq = self.assertEqual
+        d = dialog
+        idleConf.userCfg['main'].remove_section('Keys')
+        item_list = ['IDLE Classic Windows', 'IDLE Classic OSX',
+                     'IDLE Modern UNIX']
+
+        # Not in old_keys, defaults name to first item.
+        d.builtinlist.SetMenu(item_list, 'IDLE Modern UNIX')
+        eq(mainpage, {'Keys': {'name': 'IDLE Classic Windows',
+                               'name2': 'IDLE Modern UNIX'}})
+        eq(d.keys_message['text'], 'New key set, see Help')
+        eq(d.load_keys_list.called, 1)
+        eq(d.load_keys_list.args, ('IDLE Modern UNIX', ))
+
+        # Not in old keys - uses name2.
+        changes.clear()
+        idleConf.SetOption('main', 'Keys', 'name', 'IDLE Classic Unix')
+        d.builtinlist.SetMenu(item_list, 'IDLE Modern UNIX')
+        eq(mainpage, {'Keys': {'name2': 'IDLE Modern UNIX'}})
+        eq(d.keys_message['text'], 'New key set, see Help')
+        eq(d.load_keys_list.called, 2)
+        eq(d.load_keys_list.args, ('IDLE Modern UNIX', ))
+
+        # Builtin name in old_keys.
+        changes.clear()
+        d.builtinlist.SetMenu(item_list, 'IDLE Classic OSX')
+        eq(mainpage, {'Keys': {'name': 'IDLE Classic OSX', 'name2': ''}})
+        eq(d.keys_message['text'], '')
+        eq(d.load_keys_list.called, 3)
+        eq(d.load_keys_list.args, ('IDLE Classic OSX', ))
+
+    def test_custom_name(self):
+        d = dialog
+
+        # If no selections, doesn't get added.
+        d.customlist.SetMenu([], '- no custom keys -')
+        self.assertNotIn('Keys', mainpage)
+        self.assertEqual(d.load_keys_list.called, 0)
+
+        # Custom name selected.
+        changes.clear()
+        d.customlist.SetMenu(['a', 'b', 'c'], 'c')
+        self.assertEqual(mainpage, {'Keys': {'name': 'c'}})
+        self.assertEqual(d.load_keys_list.called, 1)
+
+    def test_keybinding(self):
+        d = dialog
+        d.custom_name.set('my custom keys')
+        d.bindingslist.delete(0, 'end')
+        d.bindingslist.insert(0, 'copy')
+        d.bindingslist.insert(1, 'expand-word')
+        d.bindingslist.selection_set(0)
+        d.bindingslist.selection_anchor(0)
+        # Core binding - adds to keys.
+        d.keybinding.set('<Key-F11>')
+        self.assertEqual(keyspage,
+                         {'my custom keys': {'copy': '<Key-F11>'}})
+        # Not a core binding - adds to extensions.
+        d.bindingslist.selection_set(1)
+        d.bindingslist.selection_anchor(1)
+        d.keybinding.set('<Key-F11>')
+        self.assertEqual(extpage,
+                         {'AutoExpand_cfgBindings': {'expand-word': '<Key-F11>'}})
+
+    def test_set_keys_type(self):
+        eq = self.assertEqual
+        d = dialog
+        del d.set_keys_type
+
+        # Builtin keyset selected.
+        d.keyset_source.set(True)
+        d.set_keys_type()
+        eq(d.builtinlist['state'], NORMAL)
+        eq(d.customlist['state'], DISABLED)
+        eq(d.button_delete_custom_keys['state'], DISABLED)
+
+        # Custom keyset selected.
+        d.keyset_source.set(False)
+        d.set_keys_type()
+        eq(d.builtinlist['state'], DISABLED)
+        eq(d.custom_keyset_on['state'], NORMAL)
+        eq(d.customlist['state'], NORMAL)
+        eq(d.button_delete_custom_keys['state'], NORMAL)
+        d.set_keys_type = Func()
+
+    def test_get_new_keys(self):
+        eq = self.assertEqual
+        d = dialog
+        orig_getkeysdialog = configdialog.GetKeysDialog
+        gkd = configdialog.GetKeysDialog = Func(return_self=True)
+        gnkn = d.get_new_keys_name = Func()
+
+        d.button_new_keys['state'] = NORMAL
+        d.bindingslist.delete(0, 'end')
+        d.bindingslist.insert(0, 'copy - <Control-Shift-Key-C>')
+        d.bindingslist.selection_set(0)
+        d.bindingslist.selection_anchor(0)
+        d.keybinding.set('Key-a')
+        d.keyset_source.set(True)  # Default keyset.
+
+        # Default keyset; no change to binding.
+        gkd.result = ''
+        d.button_new_keys.invoke()
+        eq(d.bindingslist.get('anchor'), 'copy - <Control-Shift-Key-C>')
+        # Keybinding isn't changed when there isn't a change entered.
+        eq(d.keybinding.get(), 'Key-a')
+
+        # Default keyset; binding changed.
+        gkd.result = '<Key-F11>'
+        # No keyset name selected therefore binding not saved.
+        gnkn.result = ''
+        d.button_new_keys.invoke()
+        eq(gnkn.called, 1)
+        eq(d.bindingslist.get('anchor'), 'copy - <Control-Shift-Key-C>')
+        # Keyset name selected.
+        gnkn.result = 'My New Key Set'
+        d.button_new_keys.invoke()
+        eq(d.custom_name.get(), gnkn.result)
+        eq(d.bindingslist.get('anchor'), 'copy - <Key-F11>')
+        eq(d.keybinding.get(), '<Key-F11>')
+
+        # User keyset; binding changed.
+        d.keyset_source.set(False)  # Custom keyset.
+        gnkn.called = 0
+        gkd.result = '<Key-p>'
+        d.button_new_keys.invoke()
+        eq(gnkn.called, 0)
+        eq(d.bindingslist.get('anchor'), 'copy - <Key-p>')
+        eq(d.keybinding.get(), '<Key-p>')
+
+        del d.get_new_keys_name
+        configdialog.GetKeysDialog = orig_getkeysdialog
+
+    def test_get_new_keys_name(self):
+        orig_sectionname = configdialog.SectionName
+        sn = configdialog.SectionName = Func(return_self=True)
+        d = dialog
+
+        sn.result = 'New Keys'
+        self.assertEqual(d.get_new_keys_name(''), 'New Keys')
+
+        configdialog.SectionName = orig_sectionname
+
+    def test_save_as_new_key_set(self):
+        d = dialog
+        gnkn = d.get_new_keys_name = Func()
+        d.keyset_source.set(True)
+
+        # No name entered.
+        gnkn.result = ''
+        d.button_save_custom_keys.invoke()
+
+        # Name entered.
+        gnkn.result = 'my new key set'
+        gnkn.called = 0
+        self.assertNotIn(gnkn.result, idleConf.userCfg['keys'])
+        d.button_save_custom_keys.invoke()
+        self.assertIn(gnkn.result, idleConf.userCfg['keys'])
+
+        del d.get_new_keys_name
+
+    def test_on_bindingslist_select(self):
+        d = dialog
+        b = d.bindingslist
+        b.delete(0, 'end')
+        b.insert(0, 'copy')
+        b.insert(1, 'find')
+        b.activate(0)
+
+        b.focus_force()
+        b.see(1)
+        b.update()
+        x, y, dx, dy = b.bbox(1)
+        x += dx // 2
+        y += dy // 2
+        b.event_generate('<Enter>', x=0, y=0)
+        b.event_generate('<Motion>', x=x, y=y)
+        b.event_generate('<Button-1>', x=x, y=y)
+        b.event_generate('<ButtonRelease-1>', x=x, y=y)
+        self.assertEqual(b.get('anchor'), 'find')
+        self.assertEqual(d.button_new_keys['state'], NORMAL)
+
+    def test_create_new_key_set_and_save_new_key_set(self):
+        eq = self.assertEqual
+        d = dialog
+
+        # Use default as previously active keyset.
+        d.keyset_source.set(True)
+        d.builtin_name.set('IDLE Classic Windows')
+        first_new = 'my new custom key set'
+        second_new = 'my second custom keyset'
+
+        # No changes, so keysets are an exact copy.
+        self.assertNotIn(first_new, idleConf.userCfg)
+        d.create_new_key_set(first_new)
+        eq(idleConf.GetSectionList('user', 'keys'), [first_new])
+        eq(idleConf.GetKeySet('IDLE Classic Windows'),
+           idleConf.GetKeySet(first_new))
+        eq(d.custom_name.get(), first_new)
+        self.assertFalse(d.keyset_source.get())  # Use custom set.
+        eq(d.set_keys_type.called, 1)
+
+        # Test that changed keybindings are in new keyset.
+        changes.add_option('keys', first_new, 'copy', '<Key-F11>')
+        self.assertNotIn(second_new, idleConf.userCfg)
+        d.create_new_key_set(second_new)
+        eq(idleConf.GetSectionList('user', 'keys'), [first_new, second_new])
+        self.assertNotEqual(idleConf.GetKeySet(first_new),
+                            idleConf.GetKeySet(second_new))
+        # Check that difference in keysets was in option `copy` from `changes`.
+        idleConf.SetOption('keys', first_new, 'copy', '<Key-F11>')
+        eq(idleConf.GetKeySet(first_new), idleConf.GetKeySet(second_new))
+
+    def test_load_keys_list(self):
+        eq = self.assertEqual
+        d = dialog
+        gks = idleConf.GetKeySet = Func()
+        del d.load_keys_list
+        b = d.bindingslist
+
+        b.delete(0, 'end')
+        b.insert(0, '<<find>>')
+        b.insert(1, '<<help>>')
+        gks.result = {'<<copy>>': ['<Control-Key-c>', '<Control-Key-C>'],
+                      '<<force-open-completions>>': ['<Control-Key-space>'],
+                      '<<spam>>': ['<Key-F11>']}
+        changes.add_option('keys', 'my keys', 'spam', '<Shift-Key-a>')
+        expected = ('copy - <Control-Key-c> <Control-Key-C>',
+                    'force-open-completions - <Control-Key-space>',
+                    'spam - <Shift-Key-a>')
+
+        # No current selection.
+        d.load_keys_list('my keys')
+        eq(b.get(0, 'end'), expected)
+        eq(b.get('anchor'), '')
+        eq(b.curselection(), ())
+
+        # Check selection.
+        b.selection_set(1)
+        b.selection_anchor(1)
+        d.load_keys_list('my keys')
+        eq(b.get(0, 'end'), expected)
+        eq(b.get('anchor'), 'force-open-completions - <Control-Key-space>')
+        eq(b.curselection(), (1, ))
+
+        # Change selection.
+        b.selection_set(2)
+        b.selection_anchor(2)
+        d.load_keys_list('my keys')
+        eq(b.get(0, 'end'), expected)
+        eq(b.get('anchor'), 'spam - <Shift-Key-a>')
+        eq(b.curselection(), (2, ))
+        d.load_keys_list = Func()
+
+        del idleConf.GetKeySet
+
+    def test_delete_custom_keys(self):
+        eq = self.assertEqual
+        d = dialog
+        d.button_delete_custom_keys['state'] = NORMAL
+        yesno = configdialog.tkMessageBox.askyesno = Func()
+        d.deactivate_current_config = Func()
+        d.activate_config_changes = Func()
+
+        keyset_name = 'spam key set'
+        idleConf.userCfg['keys'].SetOption(keyset_name, 'name', 'value')
+        keyspage[keyset_name] = {'option': 'True'}
+
+        # Force custom keyset.
+        d.keyset_source.set(False)
+        d.custom_name.set(keyset_name)
+
+        # Cancel deletion.
+        yesno.result = False
+        d.button_delete_custom_keys.invoke()
+        eq(yesno.called, 1)
+        eq(keyspage[keyset_name], {'option': 'True'})
+        eq(idleConf.GetSectionList('user', 'keys'), ['spam key set'])
+        eq(d.deactivate_current_config.called, 0)
+        eq(d.activate_config_changes.called, 0)
+        eq(d.set_keys_type.called, 0)
+
+        # Confirm deletion.
+        yesno.result = True
+        d.button_delete_custom_keys.invoke()
+        eq(yesno.called, 2)
+        self.assertNotIn(keyset_name, keyspage)
+        eq(idleConf.GetSectionList('user', 'keys'), [])
+        eq(d.custom_keyset_on['state'], DISABLED)
+        eq(d.custom_name.get(), '- no custom keys -')
+        eq(d.deactivate_current_config.called, 1)
+        eq(d.activate_config_changes.called, 1)
+        eq(d.set_keys_type.called, 1)
+
+        del d.activate_config_changes, d.deactivate_current_config
+        del configdialog.tkMessageBox.askyesno
+
 
 class GenPageTest(unittest.TestCase):
     """Test that general tab widgets enable users to make changes.
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-03-17-54-02.bpo-31002.kUSgTE.rst b/Misc/NEWS.d/next/IDLE/2017-08-03-17-54-02.bpo-31002.kUSgTE.rst
new file mode 100644
index 00000000000..1708be72b8b
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-03-17-54-02.bpo-31002.kUSgTE.rst
@@ -0,0 +1 @@
+Add tests for configdialog keys tab. Patch by Cheryl Sabella.


From webhook-mailer at python.org  Tue Aug 15 04:33:47 2017
From: webhook-mailer at python.org (Christian Heimes)
Date: Tue, 15 Aug 2017 08:33:47 -0000
Subject: [Python-checkins] bpo-30714: ALPN changes for OpenSSL 1.1.0f (#2305)
Message-ID: <mailman.11.1502786028.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/7b40cb7293cb14e5c7c8ed123efaf9acb33edae2
commit: 7b40cb7293cb14e5c7c8ed123efaf9acb33edae2
branch: master
author: Christian Heimes <christian at python.org>
committer: GitHub <noreply at github.com>
date: 2017-08-15T10:33:43+02:00
summary:

bpo-30714: ALPN changes for OpenSSL 1.1.0f (#2305)

OpenSSL 1.1.0 to 1.1.0e aborted the handshake when server and client
could not agree on a protocol using ALPN. OpenSSL 1.1.0f changed that.
The most recent version now behaves like OpenSSL 1.0.2 again. The ALPN
callback can pretend to not been set.

See https://github.com/openssl/openssl/pull/3158 for more details

Signed-off-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst
M Doc/library/ssl.rst
M Lib/test/test_ssl.py

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 729a239a1ba..0a09e7e9d4c 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1447,8 +1447,9 @@ to speed up repeated connections from the same clients.
    This method will raise :exc:`NotImplementedError` if :data:`HAS_ALPN` is
    False.
 
-   OpenSSL 1.1.0+ will abort the handshake and raise :exc:`SSLError` when
-   both sides support ALPN but cannot agree on a protocol.
+   OpenSSL 1.1.0 to 1.1.0e will abort the handshake and raise :exc:`SSLError`
+   when both sides support ALPN but cannot agree on a protocol. 1.1.0f+
+   behaves like 1.0.2, :meth:`SSLSocket.selected_alpn_protocol` returns None.
 
    .. versionadded:: 3.5
 
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index d960d820650..104b7f377a5 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -3268,8 +3268,9 @@ def test_alpn_protocols(self):
                 except ssl.SSLError as e:
                     stats = e
 
-                if expected is None and IS_OPENSSL_1_1:
-                    # OpenSSL 1.1.0 raises handshake error
+                if (expected is None and IS_OPENSSL_1_1
+                        and ssl.OPENSSL_VERSION_INFO < (1, 1, 0, 6)):
+                    # OpenSSL 1.1.0 to 1.1.0e raises handshake error
                     self.assertIsInstance(stats, ssl.SSLError)
                 else:
                     msg = "failed trying %s (s) and %s (c).\n" \
diff --git a/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst b/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst
new file mode 100644
index 00000000000..88394e585c5
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst
@@ -0,0 +1,2 @@
+Address ALPN callback changes for OpenSSL 1.1.0f. The latest version behaves
+like OpenSSL 1.0.2 and no longer aborts handshake.


From webhook-mailer at python.org  Tue Aug 15 04:45:45 2017
From: webhook-mailer at python.org (Christian Heimes)
Date: Tue, 15 Aug 2017 08:45:45 -0000
Subject: [Python-checkins] [3.6] bpo-30714: ALPN changes for OpenSSL 1.1.0f
 (#3093)
Message-ID: <mailman.12.1502786746.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/7f6a13bd562ff6a265fc63a991327feaecb07a77
commit: 7f6a13bd562ff6a265fc63a991327feaecb07a77
branch: 3.6
author: Christian Heimes <christian at python.org>
committer: GitHub <noreply at github.com>
date: 2017-08-15T10:45:40+02:00
summary:

[3.6] bpo-30714: ALPN changes for OpenSSL 1.1.0f (#3093)

OpenSSL 1.1.0 to 1.1.0e aborted the handshake when server and client
could not agree on a protocol using ALPN. OpenSSL 1.1.0f changed that.
The most recent version now behaves like OpenSSL 1.0.2 again. The ALPN
callback can pretend to not been set.

See https://github.com/openssl/openssl/pull/3158 for more details

Signed-off-by: Christian Heimes <christian at python.org>
(cherry picked from commit a5c1bab352671e043645163ca50c5211aa657acd)

files:
A Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst
M Doc/library/ssl.rst
M Lib/test/test_ssl.py

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 6c30a74a099..357f65a3faf 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1442,8 +1442,9 @@ to speed up repeated connections from the same clients.
    This method will raise :exc:`NotImplementedError` if :data:`HAS_ALPN` is
    False.
 
-   OpenSSL 1.1.0+ will abort the handshake and raise :exc:`SSLError` when
-   both sides support ALPN but cannot agree on a protocol.
+   OpenSSL 1.1.0 to 1.1.0e will abort the handshake and raise :exc:`SSLError`
+   when both sides support ALPN but cannot agree on a protocol. 1.1.0f+
+   behaves like 1.0.2, :meth:`SSLSocket.selected_alpn_protocol` returns None.
 
    .. versionadded:: 3.5
 
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 85c59a618ce..3fdbba13705 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -3258,8 +3258,9 @@ def test_alpn_protocols(self):
                 except ssl.SSLError as e:
                     stats = e
 
-                if expected is None and IS_OPENSSL_1_1:
-                    # OpenSSL 1.1.0 raises handshake error
+                if (expected is None and IS_OPENSSL_1_1
+                        and ssl.OPENSSL_VERSION_INFO < (1, 1, 0, 6)):
+                    # OpenSSL 1.1.0 to 1.1.0e raises handshake error
                     self.assertIsInstance(stats, ssl.SSLError)
                 else:
                     msg = "failed trying %s (s) and %s (c).\n" \
diff --git a/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst b/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst
new file mode 100644
index 00000000000..88394e585c5
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst
@@ -0,0 +1,2 @@
+Address ALPN callback changes for OpenSSL 1.1.0f. The latest version behaves
+like OpenSSL 1.0.2 and no longer aborts handshake.


From webhook-mailer at python.org  Tue Aug 15 04:55:06 2017
From: webhook-mailer at python.org (Christian Heimes)
Date: Tue, 15 Aug 2017 08:55:06 -0000
Subject: [Python-checkins] [2.7] bpo-30714: ALPN changes for OpenSSL 1.1.0f
 (#3094)
Message-ID: <mailman.13.1502787308.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/05b7d9c6675b71d17f5fcf379b3888fba431f14e
commit: 05b7d9c6675b71d17f5fcf379b3888fba431f14e
branch: 2.7
author: Christian Heimes <christian at python.org>
committer: GitHub <noreply at github.com>
date: 2017-08-15T10:55:03+02:00
summary:

[2.7] bpo-30714: ALPN changes for OpenSSL 1.1.0f (#3094)

OpenSSL 1.1.0 to 1.1.0e aborted the handshake when server and client
could not agree on a protocol using ALPN. OpenSSL 1.1.0f changed that.
The most recent version now behaves like OpenSSL 1.0.2 again. The ALPN
callback can pretend to not been set.

See https://github.com/openssl/openssl/pull/3158 for more details

Signed-off-by: Christian Heimes <christian at python.org>
(cherry picked from commit a5c1bab352671e043645163ca50c5211aa657acd)

files:
A Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst
M Doc/library/ssl.rst
M Lib/test/test_ssl.py

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 8b41317eb20..183c17bb560 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1162,8 +1162,9 @@ to speed up repeated connections from the same clients.
    This method will raise :exc:`NotImplementedError` if :data:`HAS_ALPN` is
    False.
 
-   OpenSSL 1.1.0+ will abort the handshake and raise :exc:`SSLError` when
-   both sides support ALPN but cannot agree on a protocol.
+   OpenSSL 1.1.0 to 1.1.0e will abort the handshake and raise :exc:`SSLError`
+   when both sides support ALPN but cannot agree on a protocol. 1.1.0f+
+   behaves like 1.0.2, :meth:`SSLSocket.selected_alpn_protocol` returns None.
 
    .. versionadded:: 2.7.10
 
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 2f98cf14550..07526c2cf15 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -2966,8 +2966,9 @@ def test_alpn_protocols(self):
                 except ssl.SSLError as e:
                     stats = e
 
-                if expected is None and IS_OPENSSL_1_1:
-                    # OpenSSL 1.1.0 raises handshake error
+                if (expected is None and IS_OPENSSL_1_1
+                        and ssl.OPENSSL_VERSION_INFO < (1, 1, 0, 6)):
+                    # OpenSSL 1.1.0 to 1.1.0e raises handshake error
                     self.assertIsInstance(stats, ssl.SSLError)
                 else:
                     msg = "failed trying %s (s) and %s (c).\n" \
diff --git a/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst b/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst
new file mode 100644
index 00000000000..88394e585c5
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst
@@ -0,0 +1,2 @@
+Address ALPN callback changes for OpenSSL 1.1.0f. The latest version behaves
+like OpenSSL 1.0.2 and no longer aborts handshake.


From solipsis at pitrou.net  Tue Aug 15 05:05:49 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 15 Aug 2017 09:05:49 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=7
Message-ID: <20170815090547.31198.AACA8CC125C83074@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_asyncio leaked [0, 3, 0] memory blocks, sum=3
test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_fork leaked [-2, 2, 0] memory blocks, sum=0


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflog9jgpZ5', '--timeout', '7200']

From webhook-mailer at python.org  Tue Aug 15 12:04:22 2017
From: webhook-mailer at python.org (Brett Cannon)
Date: Tue, 15 Aug 2017 16:04:22 -0000
Subject: [Python-checkins] fix grammr in error messages in overlapped.c
 (GH-3095)
Message-ID: <mailman.14.1502813063.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/d83c23b2dbe91924d0070a72ffe831d0c15d956d
commit: d83c23b2dbe91924d0070a72ffe831d0c15d956d
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Brett Cannon <brettcannon at users.noreply.github.com>
date: 2017-08-15T09:04:18-07:00
summary:

fix grammr in error messages in overlapped.c (GH-3095)

files:
M Modules/overlapped.c

diff --git a/Modules/overlapped.c b/Modules/overlapped.c
index 0aa8657898d..4390e9ae93c 100644
--- a/Modules/overlapped.c
+++ b/Modules/overlapped.c
@@ -837,7 +837,7 @@ Overlapped_WriteFile(OverlappedObject *self, PyObject *args)
 #if SIZEOF_SIZE_T > SIZEOF_LONG
     if (self->write_buffer.len > (Py_ssize_t)ULONG_MAX) {
         PyBuffer_Release(&self->write_buffer);
-        PyErr_SetString(PyExc_ValueError, "buffer to large");
+        PyErr_SetString(PyExc_ValueError, "buffer too large");
         return NULL;
     }
 #endif
@@ -893,7 +893,7 @@ Overlapped_WSASend(OverlappedObject *self, PyObject *args)
 #if SIZEOF_SIZE_T > SIZEOF_LONG
     if (self->write_buffer.len > (Py_ssize_t)ULONG_MAX) {
         PyBuffer_Release(&self->write_buffer);
-        PyErr_SetString(PyExc_ValueError, "buffer to large");
+        PyErr_SetString(PyExc_ValueError, "buffer too large");
         return NULL;
     }
 #endif


From webhook-mailer at python.org  Tue Aug 15 13:21:37 2017
From: webhook-mailer at python.org (Steve Dower)
Date: Tue, 15 Aug 2017 17:21:37 -0000
Subject: [Python-checkins] Add Windows team as a codeowner for
 Windows-specific files (#3089)
Message-ID: <mailman.15.1502817698.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/1f512b9a344b5053c013cf0a116b3562d426ef2b
commit: 1f512b9a344b5053c013cf0a116b3562d426ef2b
branch: master
author: Steve Dower <steve.dower at microsoft.com>
committer: GitHub <noreply at github.com>
date: 2017-08-15T10:21:34-07:00
summary:

Add Windows team as a codeowner for Windows-specific files (#3089)

files:
M .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cdb9feee57b..447b4ef08b7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -29,3 +29,11 @@
 
 # subprocess
 **/*subprocess*               @gpshead
+
+# Windows
+/PC/                          @python/windows-team
+/PCBuild/                     @python/windows-team
+
+# Windows installer packages
+/Tools/msi/                   @python/windows-team
+/Tools/nuget/                 @python/windows-team


From webhook-mailer at python.org  Tue Aug 15 18:26:36 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Tue, 15 Aug 2017 22:26:36 -0000
Subject: [Python-checkins] bpo-31205: IDLE: Factor KeysPage class from
 ConfigDialog (#3096)
Message-ID: <mailman.16.1502835997.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/e36d9f5568093b3885da62a0bf0fdfbe3771672b
commit: e36d9f5568093b3885da62a0bf0fdfbe3771672b
branch: master
author: Cheryl Sabella <cheryl.sabella at gmail.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-08-15T18:26:23-04:00
summary:

bpo-31205: IDLE: Factor KeysPage class from ConfigDialog (#3096)

  The slightly modified tests continue to pass.  Patch by Cheryl Sabella.

files:
A Misc/NEWS.d/next/IDLE/2017-08-15-12-58-23.bpo-31205.iuziZ5.rst
M Lib/idlelib/configdialog.py
M Lib/idlelib/idle_test/test_configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 66219f1820e..e1ac82b7df3 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -92,9 +92,9 @@ def create_widgets(self):
             note: Notebook
             highpage: self.create_page_highlight
             fontpage: FontPage
-            keyspage: self.create_page_keys
+            keyspage: KeysPage
             genpage: GenPage
-            extpageL self.create_page_extensions
+            extpage: self.create_page_extensions
 
         Methods:
             create_action_buttons
@@ -104,7 +104,7 @@ def create_widgets(self):
         self.note = note = Notebook(self, width=450, height=450)
         self.highpage = self.create_page_highlight()
         self.fontpage = FontPage(note, self.highpage)
-        self.keyspage = self.create_page_keys()
+        self.keyspage = KeysPage(note)
         self.genpage = GenPage(note)
         self.extpage = self.create_page_extensions()
         note.add(self.fontpage, text='Fonts/Tabs')
@@ -132,7 +132,7 @@ def load_configs(self):
         #self.load_font_cfg()
         #self.load_tab_cfg()
         self.load_theme_cfg()
-        self.load_key_cfg()
+        # self.load_key_cfg()
         # self.load_general_cfg()
         # note: extension page handled separately
 
@@ -791,863 +791,869 @@ def delete_custom_theme(self):
         self.activate_config_changes()
         self.set_theme_type()
 
+    def deactivate_current_config(self):
+        """Remove current key bindings.
 
-    def create_page_keys(self):
-        """Return frame of widgets for Keys tab.
+        Iterate over window instances defined in parent and remove
+        the keybindings.
+        """
+        # Before a config is saved, some cleanup of current
+        # config must be done - remove the previous keybindings.
+        win_instances = self.parent.instance_dict.keys()
+        for instance in win_instances:
+            instance.RemoveKeybindings()
 
-        Enable users to provisionally change both individual and sets of
-        keybindings (shortcut keys). Except for features implemented as
-        extensions, keybindings are stored in complete sets called
-        keysets. Built-in keysets in idlelib/config-keys.def are fixed
-        as far as the dialog is concerned. Any keyset can be used as the
-        base for a new custom keyset, stored in .idlerc/config-keys.cfg.
+    def activate_config_changes(self):
+        """Apply configuration changes to current windows.
 
-        Function load_key_cfg() initializes tk variables and keyset
-        lists and calls load_keys_list for the current keyset.
-        Radiobuttons builtin_keyset_on and custom_keyset_on toggle var
-        keyset_source, which controls if the current set of keybindings
-        are from a builtin or custom keyset. DynOptionMenus builtinlist
-        and customlist contain lists of the builtin and custom keysets,
-        respectively, and the current item from each list is stored in
-        vars builtin_name and custom_name.
+        Dynamically update the current parent window instances
+        with some of the configuration changes.
+        """
+        win_instances = self.parent.instance_dict.keys()
+        for instance in win_instances:
+            instance.ResetColorizer()
+            instance.ResetFont()
+            instance.set_notabs_indentwidth()
+            instance.ApplyKeybindings()
+            instance.reset_help_menu_entries()
 
-        Button delete_custom_keys invokes delete_custom_keys() to delete
-        a custom keyset from idleConf.userCfg['keys'] and changes.  Button
-        save_custom_keys invokes save_as_new_key_set() which calls
-        get_new_keys_name() and create_new_key_set() to save a custom keyset
-        and its keybindings to idleConf.userCfg['keys'].
+    def create_page_extensions(self):
+        """Part of the config dialog used for configuring IDLE extensions.
 
-        Listbox bindingslist contains all of the keybindings for the
-        selected keyset.  The keybindings are loaded in load_keys_list()
-        and are pairs of (event, [keys]) where keys can be a list
-        of one or more key combinations to bind to the same event.
-        Mouse button 1 click invokes on_bindingslist_select(), which
-        allows button_new_keys to be clicked.
+        This code is generic - it works for any and all IDLE extensions.
 
-        So, an item is selected in listbindings, which activates
-        button_new_keys, and clicking button_new_keys calls function
-        get_new_keys().  Function get_new_keys() gets the key mappings from the
-        current keyset for the binding event item that was selected.  The
-        function then displays another dialog, GetKeysDialog, with the
-        selected binding event and current keys and always new key sequences
-        to be entered for that binding event.  If the keys aren't
-        changed, nothing happens.  If the keys are changed and the keyset
-        is a builtin, function get_new_keys_name() will be called
-        for input of a custom keyset name.  If no name is given, then the
-        change to the keybinding will abort and no updates will be made.  If
-        a custom name is entered in the prompt or if the current keyset was
-        already custom (and thus didn't require a prompt), then
-        idleConf.userCfg['keys'] is updated in function create_new_key_set()
-        with the change to the event binding.  The item listing in bindingslist
-        is updated with the new keys.  Var keybinding is also set which invokes
-        the callback function, var_changed_keybinding, to add the change to
-        the 'keys' or 'extensions' changes tracker based on the binding type.
+        IDLE extensions save their configuration options using idleConf.
+        This code reads the current configuration using idleConf, supplies a
+        GUI interface to change the configuration values, and saves the
+        changes using idleConf.
 
-        Tk Variables:
-            keybinding: Action/key bindings.
+        Not all changes take effect immediately - some may require restarting IDLE.
+        This depends on each extension's implementation.
 
-        Methods:
-            load_keys_list: Reload active set.
-            create_new_key_set: Combine active keyset and changes.
-            set_keys_type: Command for keyset_source.
-            save_new_key_set: Save to idleConf.userCfg['keys'] (is function).
-            deactivate_current_config: Remove keys bindings in editors.
+        All values are treated as text, and it is up to the user to supply
+        reasonable values. The only exception to this are the 'enable*' options,
+        which are boolean, and can be toggled with a True/False button.
 
-        Widgets for keys page frame:  (*) widgets bound to self
-            frame_key_sets: LabelFrame
-                frames[0]: Frame
-                    (*)builtin_keyset_on: Radiobutton - var keyset_source
-                    (*)custom_keyset_on: Radiobutton - var keyset_source
-                    (*)builtinlist: DynOptionMenu - var builtin_name,
-                            func keybinding_selected
-                    (*)customlist: DynOptionMenu - var custom_name,
-                            func keybinding_selected
-                    (*)keys_message: Label
-                frames[1]: Frame
-                    (*)button_delete_custom_keys: Button - delete_custom_keys
-                    (*)button_save_custom_keys: Button -  save_as_new_key_set
-            frame_custom: LabelFrame
-                frame_target: Frame
-                    target_title: Label
-                    scroll_target_y: Scrollbar
-                    scroll_target_x: Scrollbar
-                    (*)bindingslist: ListBox - on_bindingslist_select
-                    (*)button_new_keys: Button - get_new_keys & ..._name
+        Methods:
+            load_extensions:
+            extension_selected: Handle selection from list.
+            create_extension_frame: Hold widgets for one extension.
+            set_extension_value: Set in userCfg['extensions'].
+            save_all_changed_extensions: Call extension page Save().
         """
         parent = self.parent
-        self.builtin_name = tracers.add(
-                StringVar(parent), self.var_changed_builtin_name)
-        self.custom_name = tracers.add(
-                StringVar(parent), self.var_changed_custom_name)
-        self.keyset_source = tracers.add(
-                BooleanVar(parent), self.var_changed_keyset_source)
-        self.keybinding = tracers.add(
-                StringVar(parent), self.var_changed_keybinding)
-
-        # Widget creation:
-        # body and section frames.
         frame = Frame(self.note)
-        frame_custom = LabelFrame(
-                frame, borderwidth=2, relief=GROOVE,
-                text=' Custom Key Bindings ')
-        frame_key_sets = LabelFrame(
-                frame, borderwidth=2, relief=GROOVE, text=' Key Set ')
-        #frame_custom
-        frame_target = Frame(frame_custom)
-        target_title = Label(frame_target, text='Action - Key(s)')
-        scroll_target_y = Scrollbar(frame_target)
-        scroll_target_x = Scrollbar(frame_target, orient=HORIZONTAL)
-        self.bindingslist = Listbox(
-                frame_target, takefocus=FALSE, exportselection=FALSE)
-        self.bindingslist.bind('<ButtonRelease-1>',
-                               self.on_bindingslist_select)
-        scroll_target_y['command'] = self.bindingslist.yview
-        scroll_target_x['command'] = self.bindingslist.xview
-        self.bindingslist['yscrollcommand'] = scroll_target_y.set
-        self.bindingslist['xscrollcommand'] = scroll_target_x.set
-        self.button_new_keys = Button(
-                frame_custom, text='Get New Keys for Selection',
-                command=self.get_new_keys, state=DISABLED)
-        #frame_key_sets
-        frames = [Frame(frame_key_sets, padx=2, pady=2, borderwidth=0)
-                  for i in range(2)]
-        self.builtin_keyset_on = Radiobutton(
-                frames[0], variable=self.keyset_source, value=1,
-                command=self.set_keys_type, text='Use a Built-in Key Set')
-        self.custom_keyset_on = Radiobutton(
-                frames[0], variable=self.keyset_source, value=0,
-                command=self.set_keys_type, text='Use a Custom Key Set')
-        self.builtinlist = DynOptionMenu(
-                frames[0], self.builtin_name, None, command=None)
-        self.customlist = DynOptionMenu(
-                frames[0], self.custom_name, None, command=None)
-        self.button_delete_custom_keys = Button(
-                frames[1], text='Delete Custom Key Set',
-                command=self.delete_custom_keys)
-        self.button_save_custom_keys = Button(
-                frames[1], text='Save as New Custom Key Set',
-                command=self.save_as_new_key_set)
-        self.keys_message = Label(frames[0], bd=2)
+        self.ext_defaultCfg = idleConf.defaultCfg['extensions']
+        self.ext_userCfg = idleConf.userCfg['extensions']
+        self.is_int = self.register(is_int)
+        self.load_extensions()
+        # Create widgets - a listbox shows all available extensions, with the
+        # controls for the extension selected in the listbox to the right.
+        self.extension_names = StringVar(self)
+        frame.rowconfigure(0, weight=1)
+        frame.columnconfigure(2, weight=1)
+        self.extension_list = Listbox(frame, listvariable=self.extension_names,
+                                      selectmode='browse')
+        self.extension_list.bind('<<ListboxSelect>>', self.extension_selected)
+        scroll = Scrollbar(frame, command=self.extension_list.yview)
+        self.extension_list.yscrollcommand=scroll.set
+        self.details_frame = LabelFrame(frame, width=250, height=250)
+        self.extension_list.grid(column=0, row=0, sticky='nws')
+        scroll.grid(column=1, row=0, sticky='ns')
+        self.details_frame.grid(column=2, row=0, sticky='nsew', padx=[10, 0])
+        frame.configure(padx=10, pady=10)
+        self.config_frame = {}
+        self.current_extension = None
+
+        self.outerframe = self                      # TEMPORARY
+        self.tabbed_page_set = self.extension_list  # TEMPORARY
+
+        # Create the frame holding controls for each extension.
+        ext_names = ''
+        for ext_name in sorted(self.extensions):
+            self.create_extension_frame(ext_name)
+            ext_names = ext_names + '{' + ext_name + '} '
+        self.extension_names.set(ext_names)
+        self.extension_list.selection_set(0)
+        self.extension_selected(None)
 
-        ##widget packing
-        #body
-        frame_custom.pack(side=BOTTOM, padx=5, pady=5, expand=TRUE, fill=BOTH)
-        frame_key_sets.pack(side=BOTTOM, padx=5, pady=5, fill=BOTH)
-        #frame_custom
-        self.button_new_keys.pack(side=BOTTOM, fill=X, padx=5, pady=5)
-        frame_target.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
-        #frame target
-        frame_target.columnconfigure(0, weight=1)
-        frame_target.rowconfigure(1, weight=1)
-        target_title.grid(row=0, column=0, columnspan=2, sticky=W)
-        self.bindingslist.grid(row=1, column=0, sticky=NSEW)
-        scroll_target_y.grid(row=1, column=1, sticky=NS)
-        scroll_target_x.grid(row=2, column=0, sticky=EW)
-        #frame_key_sets
-        self.builtin_keyset_on.grid(row=0, column=0, sticky=W+NS)
-        self.custom_keyset_on.grid(row=1, column=0, sticky=W+NS)
-        self.builtinlist.grid(row=0, column=1, sticky=NSEW)
-        self.customlist.grid(row=1, column=1, sticky=NSEW)
-        self.keys_message.grid(row=0, column=2, sticky=NSEW, padx=5, pady=5)
-        self.button_delete_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
-        self.button_save_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
-        frames[0].pack(side=TOP, fill=BOTH, expand=True)
-        frames[1].pack(side=TOP, fill=X, expand=True, pady=2)
         return frame
 
-    def load_key_cfg(self):
-        "Load current configuration settings for the keybinding options."
-        # Set current keys type radiobutton.
-        self.keyset_source.set(idleConf.GetOption(
-                'main', 'Keys', 'default', type='bool', default=1))
-        # Set current keys.
-        current_option = idleConf.CurrentKeys()
-        # Load available keyset option menus.
-        if self.keyset_source.get():  # Default theme selected.
-            item_list = idleConf.GetSectionList('default', 'keys')
-            item_list.sort()
-            self.builtinlist.SetMenu(item_list, current_option)
-            item_list = idleConf.GetSectionList('user', 'keys')
-            item_list.sort()
-            if not item_list:
-                self.custom_keyset_on['state'] = DISABLED
-                self.custom_name.set('- no custom keys -')
-            else:
-                self.customlist.SetMenu(item_list, item_list[0])
-        else:  # User key set selected.
-            item_list = idleConf.GetSectionList('user', 'keys')
-            item_list.sort()
-            self.customlist.SetMenu(item_list, current_option)
-            item_list = idleConf.GetSectionList('default', 'keys')
-            item_list.sort()
-            self.builtinlist.SetMenu(item_list, idleConf.default_keys())
-        self.set_keys_type()
-        # Load keyset element list.
-        keyset_name = idleConf.CurrentKeys()
-        self.load_keys_list(keyset_name)
+    def load_extensions(self):
+        "Fill self.extensions with data from the default and user configs."
+        self.extensions = {}
+        for ext_name in idleConf.GetExtensions(active_only=False):
+            self.extensions[ext_name] = []
 
-    def var_changed_builtin_name(self, *params):
-        "Process selection of builtin key set."
-        old_keys = (
-            'IDLE Classic Windows',
-            'IDLE Classic Unix',
-            'IDLE Classic Mac',
-            'IDLE Classic OSX',
-        )
-        value = self.builtin_name.get()
-        if value not in old_keys:
-            if idleConf.GetOption('main', 'Keys', 'name') not in old_keys:
-                changes.add_option('main', 'Keys', 'name', old_keys[0])
-            changes.add_option('main', 'Keys', 'name2', value)
-            self.keys_message['text'] = 'New key set, see Help'
-            self.keys_message['fg'] = '#500000'
-        else:
-            changes.add_option('main', 'Keys', 'name', value)
-            changes.add_option('main', 'Keys', 'name2', '')
-            self.keys_message['text'] = ''
-            self.keys_message['fg'] = 'black'
-        self.load_keys_list(value)
+        for ext_name in self.extensions:
+            opt_list = sorted(self.ext_defaultCfg.GetOptionList(ext_name))
 
-    def var_changed_custom_name(self, *params):
-        "Process selection of custom key set."
-        value = self.custom_name.get()
-        if value != '- no custom keys -':
-            changes.add_option('main', 'Keys', 'name', value)
-            self.load_keys_list(value)
+            # Bring 'enable' options to the beginning of the list.
+            enables = [opt_name for opt_name in opt_list
+                       if opt_name.startswith('enable')]
+            for opt_name in enables:
+                opt_list.remove(opt_name)
+            opt_list = enables + opt_list
 
-    def var_changed_keyset_source(self, *params):
-        "Process toggle between builtin key set and custom key set."
-        value = self.keyset_source.get()
-        changes.add_option('main', 'Keys', 'default', value)
-        if value:
-            self.var_changed_builtin_name()
-        else:
-            self.var_changed_custom_name()
+            for opt_name in opt_list:
+                def_str = self.ext_defaultCfg.Get(
+                        ext_name, opt_name, raw=True)
+                try:
+                    def_obj = {'True':True, 'False':False}[def_str]
+                    opt_type = 'bool'
+                except KeyError:
+                    try:
+                        def_obj = int(def_str)
+                        opt_type = 'int'
+                    except ValueError:
+                        def_obj = def_str
+                        opt_type = None
+                try:
+                    value = self.ext_userCfg.Get(
+                            ext_name, opt_name, type=opt_type, raw=True,
+                            default=def_obj)
+                except ValueError:  # Need this until .Get fixed.
+                    value = def_obj  # Bad values overwritten by entry.
+                var = StringVar(self)
+                var.set(str(value))
 
-    def var_changed_keybinding(self, *params):
-        "Store change to a keybinding."
-        value = self.keybinding.get()
-        key_set = self.custom_name.get()
-        event = self.bindingslist.get(ANCHOR).split()[0]
-        if idleConf.IsCoreBinding(event):
-            changes.add_option('keys', key_set, event, value)
-        else:  # Event is an extension binding.
-            ext_name = idleConf.GetExtnNameForEvent(event)
-            ext_keybind_section = ext_name + '_cfgBindings'
-            changes.add_option('extensions', ext_keybind_section, event, value)
+                self.extensions[ext_name].append({'name': opt_name,
+                                                  'type': opt_type,
+                                                  'default': def_str,
+                                                  'value': value,
+                                                  'var': var,
+                                                 })
 
-    def set_keys_type(self):
-        "Set available screen options based on builtin or custom key set."
-        if self.keyset_source.get():
-            self.builtinlist['state'] = NORMAL
-            self.customlist['state'] = DISABLED
-            self.button_delete_custom_keys['state'] = DISABLED
-        else:
-            self.builtinlist['state'] = DISABLED
-            self.custom_keyset_on['state'] = NORMAL
-            self.customlist['state'] = NORMAL
-            self.button_delete_custom_keys['state'] = NORMAL
+    def extension_selected(self, event):
+        "Handle selection of an extension from the list."
+        newsel = self.extension_list.curselection()
+        if newsel:
+            newsel = self.extension_list.get(newsel)
+        if newsel is None or newsel != self.current_extension:
+            if self.current_extension:
+                self.details_frame.config(text='')
+                self.config_frame[self.current_extension].grid_forget()
+                self.current_extension = None
+        if newsel:
+            self.details_frame.config(text=newsel)
+            self.config_frame[newsel].grid(column=0, row=0, sticky='nsew')
+            self.current_extension = newsel
 
-    def get_new_keys(self):
-        """Handle event to change key binding for selected line.
+    def create_extension_frame(self, ext_name):
+        """Create a frame holding the widgets to configure one extension"""
+        f = VerticalScrolledFrame(self.details_frame, height=250, width=250)
+        self.config_frame[ext_name] = f
+        entry_area = f.interior
+        # Create an entry for each configuration option.
+        for row, opt in enumerate(self.extensions[ext_name]):
+            # Create a row with a label and entry/checkbutton.
+            label = Label(entry_area, text=opt['name'])
+            label.grid(row=row, column=0, sticky=NW)
+            var = opt['var']
+            if opt['type'] == 'bool':
+                Checkbutton(entry_area, textvariable=var, variable=var,
+                            onvalue='True', offvalue='False',
+                            indicatoron=FALSE, selectcolor='', width=8
+                            ).grid(row=row, column=1, sticky=W, padx=7)
+            elif opt['type'] == 'int':
+                Entry(entry_area, textvariable=var, validate='key',
+                      validatecommand=(self.is_int, '%P')
+                      ).grid(row=row, column=1, sticky=NSEW, padx=7)
 
-        A selection of a key/binding in the list of current
-        bindings pops up a dialog to enter a new binding.  If
-        the current key set is builtin and a binding has
-        changed, then a name for a custom key set needs to be
-        entered for the change to be applied.
-        """
-        list_index = self.bindingslist.index(ANCHOR)
-        binding = self.bindingslist.get(list_index)
-        bind_name = binding.split()[0]
-        if self.keyset_source.get():
-            current_key_set_name = self.builtin_name.get()
-        else:
-            current_key_set_name = self.custom_name.get()
-        current_bindings = idleConf.GetCurrentKeySet()
-        if current_key_set_name in changes['keys']:  # unsaved changes
-            key_set_changes = changes['keys'][current_key_set_name]
-            for event in key_set_changes:
-                current_bindings[event] = key_set_changes[event].split()
-        current_key_sequences = list(current_bindings.values())
-        new_keys = GetKeysDialog(self, 'Get New Keys', bind_name,
-                current_key_sequences).result
-        if new_keys:
-            if self.keyset_source.get():  # Current key set is a built-in.
-                message = ('Your changes will be saved as a new Custom Key Set.'
-                           ' Enter a name for your new Custom Key Set below.')
-                new_keyset = self.get_new_keys_name(message)
-                if not new_keyset:  # User cancelled custom key set creation.
-                    self.bindingslist.select_set(list_index)
-                    self.bindingslist.select_anchor(list_index)
-                    return
-                else:  # Create new custom key set based on previously active key set.
-                    self.create_new_key_set(new_keyset)
-            self.bindingslist.delete(list_index)
-            self.bindingslist.insert(list_index, bind_name+' - '+new_keys)
-            self.bindingslist.select_set(list_index)
-            self.bindingslist.select_anchor(list_index)
-            self.keybinding.set(new_keys)
-        else:
-            self.bindingslist.select_set(list_index)
-            self.bindingslist.select_anchor(list_index)
+            else:
+                Entry(entry_area, textvariable=var
+                      ).grid(row=row, column=1, sticky=NSEW, padx=7)
+        return
 
-    def get_new_keys_name(self, message):
-        "Return new key set name from query popup."
-        used_names = (idleConf.GetSectionList('user', 'keys') +
-                idleConf.GetSectionList('default', 'keys'))
-        new_keyset = SectionName(
-                self, 'New Custom Key Set', message, used_names).result
-        return new_keyset
+    def set_extension_value(self, section, opt):
+        """Return True if the configuration was added or changed.
 
-    def save_as_new_key_set(self):
-        "Prompt for name of new key set and save changes using that name."
-        new_keys_name = self.get_new_keys_name('New Key Set Name:')
-        if new_keys_name:
-            self.create_new_key_set(new_keys_name)
+        If the value is the same as the default, then remove it
+        from user config file.
+        """
+        name = opt['name']
+        default = opt['default']
+        value = opt['var'].get().strip() or default
+        opt['var'].set(value)
+        # if self.defaultCfg.has_section(section):
+        # Currently, always true; if not, indent to return.
+        if (value == default):
+            return self.ext_userCfg.RemoveOption(section, name)
+        # Set the option.
+        return self.ext_userCfg.SetOption(section, name, value)
 
-    def on_bindingslist_select(self, event):
-        "Activate button to assign new keys to selected action."
-        self.button_new_keys['state'] = NORMAL
+    def save_all_changed_extensions(self):
+        """Save configuration changes to the user config file.
 
-    def create_new_key_set(self, new_key_set_name):
-        """Create a new custom key set with the given name.
+        Attributes accessed:
+            extensions
 
-        Copy the bindings/keys from the previously active keyset
-        to the new keyset and activate the new custom keyset.
+        Methods:
+            set_extension_value
         """
-        if self.keyset_source.get():
-            prev_key_set_name = self.builtin_name.get()
-        else:
-            prev_key_set_name = self.custom_name.get()
-        prev_keys = idleConf.GetCoreKeys(prev_key_set_name)
-        new_keys = {}
-        for event in prev_keys:  # Add key set to changed items.
-            event_name = event[2:-2]  # Trim off the angle brackets.
-            binding = ' '.join(prev_keys[event])
-            new_keys[event_name] = binding
-        # Handle any unsaved changes to prev key set.
-        if prev_key_set_name in changes['keys']:
-            key_set_changes = changes['keys'][prev_key_set_name]
-            for event in key_set_changes:
-                new_keys[event] = key_set_changes[event]
-        # Save the new key set.
-        self.save_new_key_set(new_key_set_name, new_keys)
-        # Change GUI over to the new key set.
-        custom_key_list = idleConf.GetSectionList('user', 'keys')
-        custom_key_list.sort()
-        self.customlist.SetMenu(custom_key_list, new_key_set_name)
-        self.keyset_source.set(0)
-        self.set_keys_type()
+        has_changes = False
+        for ext_name in self.extensions:
+            options = self.extensions[ext_name]
+            for opt in options:
+                if self.set_extension_value(ext_name, opt):
+                    has_changes = True
+        if has_changes:
+            self.ext_userCfg.Save()
 
-    def load_keys_list(self, keyset_name):
-        """Reload the list of action/key binding pairs for the active key set.
 
-        An action/key binding can be selected to change the key binding.
-        """
-        reselect = False
-        if self.bindingslist.curselection():
-            reselect = True
-            list_index = self.bindingslist.index(ANCHOR)
-        keyset = idleConf.GetKeySet(keyset_name)
-        bind_names = list(keyset.keys())
-        bind_names.sort()
-        self.bindingslist.delete(0, END)
-        for bind_name in bind_names:
-            key = ' '.join(keyset[bind_name])
-            bind_name = bind_name[2:-2]  # Trim off the angle brackets.
-            if keyset_name in changes['keys']:
-                # Handle any unsaved changes to this key set.
-                if bind_name in changes['keys'][keyset_name]:
-                    key = changes['keys'][keyset_name][bind_name]
-            self.bindingslist.insert(END, bind_name+' - '+key)
-        if reselect:
-            self.bindingslist.see(list_index)
-            self.bindingslist.select_set(list_index)
-            self.bindingslist.select_anchor(list_index)
-
-    def save_new_key_set(self, keyset_name, keyset):
-        """Save a newly created core key set.
-
-        Add keyset to idleConf.userCfg['keys'], not to disk.
-        If the keyset doesn't exist, it is created.  The
-        binding/keys are taken from the keyset argument.
-
-        keyset_name - string, the name of the new key set
-        keyset - dictionary containing the new keybindings
-        """
-        if not idleConf.userCfg['keys'].has_section(keyset_name):
-            idleConf.userCfg['keys'].add_section(keyset_name)
-        for event in keyset:
-            value = keyset[event]
-            idleConf.userCfg['keys'].SetOption(keyset_name, event, value)
+# class TabPage(Frame):  # A template for Page classes.
+#     def __init__(self, master):
+#         super().__init__(master)
+#         self.create_page_tab()
+#         self.load_tab_cfg()
+#     def create_page_tab(self):
+#         # Define tk vars and register var and callback with tracers.
+#         # Create subframes and widgets.
+#         # Pack widgets.
+#     def load_tab_cfg(self):
+#         # Initialize widgets with data from idleConf.
+#     def var_changed_var_name():
+#         # For each tk var that needs other than default callback.
+#     def other_methods():
+#         # Define tab-specific behavior.
 
-    def delete_custom_keys(self):
-        """Handle event to delete a custom key set.
 
-        Applying the delete deactivates the current configuration and
-        reverts to the default.  The custom key set is permanently
-        deleted from the config file.
-        """
-        keyset_name=self.custom_name.get()
-        delmsg = 'Are you sure you wish to delete the key set %r ?'
-        if not tkMessageBox.askyesno(
-                'Delete Key Set',  delmsg % keyset_name, parent=self):
-            return
-        self.deactivate_current_config()
-        # Remove key set from changes, config, and file.
-        changes.delete_section('keys', keyset_name)
-        # Reload user key set list.
-        item_list = idleConf.GetSectionList('user', 'keys')
-        item_list.sort()
-        if not item_list:
-            self.custom_keyset_on['state'] = DISABLED
-            self.customlist.SetMenu(item_list, '- no custom keys -')
-        else:
-            self.customlist.SetMenu(item_list, item_list[0])
-        # Revert to default key set.
-        self.keyset_source.set(idleConf.defaultCfg['main']
-                                .Get('Keys', 'default'))
-        self.builtin_name.set(idleConf.defaultCfg['main'].Get('Keys', 'name')
-                             or idleConf.default_keys())
-        # User can't back out of these changes, they must be applied now.
-        changes.save_all()
-        self.save_all_changed_extensions()
-        self.activate_config_changes()
-        self.set_keys_type()
+class FontPage(Frame):
 
-    def deactivate_current_config(self):
-        """Remove current key bindings.
+    def __init__(self, master, highpage):
+        super().__init__(master)
+        self.highlight_sample = highpage.highlight_sample
+        self.create_page_font_tab()
+        self.load_font_cfg()
+        self.load_tab_cfg()
 
-        Iterate over window instances defined in parent and remove
-        the keybindings.
-        """
-        # Before a config is saved, some cleanup of current
-        # config must be done - remove the previous keybindings.
-        win_instances = self.parent.instance_dict.keys()
-        for instance in win_instances:
-            instance.RemoveKeybindings()
+    def create_page_font_tab(self):
+        """Return frame of widgets for Font/Tabs tab.
 
-    def activate_config_changes(self):
-        """Apply configuration changes to current windows.
+        Fonts: Enable users to provisionally change font face, size, or
+        boldness and to see the consequence of proposed choices.  Each
+        action set 3 options in changes structuree and changes the
+        corresponding aspect of the font sample on this page and
+        highlight sample on highlight page.
 
-        Dynamically update the current parent window instances
-        with some of the configuration changes.
-        """
-        win_instances = self.parent.instance_dict.keys()
-        for instance in win_instances:
-            instance.ResetColorizer()
-            instance.ResetFont()
-            instance.set_notabs_indentwidth()
-            instance.ApplyKeybindings()
-            instance.reset_help_menu_entries()
+        Function load_font_cfg initializes font vars and widgets from
+        idleConf entries and tk.
 
-    def create_page_extensions(self):
-        """Part of the config dialog used for configuring IDLE extensions.
+        Fontlist: mouse button 1 click or up or down key invoke
+        on_fontlist_select(), which sets var font_name.
 
-        This code is generic - it works for any and all IDLE extensions.
+        Sizelist: clicking the menubutton opens the dropdown menu. A
+        mouse button 1 click or return key sets var font_size.
 
-        IDLE extensions save their configuration options using idleConf.
-        This code reads the current configuration using idleConf, supplies a
-        GUI interface to change the configuration values, and saves the
-        changes using idleConf.
+        Bold_toggle: clicking the box toggles var font_bold.
 
-        Not all changes take effect immediately - some may require restarting IDLE.
-        This depends on each extension's implementation.
+        Changing any of the font vars invokes var_changed_font, which
+        adds all 3 font options to changes and calls set_samples.
+        Set_samples applies a new font constructed from the font vars to
+        font_sample and to highlight_sample on the hightlight page.
 
-        All values are treated as text, and it is up to the user to supply
-        reasonable values. The only exception to this are the 'enable*' options,
-        which are boolean, and can be toggled with a True/False button.
+        Tabs: Enable users to change spaces entered for indent tabs.
+        Changing indent_scale value with the mouse sets Var space_num,
+        which invokes the default callback to add an entry to
+        changes.  Load_tab_cfg initializes space_num to default.
 
-        Methods:
-            load_extensions:
-            extension_selected: Handle selection from list.
-            create_extension_frame: Hold widgets for one extension.
-            set_extension_value: Set in userCfg['extensions'].
-            save_all_changed_extensions: Call extension page Save().
+        Widgets for FontPage(Frame):  (*) widgets bound to self
+            frame_font: LabelFrame
+                frame_font_name: Frame
+                    font_name_title: Label
+                    (*)fontlist: ListBox - font_name
+                    scroll_font: Scrollbar
+                frame_font_param: Frame
+                    font_size_title: Label
+                    (*)sizelist: DynOptionMenu - font_size
+                    (*)bold_toggle: Checkbutton - font_bold
+                frame_font_sample: Frame
+                    (*)font_sample: Label
+            frame_indent: LabelFrame
+                    indent_title: Label
+                    (*)indent_scale: Scale - space_num
         """
-        parent = self.parent
-        frame = Frame(self.note)
-        self.ext_defaultCfg = idleConf.defaultCfg['extensions']
-        self.ext_userCfg = idleConf.userCfg['extensions']
-        self.is_int = self.register(is_int)
-        self.load_extensions()
-        # Create widgets - a listbox shows all available extensions, with the
-        # controls for the extension selected in the listbox to the right.
-        self.extension_names = StringVar(self)
-        frame.rowconfigure(0, weight=1)
-        frame.columnconfigure(2, weight=1)
-        self.extension_list = Listbox(frame, listvariable=self.extension_names,
-                                      selectmode='browse')
-        self.extension_list.bind('<<ListboxSelect>>', self.extension_selected)
-        scroll = Scrollbar(frame, command=self.extension_list.yview)
-        self.extension_list.yscrollcommand=scroll.set
-        self.details_frame = LabelFrame(frame, width=250, height=250)
-        self.extension_list.grid(column=0, row=0, sticky='nws')
-        scroll.grid(column=1, row=0, sticky='ns')
-        self.details_frame.grid(column=2, row=0, sticky='nsew', padx=[10, 0])
-        frame.configure(padx=10, pady=10)
-        self.config_frame = {}
-        self.current_extension = None
+        self.font_name = tracers.add(StringVar(self), self.var_changed_font)
+        self.font_size = tracers.add(StringVar(self), self.var_changed_font)
+        self.font_bold = tracers.add(BooleanVar(self), self.var_changed_font)
+        self.space_num = tracers.add(IntVar(self), ('main', 'Indent', 'num-spaces'))
 
-        self.outerframe = self                      # TEMPORARY
-        self.tabbed_page_set = self.extension_list  # TEMPORARY
+        # Create widgets:
+        # body and body section frames.
+        frame_font = LabelFrame(
+                self, borderwidth=2, relief=GROOVE, text=' Base Editor Font ')
+        frame_indent = LabelFrame(
+                self, borderwidth=2, relief=GROOVE, text=' Indentation Width ')
+        # frame_font.
+        frame_font_name = Frame(frame_font)
+        frame_font_param = Frame(frame_font)
+        font_name_title = Label(
+                frame_font_name, justify=LEFT, text='Font Face :')
+        self.fontlist = Listbox(frame_font_name, height=5,
+                                takefocus=True, exportselection=FALSE)
+        self.fontlist.bind('<ButtonRelease-1>', self.on_fontlist_select)
+        self.fontlist.bind('<KeyRelease-Up>', self.on_fontlist_select)
+        self.fontlist.bind('<KeyRelease-Down>', self.on_fontlist_select)
+        scroll_font = Scrollbar(frame_font_name)
+        scroll_font.config(command=self.fontlist.yview)
+        self.fontlist.config(yscrollcommand=scroll_font.set)
+        font_size_title = Label(frame_font_param, text='Size :')
+        self.sizelist = DynOptionMenu(frame_font_param, self.font_size, None)
+        self.bold_toggle = Checkbutton(
+                frame_font_param, variable=self.font_bold,
+                onvalue=1, offvalue=0, text='Bold')
+        frame_font_sample = Frame(frame_font, relief=SOLID, borderwidth=1)
+        temp_font = tkFont.Font(self, ('courier', 10, 'normal'))
+        self.font_sample = Label(
+                frame_font_sample, justify=LEFT, font=temp_font,
+                text='AaBbCcDdEe\nFfGgHhIiJj\n1234567890\n#:+=(){}[]')
+        # frame_indent.
+        indent_title = Label(
+                frame_indent, justify=LEFT,
+                text='Python Standard: 4 Spaces!')
+        self.indent_scale = Scale(
+                frame_indent, variable=self.space_num,
+                orient='horizontal', tickinterval=2, from_=2, to=16)
 
-        # Create the frame holding controls for each extension.
-        ext_names = ''
-        for ext_name in sorted(self.extensions):
-            self.create_extension_frame(ext_name)
-            ext_names = ext_names + '{' + ext_name + '} '
-        self.extension_names.set(ext_names)
-        self.extension_list.selection_set(0)
-        self.extension_selected(None)
+        # Pack widgets:
+        # body.
+        frame_font.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
+        frame_indent.pack(side=LEFT, padx=5, pady=5, fill=Y)
+        # frame_font.
+        frame_font_name.pack(side=TOP, padx=5, pady=5, fill=X)
+        frame_font_param.pack(side=TOP, padx=5, pady=5, fill=X)
+        font_name_title.pack(side=TOP, anchor=W)
+        self.fontlist.pack(side=LEFT, expand=TRUE, fill=X)
+        scroll_font.pack(side=LEFT, fill=Y)
+        font_size_title.pack(side=LEFT, anchor=W)
+        self.sizelist.pack(side=LEFT, anchor=W)
+        self.bold_toggle.pack(side=LEFT, anchor=W, padx=20)
+        frame_font_sample.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
+        self.font_sample.pack(expand=TRUE, fill=BOTH)
+        # frame_indent.
+        frame_indent.pack(side=TOP, fill=X)
+        indent_title.pack(side=TOP, anchor=W, padx=5)
+        self.indent_scale.pack(side=TOP, padx=5, fill=X)
 
-        return frame
+    def load_font_cfg(self):
+        """Load current configuration settings for the font options.
 
-    def load_extensions(self):
-        "Fill self.extensions with data from the default and user configs."
-        self.extensions = {}
-        for ext_name in idleConf.GetExtensions(active_only=False):
-            self.extensions[ext_name] = []
+        Retrieve current font with idleConf.GetFont and font families
+        from tk. Setup fontlist and set font_name.  Setup sizelist,
+        which sets font_size.  Set font_bold.  Call set_samples.
+        """
+        configured_font = idleConf.GetFont(self, 'main', 'EditorWindow')
+        font_name = configured_font[0].lower()
+        font_size = configured_font[1]
+        font_bold  = configured_font[2]=='bold'
 
-        for ext_name in self.extensions:
-            opt_list = sorted(self.ext_defaultCfg.GetOptionList(ext_name))
-
-            # Bring 'enable' options to the beginning of the list.
-            enables = [opt_name for opt_name in opt_list
-                       if opt_name.startswith('enable')]
-            for opt_name in enables:
-                opt_list.remove(opt_name)
-            opt_list = enables + opt_list
-
-            for opt_name in opt_list:
-                def_str = self.ext_defaultCfg.Get(
-                        ext_name, opt_name, raw=True)
-                try:
-                    def_obj = {'True':True, 'False':False}[def_str]
-                    opt_type = 'bool'
-                except KeyError:
-                    try:
-                        def_obj = int(def_str)
-                        opt_type = 'int'
-                    except ValueError:
-                        def_obj = def_str
-                        opt_type = None
-                try:
-                    value = self.ext_userCfg.Get(
-                            ext_name, opt_name, type=opt_type, raw=True,
-                            default=def_obj)
-                except ValueError:  # Need this until .Get fixed.
-                    value = def_obj  # Bad values overwritten by entry.
-                var = StringVar(self)
-                var.set(str(value))
+        # Set editor font selection list and font_name.
+        fonts = list(tkFont.families(self))
+        fonts.sort()
+        for font in fonts:
+            self.fontlist.insert(END, font)
+        self.font_name.set(font_name)
+        lc_fonts = [s.lower() for s in fonts]
+        try:
+            current_font_index = lc_fonts.index(font_name)
+            self.fontlist.see(current_font_index)
+            self.fontlist.select_set(current_font_index)
+            self.fontlist.select_anchor(current_font_index)
+            self.fontlist.activate(current_font_index)
+        except ValueError:
+            pass
+        # Set font size dropdown.
+        self.sizelist.SetMenu(('7', '8', '9', '10', '11', '12', '13', '14',
+                               '16', '18', '20', '22', '25', '29', '34', '40'),
+                              font_size)
+        # Set font weight.
+        self.font_bold.set(font_bold)
+        self.set_samples()
 
-                self.extensions[ext_name].append({'name': opt_name,
-                                                  'type': opt_type,
-                                                  'default': def_str,
-                                                  'value': value,
-                                                  'var': var,
-                                                 })
+    def var_changed_font(self, *params):
+        """Store changes to font attributes.
 
-    def extension_selected(self, event):
-        "Handle selection of an extension from the list."
-        newsel = self.extension_list.curselection()
-        if newsel:
-            newsel = self.extension_list.get(newsel)
-        if newsel is None or newsel != self.current_extension:
-            if self.current_extension:
-                self.details_frame.config(text='')
-                self.config_frame[self.current_extension].grid_forget()
-                self.current_extension = None
-        if newsel:
-            self.details_frame.config(text=newsel)
-            self.config_frame[newsel].grid(column=0, row=0, sticky='nsew')
-            self.current_extension = newsel
+        When one font attribute changes, save them all, as they are
+        not independent from each other. In particular, when we are
+        overriding the default font, we need to write out everything.
+        """
+        value = self.font_name.get()
+        changes.add_option('main', 'EditorWindow', 'font', value)
+        value = self.font_size.get()
+        changes.add_option('main', 'EditorWindow', 'font-size', value)
+        value = self.font_bold.get()
+        changes.add_option('main', 'EditorWindow', 'font-bold', value)
+        self.set_samples()
 
-    def create_extension_frame(self, ext_name):
-        """Create a frame holding the widgets to configure one extension"""
-        f = VerticalScrolledFrame(self.details_frame, height=250, width=250)
-        self.config_frame[ext_name] = f
-        entry_area = f.interior
-        # Create an entry for each configuration option.
-        for row, opt in enumerate(self.extensions[ext_name]):
-            # Create a row with a label and entry/checkbutton.
-            label = Label(entry_area, text=opt['name'])
-            label.grid(row=row, column=0, sticky=NW)
-            var = opt['var']
-            if opt['type'] == 'bool':
-                Checkbutton(entry_area, textvariable=var, variable=var,
-                            onvalue='True', offvalue='False',
-                            indicatoron=FALSE, selectcolor='', width=8
-                            ).grid(row=row, column=1, sticky=W, padx=7)
-            elif opt['type'] == 'int':
-                Entry(entry_area, textvariable=var, validate='key',
-                      validatecommand=(self.is_int, '%P')
-                      ).grid(row=row, column=1, sticky=NSEW, padx=7)
+    def on_fontlist_select(self, event):
+        """Handle selecting a font from the list.
 
-            else:
-                Entry(entry_area, textvariable=var
-                      ).grid(row=row, column=1, sticky=NSEW, padx=7)
-        return
+        Event can result from either mouse click or Up or Down key.
+        Set font_name and example displays to selection.
+        """
+        font = self.fontlist.get(
+                ACTIVE if event.type.name == 'KeyRelease' else ANCHOR)
+        self.font_name.set(font.lower())
 
-    def set_extension_value(self, section, opt):
-        """Return True if the configuration was added or changed.
+    def set_samples(self, event=None):
+        """Update update both screen samples with the font settings.
 
-        If the value is the same as the default, then remove it
-        from user config file.
+        Called on font initialization and change events.
+        Accesses font_name, font_size, and font_bold Variables.
+        Updates font_sample and hightlight page highlight_sample.
         """
-        name = opt['name']
-        default = opt['default']
-        value = opt['var'].get().strip() or default
-        opt['var'].set(value)
-        # if self.defaultCfg.has_section(section):
-        # Currently, always true; if not, indent to return.
-        if (value == default):
-            return self.ext_userCfg.RemoveOption(section, name)
-        # Set the option.
-        return self.ext_userCfg.SetOption(section, name, value)
-
-    def save_all_changed_extensions(self):
-        """Save configuration changes to the user config file.
+        font_name = self.font_name.get()
+        font_weight = tkFont.BOLD if self.font_bold.get() else tkFont.NORMAL
+        new_font = (font_name, self.font_size.get(), font_weight)
+        self.font_sample['font'] = new_font
+        self.highlight_sample['font'] = new_font
 
-        Attributes accessed:
-            extensions
+    def load_tab_cfg(self):
+        """Load current configuration settings for the tab options.
 
-        Methods:
-            set_extension_value
+        Attributes updated:
+            space_num: Set to value from idleConf.
         """
-        has_changes = False
-        for ext_name in self.extensions:
-            options = self.extensions[ext_name]
-            for opt in options:
-                if self.set_extension_value(ext_name, opt):
-                    has_changes = True
-        if has_changes:
-            self.ext_userCfg.Save()
-
+        # Set indent sizes.
+        space_num = idleConf.GetOption(
+            'main', 'Indent', 'num-spaces', default=4, type='int')
+        self.space_num.set(space_num)
 
-# class TabPage(Frame):  # A template for Page classes.
-#     def __init__(self, master):
-#         super().__init__(master)
-#         self.create_page_tab()
-#         self.load_tab_cfg()
-#     def create_page_tab(self):
-#         # Define tk vars and register var and callback with tracers.
-#         # Create subframes and widgets.
-#         # Pack widgets.
-#     def load_tab_cfg(self):
-#         # Initialize widgets with data from idleConf.
-#     def var_changed_var_name():
-#         # For each tk var that needs other than default callback.
-#     def other_methods():
-#         # Define tab-specific behavior.
+    def var_changed_space_num(self, *params):
+        "Store change to indentation size."
+        value = self.space_num.get()
+        changes.add_option('main', 'Indent', 'num-spaces', value)
 
 
-class FontPage(Frame):
+class KeysPage(Frame):
 
-    def __init__(self, master, highpage):
+    def __init__(self, master):
         super().__init__(master)
-        self.highlight_sample = highpage.highlight_sample
-        self.create_page_font_tab()
-        self.load_font_cfg()
-        self.load_tab_cfg()
+        self.cd = master.master
+        self.create_page_keys()
+        self.load_key_cfg()
 
-    def create_page_font_tab(self):
-        """Return frame of widgets for Font/Tabs tab.
+    def create_page_keys(self):
+        """Return frame of widgets for Keys tab.
 
-        Fonts: Enable users to provisionally change font face, size, or
-        boldness and to see the consequence of proposed choices.  Each
-        action set 3 options in changes structuree and changes the
-        corresponding aspect of the font sample on this page and
-        highlight sample on highlight page.
+        Enable users to provisionally change both individual and sets of
+        keybindings (shortcut keys). Except for features implemented as
+        extensions, keybindings are stored in complete sets called
+        keysets. Built-in keysets in idlelib/config-keys.def are fixed
+        as far as the dialog is concerned. Any keyset can be used as the
+        base for a new custom keyset, stored in .idlerc/config-keys.cfg.
 
-        Function load_font_cfg initializes font vars and widgets from
-        idleConf entries and tk.
+        Function load_key_cfg() initializes tk variables and keyset
+        lists and calls load_keys_list for the current keyset.
+        Radiobuttons builtin_keyset_on and custom_keyset_on toggle var
+        keyset_source, which controls if the current set of keybindings
+        are from a builtin or custom keyset. DynOptionMenus builtinlist
+        and customlist contain lists of the builtin and custom keysets,
+        respectively, and the current item from each list is stored in
+        vars builtin_name and custom_name.
 
-        Fontlist: mouse button 1 click or up or down key invoke
-        on_fontlist_select(), which sets var font_name.
+        Button delete_custom_keys invokes delete_custom_keys() to delete
+        a custom keyset from idleConf.userCfg['keys'] and changes.  Button
+        save_custom_keys invokes save_as_new_key_set() which calls
+        get_new_keys_name() and create_new_key_set() to save a custom keyset
+        and its keybindings to idleConf.userCfg['keys'].
 
-        Sizelist: clicking the menubutton opens the dropdown menu. A
-        mouse button 1 click or return key sets var font_size.
+        Listbox bindingslist contains all of the keybindings for the
+        selected keyset.  The keybindings are loaded in load_keys_list()
+        and are pairs of (event, [keys]) where keys can be a list
+        of one or more key combinations to bind to the same event.
+        Mouse button 1 click invokes on_bindingslist_select(), which
+        allows button_new_keys to be clicked.
 
-        Bold_toggle: clicking the box toggles var font_bold.
+        So, an item is selected in listbindings, which activates
+        button_new_keys, and clicking button_new_keys calls function
+        get_new_keys().  Function get_new_keys() gets the key mappings from the
+        current keyset for the binding event item that was selected.  The
+        function then displays another dialog, GetKeysDialog, with the
+        selected binding event and current keys and always new key sequences
+        to be entered for that binding event.  If the keys aren't
+        changed, nothing happens.  If the keys are changed and the keyset
+        is a builtin, function get_new_keys_name() will be called
+        for input of a custom keyset name.  If no name is given, then the
+        change to the keybinding will abort and no updates will be made.  If
+        a custom name is entered in the prompt or if the current keyset was
+        already custom (and thus didn't require a prompt), then
+        idleConf.userCfg['keys'] is updated in function create_new_key_set()
+        with the change to the event binding.  The item listing in bindingslist
+        is updated with the new keys.  Var keybinding is also set which invokes
+        the callback function, var_changed_keybinding, to add the change to
+        the 'keys' or 'extensions' changes tracker based on the binding type.
 
-        Changing any of the font vars invokes var_changed_font, which
-        adds all 3 font options to changes and calls set_samples.
-        Set_samples applies a new font constructed from the font vars to
-        font_sample and to highlight_sample on the hightlight page.
+        Tk Variables:
+            keybinding: Action/key bindings.
 
-        Tabs: Enable users to change spaces entered for indent tabs.
-        Changing indent_scale value with the mouse sets Var space_num,
-        which invokes the default callback to add an entry to
-        changes.  Load_tab_cfg initializes space_num to default.
+        Methods:
+            load_keys_list: Reload active set.
+            create_new_key_set: Combine active keyset and changes.
+            set_keys_type: Command for keyset_source.
+            save_new_key_set: Save to idleConf.userCfg['keys'] (is function).
+            deactivate_current_config: Remove keys bindings in editors.
 
-        Widgets for FontPage(Frame):  (*) widgets bound to self
-            frame_font: LabelFrame
-                frame_font_name: Frame
-                    font_name_title: Label
-                    (*)fontlist: ListBox - font_name
-                    scroll_font: Scrollbar
-                frame_font_param: Frame
-                    font_size_title: Label
-                    (*)sizelist: DynOptionMenu - font_size
-                    (*)bold_toggle: Checkbutton - font_bold
-                frame_font_sample: Frame
-                    (*)font_sample: Label
-            frame_indent: LabelFrame
-                    indent_title: Label
-                    (*)indent_scale: Scale - space_num
+        Widgets for KeysPage(frame):  (*) widgets bound to self
+            frame_key_sets: LabelFrame
+                frames[0]: Frame
+                    (*)builtin_keyset_on: Radiobutton - var keyset_source
+                    (*)custom_keyset_on: Radiobutton - var keyset_source
+                    (*)builtinlist: DynOptionMenu - var builtin_name,
+                            func keybinding_selected
+                    (*)customlist: DynOptionMenu - var custom_name,
+                            func keybinding_selected
+                    (*)keys_message: Label
+                frames[1]: Frame
+                    (*)button_delete_custom_keys: Button - delete_custom_keys
+                    (*)button_save_custom_keys: Button -  save_as_new_key_set
+            frame_custom: LabelFrame
+                frame_target: Frame
+                    target_title: Label
+                    scroll_target_y: Scrollbar
+                    scroll_target_x: Scrollbar
+                    (*)bindingslist: ListBox - on_bindingslist_select
+                    (*)button_new_keys: Button - get_new_keys & ..._name
         """
-        self.font_name = tracers.add(StringVar(self), self.var_changed_font)
-        self.font_size = tracers.add(StringVar(self), self.var_changed_font)
-        self.font_bold = tracers.add(BooleanVar(self), self.var_changed_font)
-        self.space_num = tracers.add(IntVar(self), ('main', 'Indent', 'num-spaces'))
+        self.builtin_name = tracers.add(
+                StringVar(self), self.var_changed_builtin_name)
+        self.custom_name = tracers.add(
+                StringVar(self), self.var_changed_custom_name)
+        self.keyset_source = tracers.add(
+                BooleanVar(self), self.var_changed_keyset_source)
+        self.keybinding = tracers.add(
+                StringVar(self), self.var_changed_keybinding)
 
         # Create widgets:
-        # body and body section frames.
-        frame_font = LabelFrame(
-                self, borderwidth=2, relief=GROOVE, text=' Base Editor Font ')
-        frame_indent = LabelFrame(
-                self, borderwidth=2, relief=GROOVE, text=' Indentation Width ')
-        # frame_font.
-        frame_font_name = Frame(frame_font)
-        frame_font_param = Frame(frame_font)
-        font_name_title = Label(
-                frame_font_name, justify=LEFT, text='Font Face :')
-        self.fontlist = Listbox(frame_font_name, height=5,
-                                takefocus=True, exportselection=FALSE)
-        self.fontlist.bind('<ButtonRelease-1>', self.on_fontlist_select)
-        self.fontlist.bind('<KeyRelease-Up>', self.on_fontlist_select)
-        self.fontlist.bind('<KeyRelease-Down>', self.on_fontlist_select)
-        scroll_font = Scrollbar(frame_font_name)
-        scroll_font.config(command=self.fontlist.yview)
-        self.fontlist.config(yscrollcommand=scroll_font.set)
-        font_size_title = Label(frame_font_param, text='Size :')
-        self.sizelist = DynOptionMenu(frame_font_param, self.font_size, None)
-        self.bold_toggle = Checkbutton(
-                frame_font_param, variable=self.font_bold,
-                onvalue=1, offvalue=0, text='Bold')
-        frame_font_sample = Frame(frame_font, relief=SOLID, borderwidth=1)
-        temp_font = tkFont.Font(self, ('courier', 10, 'normal'))
-        self.font_sample = Label(
-                frame_font_sample, justify=LEFT, font=temp_font,
-                text='AaBbCcDdEe\nFfGgHhIiJj\n1234567890\n#:+=(){}[]')
-        # frame_indent.
-        indent_title = Label(
-                frame_indent, justify=LEFT,
-                text='Python Standard: 4 Spaces!')
-        self.indent_scale = Scale(
-                frame_indent, variable=self.space_num,
-                orient='horizontal', tickinterval=2, from_=2, to=16)
+        # body and section frames.
+        frame_custom = LabelFrame(
+                self, borderwidth=2, relief=GROOVE,
+                text=' Custom Key Bindings ')
+        frame_key_sets = LabelFrame(
+                self, borderwidth=2, relief=GROOVE, text=' Key Set ')
+        # frame_custom.
+        frame_target = Frame(frame_custom)
+        target_title = Label(frame_target, text='Action - Key(s)')
+        scroll_target_y = Scrollbar(frame_target)
+        scroll_target_x = Scrollbar(frame_target, orient=HORIZONTAL)
+        self.bindingslist = Listbox(
+                frame_target, takefocus=FALSE, exportselection=FALSE)
+        self.bindingslist.bind('<ButtonRelease-1>',
+                               self.on_bindingslist_select)
+        scroll_target_y['command'] = self.bindingslist.yview
+        scroll_target_x['command'] = self.bindingslist.xview
+        self.bindingslist['yscrollcommand'] = scroll_target_y.set
+        self.bindingslist['xscrollcommand'] = scroll_target_x.set
+        self.button_new_keys = Button(
+                frame_custom, text='Get New Keys for Selection',
+                command=self.get_new_keys, state=DISABLED)
+        # frame_key_sets.
+        frames = [Frame(frame_key_sets, padx=2, pady=2, borderwidth=0)
+                  for i in range(2)]
+        self.builtin_keyset_on = Radiobutton(
+                frames[0], variable=self.keyset_source, value=1,
+                command=self.set_keys_type, text='Use a Built-in Key Set')
+        self.custom_keyset_on = Radiobutton(
+                frames[0], variable=self.keyset_source, value=0,
+                command=self.set_keys_type, text='Use a Custom Key Set')
+        self.builtinlist = DynOptionMenu(
+                frames[0], self.builtin_name, None, command=None)
+        self.customlist = DynOptionMenu(
+                frames[0], self.custom_name, None, command=None)
+        self.button_delete_custom_keys = Button(
+                frames[1], text='Delete Custom Key Set',
+                command=self.delete_custom_keys)
+        self.button_save_custom_keys = Button(
+                frames[1], text='Save as New Custom Key Set',
+                command=self.save_as_new_key_set)
+        self.keys_message = Label(frames[0], bd=2)
+
+        # Pack widgets:
+        # body.
+        frame_custom.pack(side=BOTTOM, padx=5, pady=5, expand=TRUE, fill=BOTH)
+        frame_key_sets.pack(side=BOTTOM, padx=5, pady=5, fill=BOTH)
+        # frame_custom.
+        self.button_new_keys.pack(side=BOTTOM, fill=X, padx=5, pady=5)
+        frame_target.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
+        # frame_target.
+        frame_target.columnconfigure(0, weight=1)
+        frame_target.rowconfigure(1, weight=1)
+        target_title.grid(row=0, column=0, columnspan=2, sticky=W)
+        self.bindingslist.grid(row=1, column=0, sticky=NSEW)
+        scroll_target_y.grid(row=1, column=1, sticky=NS)
+        scroll_target_x.grid(row=2, column=0, sticky=EW)
+        # frame_key_sets.
+        self.builtin_keyset_on.grid(row=0, column=0, sticky=W+NS)
+        self.custom_keyset_on.grid(row=1, column=0, sticky=W+NS)
+        self.builtinlist.grid(row=0, column=1, sticky=NSEW)
+        self.customlist.grid(row=1, column=1, sticky=NSEW)
+        self.keys_message.grid(row=0, column=2, sticky=NSEW, padx=5, pady=5)
+        self.button_delete_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
+        self.button_save_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
+        frames[0].pack(side=TOP, fill=BOTH, expand=True)
+        frames[1].pack(side=TOP, fill=X, expand=True, pady=2)
+
+    def load_key_cfg(self):
+        "Load current configuration settings for the keybinding options."
+        # Set current keys type radiobutton.
+        self.keyset_source.set(idleConf.GetOption(
+                'main', 'Keys', 'default', type='bool', default=1))
+        # Set current keys.
+        current_option = idleConf.CurrentKeys()
+        # Load available keyset option menus.
+        if self.keyset_source.get():  # Default theme selected.
+            item_list = idleConf.GetSectionList('default', 'keys')
+            item_list.sort()
+            self.builtinlist.SetMenu(item_list, current_option)
+            item_list = idleConf.GetSectionList('user', 'keys')
+            item_list.sort()
+            if not item_list:
+                self.custom_keyset_on['state'] = DISABLED
+                self.custom_name.set('- no custom keys -')
+            else:
+                self.customlist.SetMenu(item_list, item_list[0])
+        else:  # User key set selected.
+            item_list = idleConf.GetSectionList('user', 'keys')
+            item_list.sort()
+            self.customlist.SetMenu(item_list, current_option)
+            item_list = idleConf.GetSectionList('default', 'keys')
+            item_list.sort()
+            self.builtinlist.SetMenu(item_list, idleConf.default_keys())
+        self.set_keys_type()
+        # Load keyset element list.
+        keyset_name = idleConf.CurrentKeys()
+        self.load_keys_list(keyset_name)
+
+    def var_changed_builtin_name(self, *params):
+        "Process selection of builtin key set."
+        old_keys = (
+            'IDLE Classic Windows',
+            'IDLE Classic Unix',
+            'IDLE Classic Mac',
+            'IDLE Classic OSX',
+        )
+        value = self.builtin_name.get()
+        if value not in old_keys:
+            if idleConf.GetOption('main', 'Keys', 'name') not in old_keys:
+                changes.add_option('main', 'Keys', 'name', old_keys[0])
+            changes.add_option('main', 'Keys', 'name2', value)
+            self.keys_message['text'] = 'New key set, see Help'
+            self.keys_message['fg'] = '#500000'
+        else:
+            changes.add_option('main', 'Keys', 'name', value)
+            changes.add_option('main', 'Keys', 'name2', '')
+            self.keys_message['text'] = ''
+            self.keys_message['fg'] = 'black'
+        self.load_keys_list(value)
+
+    def var_changed_custom_name(self, *params):
+        "Process selection of custom key set."
+        value = self.custom_name.get()
+        if value != '- no custom keys -':
+            changes.add_option('main', 'Keys', 'name', value)
+            self.load_keys_list(value)
+
+    def var_changed_keyset_source(self, *params):
+        "Process toggle between builtin key set and custom key set."
+        value = self.keyset_source.get()
+        changes.add_option('main', 'Keys', 'default', value)
+        if value:
+            self.var_changed_builtin_name()
+        else:
+            self.var_changed_custom_name()
+
+    def var_changed_keybinding(self, *params):
+        "Store change to a keybinding."
+        value = self.keybinding.get()
+        key_set = self.custom_name.get()
+        event = self.bindingslist.get(ANCHOR).split()[0]
+        if idleConf.IsCoreBinding(event):
+            changes.add_option('keys', key_set, event, value)
+        else:  # Event is an extension binding.
+            ext_name = idleConf.GetExtnNameForEvent(event)
+            ext_keybind_section = ext_name + '_cfgBindings'
+            changes.add_option('extensions', ext_keybind_section, event, value)
 
-        # Pack widgets:
-        # body.
-        frame_font.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
-        frame_indent.pack(side=LEFT, padx=5, pady=5, fill=Y)
-        # frame_font.
-        frame_font_name.pack(side=TOP, padx=5, pady=5, fill=X)
-        frame_font_param.pack(side=TOP, padx=5, pady=5, fill=X)
-        font_name_title.pack(side=TOP, anchor=W)
-        self.fontlist.pack(side=LEFT, expand=TRUE, fill=X)
-        scroll_font.pack(side=LEFT, fill=Y)
-        font_size_title.pack(side=LEFT, anchor=W)
-        self.sizelist.pack(side=LEFT, anchor=W)
-        self.bold_toggle.pack(side=LEFT, anchor=W, padx=20)
-        frame_font_sample.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
-        self.font_sample.pack(expand=TRUE, fill=BOTH)
-        # frame_indent.
-        frame_indent.pack(side=TOP, fill=X)
-        indent_title.pack(side=TOP, anchor=W, padx=5)
-        self.indent_scale.pack(side=TOP, padx=5, fill=X)
+    def set_keys_type(self):
+        "Set available screen options based on builtin or custom key set."
+        if self.keyset_source.get():
+            self.builtinlist['state'] = NORMAL
+            self.customlist['state'] = DISABLED
+            self.button_delete_custom_keys['state'] = DISABLED
+        else:
+            self.builtinlist['state'] = DISABLED
+            self.custom_keyset_on['state'] = NORMAL
+            self.customlist['state'] = NORMAL
+            self.button_delete_custom_keys['state'] = NORMAL
 
-    def load_font_cfg(self):
-        """Load current configuration settings for the font options.
+    def get_new_keys(self):
+        """Handle event to change key binding for selected line.
 
-        Retrieve current font with idleConf.GetFont and font families
-        from tk. Setup fontlist and set font_name.  Setup sizelist,
-        which sets font_size.  Set font_bold.  Call set_samples.
+        A selection of a key/binding in the list of current
+        bindings pops up a dialog to enter a new binding.  If
+        the current key set is builtin and a binding has
+        changed, then a name for a custom key set needs to be
+        entered for the change to be applied.
         """
-        configured_font = idleConf.GetFont(self, 'main', 'EditorWindow')
-        font_name = configured_font[0].lower()
-        font_size = configured_font[1]
-        font_bold  = configured_font[2]=='bold'
+        list_index = self.bindingslist.index(ANCHOR)
+        binding = self.bindingslist.get(list_index)
+        bind_name = binding.split()[0]
+        if self.keyset_source.get():
+            current_key_set_name = self.builtin_name.get()
+        else:
+            current_key_set_name = self.custom_name.get()
+        current_bindings = idleConf.GetCurrentKeySet()
+        if current_key_set_name in changes['keys']:  # unsaved changes
+            key_set_changes = changes['keys'][current_key_set_name]
+            for event in key_set_changes:
+                current_bindings[event] = key_set_changes[event].split()
+        current_key_sequences = list(current_bindings.values())
+        new_keys = GetKeysDialog(self, 'Get New Keys', bind_name,
+                current_key_sequences).result
+        if new_keys:
+            if self.keyset_source.get():  # Current key set is a built-in.
+                message = ('Your changes will be saved as a new Custom Key Set.'
+                           ' Enter a name for your new Custom Key Set below.')
+                new_keyset = self.get_new_keys_name(message)
+                if not new_keyset:  # User cancelled custom key set creation.
+                    self.bindingslist.select_set(list_index)
+                    self.bindingslist.select_anchor(list_index)
+                    return
+                else:  # Create new custom key set based on previously active key set.
+                    self.create_new_key_set(new_keyset)
+            self.bindingslist.delete(list_index)
+            self.bindingslist.insert(list_index, bind_name+' - '+new_keys)
+            self.bindingslist.select_set(list_index)
+            self.bindingslist.select_anchor(list_index)
+            self.keybinding.set(new_keys)
+        else:
+            self.bindingslist.select_set(list_index)
+            self.bindingslist.select_anchor(list_index)
 
-        # Set editor font selection list and font_name.
-        fonts = list(tkFont.families(self))
-        fonts.sort()
-        for font in fonts:
-            self.fontlist.insert(END, font)
-        self.font_name.set(font_name)
-        lc_fonts = [s.lower() for s in fonts]
-        try:
-            current_font_index = lc_fonts.index(font_name)
-            self.fontlist.see(current_font_index)
-            self.fontlist.select_set(current_font_index)
-            self.fontlist.select_anchor(current_font_index)
-            self.fontlist.activate(current_font_index)
-        except ValueError:
-            pass
-        # Set font size dropdown.
-        self.sizelist.SetMenu(('7', '8', '9', '10', '11', '12', '13', '14',
-                               '16', '18', '20', '22', '25', '29', '34', '40'),
-                              font_size)
-        # Set font weight.
-        self.font_bold.set(font_bold)
-        self.set_samples()
+    def get_new_keys_name(self, message):
+        "Return new key set name from query popup."
+        used_names = (idleConf.GetSectionList('user', 'keys') +
+                idleConf.GetSectionList('default', 'keys'))
+        new_keyset = SectionName(
+                self, 'New Custom Key Set', message, used_names).result
+        return new_keyset
 
-    def var_changed_font(self, *params):
-        """Store changes to font attributes.
+    def save_as_new_key_set(self):
+        "Prompt for name of new key set and save changes using that name."
+        new_keys_name = self.get_new_keys_name('New Key Set Name:')
+        if new_keys_name:
+            self.create_new_key_set(new_keys_name)
 
-        When one font attribute changes, save them all, as they are
-        not independent from each other. In particular, when we are
-        overriding the default font, we need to write out everything.
-        """
-        value = self.font_name.get()
-        changes.add_option('main', 'EditorWindow', 'font', value)
-        value = self.font_size.get()
-        changes.add_option('main', 'EditorWindow', 'font-size', value)
-        value = self.font_bold.get()
-        changes.add_option('main', 'EditorWindow', 'font-bold', value)
-        self.set_samples()
+    def on_bindingslist_select(self, event):
+        "Activate button to assign new keys to selected action."
+        self.button_new_keys['state'] = NORMAL
 
-    def on_fontlist_select(self, event):
-        """Handle selecting a font from the list.
+    def create_new_key_set(self, new_key_set_name):
+        """Create a new custom key set with the given name.
 
-        Event can result from either mouse click or Up or Down key.
-        Set font_name and example displays to selection.
+        Copy the bindings/keys from the previously active keyset
+        to the new keyset and activate the new custom keyset.
         """
-        font = self.fontlist.get(
-                ACTIVE if event.type.name == 'KeyRelease' else ANCHOR)
-        self.font_name.set(font.lower())
+        if self.keyset_source.get():
+            prev_key_set_name = self.builtin_name.get()
+        else:
+            prev_key_set_name = self.custom_name.get()
+        prev_keys = idleConf.GetCoreKeys(prev_key_set_name)
+        new_keys = {}
+        for event in prev_keys:  # Add key set to changed items.
+            event_name = event[2:-2]  # Trim off the angle brackets.
+            binding = ' '.join(prev_keys[event])
+            new_keys[event_name] = binding
+        # Handle any unsaved changes to prev key set.
+        if prev_key_set_name in changes['keys']:
+            key_set_changes = changes['keys'][prev_key_set_name]
+            for event in key_set_changes:
+                new_keys[event] = key_set_changes[event]
+        # Save the new key set.
+        self.save_new_key_set(new_key_set_name, new_keys)
+        # Change GUI over to the new key set.
+        custom_key_list = idleConf.GetSectionList('user', 'keys')
+        custom_key_list.sort()
+        self.customlist.SetMenu(custom_key_list, new_key_set_name)
+        self.keyset_source.set(0)
+        self.set_keys_type()
 
-    def set_samples(self, event=None):
-        """Update update both screen samples with the font settings.
+    def load_keys_list(self, keyset_name):
+        """Reload the list of action/key binding pairs for the active key set.
 
-        Called on font initialization and change events.
-        Accesses font_name, font_size, and font_bold Variables.
-        Updates font_sample and hightlight page highlight_sample.
+        An action/key binding can be selected to change the key binding.
         """
-        font_name = self.font_name.get()
-        font_weight = tkFont.BOLD if self.font_bold.get() else tkFont.NORMAL
-        new_font = (font_name, self.font_size.get(), font_weight)
-        self.font_sample['font'] = new_font
-        self.highlight_sample['font'] = new_font
+        reselect = False
+        if self.bindingslist.curselection():
+            reselect = True
+            list_index = self.bindingslist.index(ANCHOR)
+        keyset = idleConf.GetKeySet(keyset_name)
+        bind_names = list(keyset.keys())
+        bind_names.sort()
+        self.bindingslist.delete(0, END)
+        for bind_name in bind_names:
+            key = ' '.join(keyset[bind_name])
+            bind_name = bind_name[2:-2]  # Trim off the angle brackets.
+            if keyset_name in changes['keys']:
+                # Handle any unsaved changes to this key set.
+                if bind_name in changes['keys'][keyset_name]:
+                    key = changes['keys'][keyset_name][bind_name]
+            self.bindingslist.insert(END, bind_name+' - '+key)
+        if reselect:
+            self.bindingslist.see(list_index)
+            self.bindingslist.select_set(list_index)
+            self.bindingslist.select_anchor(list_index)
 
-    def load_tab_cfg(self):
-        """Load current configuration settings for the tab options.
+    @staticmethod
+    def save_new_key_set(keyset_name, keyset):
+        """Save a newly created core key set.
 
-        Attributes updated:
-            space_num: Set to value from idleConf.
+        Add keyset to idleConf.userCfg['keys'], not to disk.
+        If the keyset doesn't exist, it is created.  The
+        binding/keys are taken from the keyset argument.
+
+        keyset_name - string, the name of the new key set
+        keyset - dictionary containing the new keybindings
         """
-        # Set indent sizes.
-        space_num = idleConf.GetOption(
-            'main', 'Indent', 'num-spaces', default=4, type='int')
-        self.space_num.set(space_num)
+        if not idleConf.userCfg['keys'].has_section(keyset_name):
+            idleConf.userCfg['keys'].add_section(keyset_name)
+        for event in keyset:
+            value = keyset[event]
+            idleConf.userCfg['keys'].SetOption(keyset_name, event, value)
 
-    def var_changed_space_num(self, *params):
-        "Store change to indentation size."
-        value = self.space_num.get()
-        changes.add_option('main', 'Indent', 'num-spaces', value)
+    def delete_custom_keys(self):
+        """Handle event to delete a custom key set.
+
+        Applying the delete deactivates the current configuration and
+        reverts to the default.  The custom key set is permanently
+        deleted from the config file.
+        """
+        keyset_name = self.custom_name.get()
+        delmsg = 'Are you sure you wish to delete the key set %r ?'
+        if not tkMessageBox.askyesno(
+                'Delete Key Set',  delmsg % keyset_name, parent=self):
+            return
+        self.cd.deactivate_current_config()
+        # Remove key set from changes, config, and file.
+        changes.delete_section('keys', keyset_name)
+        # Reload user key set list.
+        item_list = idleConf.GetSectionList('user', 'keys')
+        item_list.sort()
+        if not item_list:
+            self.custom_keyset_on['state'] = DISABLED
+            self.customlist.SetMenu(item_list, '- no custom keys -')
+        else:
+            self.customlist.SetMenu(item_list, item_list[0])
+        # Revert to default key set.
+        self.keyset_source.set(idleConf.defaultCfg['main']
+                                .Get('Keys', 'default'))
+        self.builtin_name.set(idleConf.defaultCfg['main'].Get('Keys', 'name')
+                             or idleConf.default_keys())
+        # User can't back out of these changes, they must be applied now.
+        changes.save_all()
+        self.cd.save_all_changed_extensions()
+        self.cd.activate_config_changes()
+        self.set_keys_type()
 
 
 class GenPage(Frame):
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index b07a65cf56a..964784508f8 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -232,22 +232,27 @@ def setUp(self):
         changes.clear()
 
 
-class KeyTest(unittest.TestCase):
+class KeysPageTest(unittest.TestCase):
+    """Test that keys tab widgets enable users to make changes.
+
+    Test that widget actions set vars, that var changes add
+    options to changes and that key sets works correctly.
+    """
 
     @classmethod
     def setUpClass(cls):
-        d = dialog
-        dialog.note.select(d.keyspage)
-        d.set_keys_type = Func()
-        d.load_keys_list = Func()
+        page = cls.page = dialog.keyspage
+        dialog.note.select(page)
+        page.set_keys_type = Func()
+        page.load_keys_list = Func()
 
     @classmethod
     def tearDownClass(cls):
-        d = dialog
-        del d.set_keys_type, d.load_keys_list
+        page = cls.page
+        del page.set_keys_type, page.load_keys_list
 
     def setUp(self):
-        d = dialog
+        d = self.page
         # The following is needed for test_load_key_cfg, _delete_custom_keys.
         # This may indicate a defect in some test or function.
         for section in idleConf.GetSectionList('user', 'keys'):
@@ -258,7 +263,7 @@ def setUp(self):
 
     def test_load_key_cfg(self):
         tracers.detach()
-        d = dialog
+        d = self.page
         eq = self.assertEqual
 
         # Use builtin keyset with no user keysets created.
@@ -300,7 +305,7 @@ def test_load_key_cfg(self):
 
     def test_keyset_source(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         # Test these separately.
         d.var_changed_builtin_name = Func()
         d.var_changed_custom_name = Func()
@@ -321,7 +326,7 @@ def test_keyset_source(self):
 
     def test_builtin_name(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         idleConf.userCfg['main'].remove_section('Keys')
         item_list = ['IDLE Classic Windows', 'IDLE Classic OSX',
                      'IDLE Modern UNIX']
@@ -352,7 +357,7 @@ def test_builtin_name(self):
         eq(d.load_keys_list.args, ('IDLE Classic OSX', ))
 
     def test_custom_name(self):
-        d = dialog
+        d = self.page
 
         # If no selections, doesn't get added.
         d.customlist.SetMenu([], '- no custom keys -')
@@ -366,7 +371,7 @@ def test_custom_name(self):
         self.assertEqual(d.load_keys_list.called, 1)
 
     def test_keybinding(self):
-        d = dialog
+        d = self.page
         d.custom_name.set('my custom keys')
         d.bindingslist.delete(0, 'end')
         d.bindingslist.insert(0, 'copy')
@@ -386,7 +391,7 @@ def test_keybinding(self):
 
     def test_set_keys_type(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         del d.set_keys_type
 
         # Builtin keyset selected.
@@ -407,7 +412,7 @@ def test_set_keys_type(self):
 
     def test_get_new_keys(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         orig_getkeysdialog = configdialog.GetKeysDialog
         gkd = configdialog.GetKeysDialog = Func(return_self=True)
         gnkn = d.get_new_keys_name = Func()
@@ -456,7 +461,7 @@ def test_get_new_keys(self):
     def test_get_new_keys_name(self):
         orig_sectionname = configdialog.SectionName
         sn = configdialog.SectionName = Func(return_self=True)
-        d = dialog
+        d = self.page
 
         sn.result = 'New Keys'
         self.assertEqual(d.get_new_keys_name(''), 'New Keys')
@@ -464,7 +469,7 @@ def test_get_new_keys_name(self):
         configdialog.SectionName = orig_sectionname
 
     def test_save_as_new_key_set(self):
-        d = dialog
+        d = self.page
         gnkn = d.get_new_keys_name = Func()
         d.keyset_source.set(True)
 
@@ -482,7 +487,7 @@ def test_save_as_new_key_set(self):
         del d.get_new_keys_name
 
     def test_on_bindingslist_select(self):
-        d = dialog
+        d = self.page
         b = d.bindingslist
         b.delete(0, 'end')
         b.insert(0, 'copy')
@@ -504,7 +509,7 @@ def test_on_bindingslist_select(self):
 
     def test_create_new_key_set_and_save_new_key_set(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
 
         # Use default as previously active keyset.
         d.keyset_source.set(True)
@@ -535,7 +540,7 @@ def test_create_new_key_set_and_save_new_key_set(self):
 
     def test_load_keys_list(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         gks = idleConf.GetKeySet = Func()
         del d.load_keys_list
         b = d.bindingslist
@@ -578,11 +583,11 @@ def test_load_keys_list(self):
 
     def test_delete_custom_keys(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         d.button_delete_custom_keys['state'] = NORMAL
         yesno = configdialog.tkMessageBox.askyesno = Func()
-        d.deactivate_current_config = Func()
-        d.activate_config_changes = Func()
+        dialog.deactivate_current_config = Func()
+        dialog.activate_config_changes = Func()
 
         keyset_name = 'spam key set'
         idleConf.userCfg['keys'].SetOption(keyset_name, 'name', 'value')
@@ -598,8 +603,8 @@ def test_delete_custom_keys(self):
         eq(yesno.called, 1)
         eq(keyspage[keyset_name], {'option': 'True'})
         eq(idleConf.GetSectionList('user', 'keys'), ['spam key set'])
-        eq(d.deactivate_current_config.called, 0)
-        eq(d.activate_config_changes.called, 0)
+        eq(dialog.deactivate_current_config.called, 0)
+        eq(dialog.activate_config_changes.called, 0)
         eq(d.set_keys_type.called, 0)
 
         # Confirm deletion.
@@ -610,11 +615,11 @@ def test_delete_custom_keys(self):
         eq(idleConf.GetSectionList('user', 'keys'), [])
         eq(d.custom_keyset_on['state'], DISABLED)
         eq(d.custom_name.get(), '- no custom keys -')
-        eq(d.deactivate_current_config.called, 1)
-        eq(d.activate_config_changes.called, 1)
+        eq(dialog.deactivate_current_config.called, 1)
+        eq(dialog.activate_config_changes.called, 1)
         eq(d.set_keys_type.called, 1)
 
-        del d.activate_config_changes, d.deactivate_current_config
+        del dialog.activate_config_changes, dialog.deactivate_current_config
         del configdialog.tkMessageBox.askyesno
 
 
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-15-12-58-23.bpo-31205.iuziZ5.rst b/Misc/NEWS.d/next/IDLE/2017-08-15-12-58-23.bpo-31205.iuziZ5.rst
new file mode 100644
index 00000000000..007a2e2fc55
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-15-12-58-23.bpo-31205.iuziZ5.rst
@@ -0,0 +1,2 @@
+IDLE: Factor KeysPage(Frame) class from ConfigDialog.  The slightly
+modified tests continue to pass.  Patch by Cheryl Sabella.


From webhook-mailer at python.org  Tue Aug 15 19:13:14 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Tue, 15 Aug 2017 23:13:14 -0000
Subject: [Python-checkins] [3.6] bpo-31205: IDLE: Factor KeysPage class from
 ConfigDialog (GH-3096) (#3097)
Message-ID: <mailman.17.1502838796.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/ff4b222b029f9977a4509d8697ba2b82c09b477a
commit: ff4b222b029f9977a4509d8697ba2b82c09b477a
branch: 3.6
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-15T19:13:11-04:00
summary:

[3.6] bpo-31205: IDLE: Factor KeysPage class from ConfigDialog (GH-3096) (#3097)

* bpo-31205: IDLE: Factor KeysPage class from ConfigDialog (#3096)

  The slightly modified tests continue to pass.  Patch by Cheryl Sabella.

(cherry picked from commit e36d9f5568093b3885da62a0bf0fdfbe3771672b)

* [3.6] bpo-31205: IDLE: Factor KeysPage class from ConfigDialog (GH-3096)

  The slightly modified tests continue to pass.  Patch by Cheryl Sabella..
(cherry picked from commit e36d9f5568093b3885da62a0bf0fdfbe3771672b)

files:
A Misc/NEWS.d/next/IDLE/2017-08-15-12-58-23.bpo-31205.iuziZ5.rst
M Lib/idlelib/configdialog.py
M Lib/idlelib/idle_test/test_configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 7c5f3c8ca4e..e1ac82b7df3 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -92,9 +92,9 @@ def create_widgets(self):
             note: Notebook
             highpage: self.create_page_highlight
             fontpage: FontPage
-            keyspage: self.create_page_keys
+            keyspage: KeysPage
             genpage: GenPage
-            extpageL self.create_page_extensions
+            extpage: self.create_page_extensions
 
         Methods:
             create_action_buttons
@@ -104,7 +104,7 @@ def create_widgets(self):
         self.note = note = Notebook(self, width=450, height=450)
         self.highpage = self.create_page_highlight()
         self.fontpage = FontPage(note, self.highpage)
-        self.keyspage = self.create_page_keys()
+        self.keyspage = KeysPage(note)
         self.genpage = GenPage(note)
         self.extpage = self.create_page_extensions()
         note.add(self.fontpage, text='Fonts/Tabs')
@@ -132,7 +132,7 @@ def load_configs(self):
         #self.load_font_cfg()
         #self.load_tab_cfg()
         self.load_theme_cfg()
-        self.load_key_cfg()
+        # self.load_key_cfg()
         # self.load_general_cfg()
         # note: extension page handled separately
 
@@ -791,863 +791,869 @@ def delete_custom_theme(self):
         self.activate_config_changes()
         self.set_theme_type()
 
+    def deactivate_current_config(self):
+        """Remove current key bindings.
 
-    def create_page_keys(self):
-        """Return frame of widgets for Keys tab.
+        Iterate over window instances defined in parent and remove
+        the keybindings.
+        """
+        # Before a config is saved, some cleanup of current
+        # config must be done - remove the previous keybindings.
+        win_instances = self.parent.instance_dict.keys()
+        for instance in win_instances:
+            instance.RemoveKeybindings()
 
-        Enable users to provisionally change both individual and sets of
-        keybindings (shortcut keys). Except for features implemented as
-        extensions, keybindings are stored in complete sets called
-        keysets. Built-in keysets in idlelib/config-keys.def are fixed
-        as far as the dialog is concerned. Any keyset can be used as the
-        base for a new custom keyset, stored in .idlerc/config-keys.cfg.
+    def activate_config_changes(self):
+        """Apply configuration changes to current windows.
 
-        Function load_key_cfg() initializes tk variables and keyset
-        lists and calls load_keys_list for the current keyset.
-        Radiobuttons builtin_keyset_on and custom_keyset_on toggle var
-        keyset_source, which controls if the current set of keybindings
-        are from a builtin or custom keyset. DynOptionMenus builtinlist
-        and customlist contain lists of the builtin and custom keysets,
-        respectively, and the current item from each list is stored in
-        vars builtin_name and custom_name.
+        Dynamically update the current parent window instances
+        with some of the configuration changes.
+        """
+        win_instances = self.parent.instance_dict.keys()
+        for instance in win_instances:
+            instance.ResetColorizer()
+            instance.ResetFont()
+            instance.set_notabs_indentwidth()
+            instance.ApplyKeybindings()
+            instance.reset_help_menu_entries()
 
-        Button delete_custom_keys invokes delete_custom_keys() to delete
-        a custom keyset from idleConf.userCfg['keys'] and changes.  Button
-        save_custom_keys invokes save_as_new_key_set() which calls
-        get_new_keys_name() and create_new_key_set() to save a custom keyset
-        and its keybindings to idleConf.userCfg['keys'].
+    def create_page_extensions(self):
+        """Part of the config dialog used for configuring IDLE extensions.
 
-        Listbox bindingslist contains all of the keybindings for the
-        selected keyset.  The keybindings are loaded in load_keys_list()
-        and are pairs of (event, [keys]) where keys can be a list
-        of one or more key combinations to bind to the same event.
-        Mouse button 1 click invokes on_bindingslist_select(), which
-        allows button_new_keys to be clicked.
+        This code is generic - it works for any and all IDLE extensions.
 
-        So, an item is selected in listbindings, which activates
-        button_new_keys, and clicking button_new_keys calls function
-        get_new_keys().  Function get_new_keys() gets the key mappings from the
-        current keyset for the binding event item that was selected.  The
-        function then displays another dialog, GetKeysDialog, with the
-        selected binding event and current keys and always new key sequences
-        to be entered for that binding event.  If the keys aren't
-        changed, nothing happens.  If the keys are changed and the keyset
-        is a builtin, function get_new_keys_name() will be called
-        for input of a custom keyset name.  If no name is given, then the
-        change to the keybinding will abort and no updates will be made.  If
-        a custom name is entered in the prompt or if the current keyset was
-        already custom (and thus didn't require a prompt), then
-        idleConf.userCfg['keys'] is updated in function create_new_key_set()
-        with the change to the event binding.  The item listing in bindingslist
-        is updated with the new keys.  Var keybinding is also set which invokes
-        the callback function, var_changed_keybinding, to add the change to
-        the 'keys' or 'extensions' changes tracker based on the binding type.
+        IDLE extensions save their configuration options using idleConf.
+        This code reads the current configuration using idleConf, supplies a
+        GUI interface to change the configuration values, and saves the
+        changes using idleConf.
 
-        Tk Variables:
-            keybinding: Action/key bindings.
+        Not all changes take effect immediately - some may require restarting IDLE.
+        This depends on each extension's implementation.
 
-        Methods:
-            load_keys_list: Reload active set.
-            create_new_key_set: Combine active keyset and changes.
-            set_keys_type: Command for keyset_source.
-            save_new_key_set: Save to idleConf.userCfg['keys'] (is function).
-            deactivate_current_config: Remove keys bindings in editors.
+        All values are treated as text, and it is up to the user to supply
+        reasonable values. The only exception to this are the 'enable*' options,
+        which are boolean, and can be toggled with a True/False button.
 
-        Widgets for keys page frame:  (*) widgets bound to self
-            frame_key_sets: LabelFrame
-                frames[0]: Frame
-                    (*)builtin_keyset_on: Radiobutton - var keyset_source
-                    (*)custom_keyset_on: Radiobutton - var keyset_source
-                    (*)builtinlist: DynOptionMenu - var builtin_name,
-                            func keybinding_selected
-                    (*)customlist: DynOptionMenu - var custom_name,
-                            func keybinding_selected
-                    (*)keys_message: Label
-                frames[1]: Frame
-                    (*)button_delete_custom_keys: Button - delete_custom_keys
-                    (*)button_save_custom_keys: Button -  save_as_new_key_set
-            frame_custom: LabelFrame
-                frame_target: Frame
-                    target_title: Label
-                    scroll_target_y: Scrollbar
-                    scroll_target_x: Scrollbar
-                    (*)bindingslist: ListBox - on_bindingslist_select
-                    (*)button_new_keys: Button - get_new_keys & ..._name
+        Methods:
+            load_extensions:
+            extension_selected: Handle selection from list.
+            create_extension_frame: Hold widgets for one extension.
+            set_extension_value: Set in userCfg['extensions'].
+            save_all_changed_extensions: Call extension page Save().
         """
         parent = self.parent
-        self.builtin_name = tracers.add(
-                StringVar(parent), self.var_changed_builtin_name)
-        self.custom_name = tracers.add(
-                StringVar(parent), self.var_changed_custom_name)
-        self.keyset_source = tracers.add(
-                BooleanVar(parent), self.var_changed_keyset_source)
-        self.keybinding = tracers.add(
-                StringVar(parent), self.var_changed_keybinding)
-
-        # Widget creation:
-        # body and section frames.
         frame = Frame(self.note)
-        frame_custom = LabelFrame(
-                frame, borderwidth=2, relief=GROOVE,
-                text=' Custom Key Bindings ')
-        frame_key_sets = LabelFrame(
-                frame, borderwidth=2, relief=GROOVE, text=' Key Set ')
-        #frame_custom
-        frame_target = Frame(frame_custom)
-        target_title = Label(frame_target, text='Action - Key(s)')
-        scroll_target_y = Scrollbar(frame_target)
-        scroll_target_x = Scrollbar(frame_target, orient=HORIZONTAL)
-        self.bindingslist = Listbox(
-                frame_target, takefocus=FALSE, exportselection=FALSE)
-        self.bindingslist.bind('<ButtonRelease-1>',
-                               self.on_bindingslist_select)
-        scroll_target_y['command'] = self.bindingslist.yview
-        scroll_target_x['command'] = self.bindingslist.xview
-        self.bindingslist['yscrollcommand'] = scroll_target_y.set
-        self.bindingslist['xscrollcommand'] = scroll_target_x.set
-        self.button_new_keys = Button(
-                frame_custom, text='Get New Keys for Selection',
-                command=self.get_new_keys, state=DISABLED)
-        #frame_key_sets
-        frames = [Frame(frame_key_sets, padx=2, pady=2, borderwidth=0)
-                  for i in range(2)]
-        self.builtin_keyset_on = Radiobutton(
-                frames[0], variable=self.keyset_source, value=1,
-                command=self.set_keys_type, text='Use a Built-in Key Set')
-        self.custom_keyset_on = Radiobutton(
-                frames[0], variable=self.keyset_source, value=0,
-                command=self.set_keys_type, text='Use a Custom Key Set')
-        self.builtinlist = DynOptionMenu(
-                frames[0], self.builtin_name, None, command=None)
-        self.customlist = DynOptionMenu(
-                frames[0], self.custom_name, None, command=None)
-        self.button_delete_custom_keys = Button(
-                frames[1], text='Delete Custom Key Set',
-                command=self.delete_custom_keys)
-        self.button_save_custom_keys = Button(
-                frames[1], text='Save as New Custom Key Set',
-                command=self.save_as_new_key_set)
-        self.keys_message = Label(frames[0], bd=2)
+        self.ext_defaultCfg = idleConf.defaultCfg['extensions']
+        self.ext_userCfg = idleConf.userCfg['extensions']
+        self.is_int = self.register(is_int)
+        self.load_extensions()
+        # Create widgets - a listbox shows all available extensions, with the
+        # controls for the extension selected in the listbox to the right.
+        self.extension_names = StringVar(self)
+        frame.rowconfigure(0, weight=1)
+        frame.columnconfigure(2, weight=1)
+        self.extension_list = Listbox(frame, listvariable=self.extension_names,
+                                      selectmode='browse')
+        self.extension_list.bind('<<ListboxSelect>>', self.extension_selected)
+        scroll = Scrollbar(frame, command=self.extension_list.yview)
+        self.extension_list.yscrollcommand=scroll.set
+        self.details_frame = LabelFrame(frame, width=250, height=250)
+        self.extension_list.grid(column=0, row=0, sticky='nws')
+        scroll.grid(column=1, row=0, sticky='ns')
+        self.details_frame.grid(column=2, row=0, sticky='nsew', padx=[10, 0])
+        frame.configure(padx=10, pady=10)
+        self.config_frame = {}
+        self.current_extension = None
+
+        self.outerframe = self                      # TEMPORARY
+        self.tabbed_page_set = self.extension_list  # TEMPORARY
+
+        # Create the frame holding controls for each extension.
+        ext_names = ''
+        for ext_name in sorted(self.extensions):
+            self.create_extension_frame(ext_name)
+            ext_names = ext_names + '{' + ext_name + '} '
+        self.extension_names.set(ext_names)
+        self.extension_list.selection_set(0)
+        self.extension_selected(None)
 
-        ##widget packing
-        #body
-        frame_custom.pack(side=BOTTOM, padx=5, pady=5, expand=TRUE, fill=BOTH)
-        frame_key_sets.pack(side=BOTTOM, padx=5, pady=5, fill=BOTH)
-        #frame_custom
-        self.button_new_keys.pack(side=BOTTOM, fill=X, padx=5, pady=5)
-        frame_target.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
-        #frame target
-        frame_target.columnconfigure(0, weight=1)
-        frame_target.rowconfigure(1, weight=1)
-        target_title.grid(row=0, column=0, columnspan=2, sticky=W)
-        self.bindingslist.grid(row=1, column=0, sticky=NSEW)
-        scroll_target_y.grid(row=1, column=1, sticky=NS)
-        scroll_target_x.grid(row=2, column=0, sticky=EW)
-        #frame_key_sets
-        self.builtin_keyset_on.grid(row=0, column=0, sticky=W+NS)
-        self.custom_keyset_on.grid(row=1, column=0, sticky=W+NS)
-        self.builtinlist.grid(row=0, column=1, sticky=NSEW)
-        self.customlist.grid(row=1, column=1, sticky=NSEW)
-        self.keys_message.grid(row=0, column=2, sticky=NSEW, padx=5, pady=5)
-        self.button_delete_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
-        self.button_save_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
-        frames[0].pack(side=TOP, fill=BOTH, expand=True)
-        frames[1].pack(side=TOP, fill=X, expand=True, pady=2)
         return frame
 
-    def load_key_cfg(self):
-        "Load current configuration settings for the keybinding options."
-        # Set current keys type radiobutton.
-        self.keyset_source.set(idleConf.GetOption(
-                'main', 'Keys', 'default', type='bool', default=1))
-        # Set current keys.
-        current_option = idleConf.CurrentKeys()
-        # Load available keyset option menus.
-        if self.keyset_source.get():  # Default theme selected.
-            item_list = idleConf.GetSectionList('default', 'keys')
-            item_list.sort()
-            self.builtinlist.SetMenu(item_list, current_option)
-            item_list = idleConf.GetSectionList('user', 'keys')
-            item_list.sort()
-            if not item_list:
-                self.custom_keyset_on['state'] = DISABLED
-                self.custom_name.set('- no custom keys -')
-            else:
-                self.customlist.SetMenu(item_list, item_list[0])
-        else:  # User key set selected.
-            item_list = idleConf.GetSectionList('user', 'keys')
-            item_list.sort()
-            self.customlist.SetMenu(item_list, current_option)
-            item_list = idleConf.GetSectionList('default', 'keys')
-            item_list.sort()
-            self.builtinlist.SetMenu(item_list, idleConf.default_keys())
-        self.set_keys_type()
-        # Load keyset element list.
-        keyset_name = idleConf.CurrentKeys()
-        self.load_keys_list(keyset_name)
+    def load_extensions(self):
+        "Fill self.extensions with data from the default and user configs."
+        self.extensions = {}
+        for ext_name in idleConf.GetExtensions(active_only=False):
+            self.extensions[ext_name] = []
 
-    def var_changed_builtin_name(self, *params):
-        "Process selection of builtin key set."
-        old_keys = (
-            'IDLE Classic Windows',
-            'IDLE Classic Unix',
-            'IDLE Classic Mac',
-            'IDLE Classic OSX',
-        )
-        value = self.builtin_name.get()
-        if value not in old_keys:
-            if idleConf.GetOption('main', 'Keys', 'name') not in old_keys:
-                changes.add_option('main', 'Keys', 'name', old_keys[0])
-            changes.add_option('main', 'Keys', 'name2', value)
-            self.keys_message['text'] = 'New key set, see Help'
-            self.keys_message['fg'] = '#500000'
-        else:
-            changes.add_option('main', 'Keys', 'name', value)
-            changes.add_option('main', 'Keys', 'name2', '')
-            self.keys_message['text'] = ''
-            self.keys_message['fg'] = 'black'
-        self.load_keys_list(value)
+        for ext_name in self.extensions:
+            opt_list = sorted(self.ext_defaultCfg.GetOptionList(ext_name))
 
-    def var_changed_custom_name(self, *params):
-        "Process selection of custom key set."
-        value = self.custom_name.get()
-        if value != '- no custom keys -':
-            changes.add_option('main', 'Keys', 'name', value)
-            self.load_keys_list(value)
+            # Bring 'enable' options to the beginning of the list.
+            enables = [opt_name for opt_name in opt_list
+                       if opt_name.startswith('enable')]
+            for opt_name in enables:
+                opt_list.remove(opt_name)
+            opt_list = enables + opt_list
 
-    def var_changed_keyset_source(self, *params):
-        "Process toggle between builtin key set and custom key set."
-        value = self.keyset_source.get()
-        changes.add_option('main', 'Keys', 'default', value)
-        if value:
-            self.var_changed_builtin_name()
-        else:
-            self.var_changed_custom_name()
+            for opt_name in opt_list:
+                def_str = self.ext_defaultCfg.Get(
+                        ext_name, opt_name, raw=True)
+                try:
+                    def_obj = {'True':True, 'False':False}[def_str]
+                    opt_type = 'bool'
+                except KeyError:
+                    try:
+                        def_obj = int(def_str)
+                        opt_type = 'int'
+                    except ValueError:
+                        def_obj = def_str
+                        opt_type = None
+                try:
+                    value = self.ext_userCfg.Get(
+                            ext_name, opt_name, type=opt_type, raw=True,
+                            default=def_obj)
+                except ValueError:  # Need this until .Get fixed.
+                    value = def_obj  # Bad values overwritten by entry.
+                var = StringVar(self)
+                var.set(str(value))
 
-    def var_changed_keybinding(self, *params):
-        "Store change to a keybinding."
-        value = self.keybinding.get()
-        key_set = self.custom_name.get()
-        event = self.bindingslist.get(ANCHOR).split()[0]
-        if idleConf.IsCoreBinding(event):
-            changes.add_option('keys', key_set, event, value)
-        else:  # Event is an extension binding.
-            ext_name = idleConf.GetExtnNameForEvent(event)
-            ext_keybind_section = ext_name + '_cfgBindings'
-            changes.add_option('extensions', ext_keybind_section, event, value)
+                self.extensions[ext_name].append({'name': opt_name,
+                                                  'type': opt_type,
+                                                  'default': def_str,
+                                                  'value': value,
+                                                  'var': var,
+                                                 })
 
-    def set_keys_type(self):
-        "Set available screen options based on builtin or custom key set."
-        if self.keyset_source.get():
-            self.builtinlist['state'] = NORMAL
-            self.customlist['state'] = DISABLED
-            self.button_delete_custom_keys['state'] = DISABLED
-        else:
-            self.builtinlist['state'] = DISABLED
-            self.custom_keyset_on['state'] = NORMAL
-            self.customlist['state'] = NORMAL
-            self.button_delete_custom_keys['state'] = NORMAL
+    def extension_selected(self, event):
+        "Handle selection of an extension from the list."
+        newsel = self.extension_list.curselection()
+        if newsel:
+            newsel = self.extension_list.get(newsel)
+        if newsel is None or newsel != self.current_extension:
+            if self.current_extension:
+                self.details_frame.config(text='')
+                self.config_frame[self.current_extension].grid_forget()
+                self.current_extension = None
+        if newsel:
+            self.details_frame.config(text=newsel)
+            self.config_frame[newsel].grid(column=0, row=0, sticky='nsew')
+            self.current_extension = newsel
 
-    def get_new_keys(self):
-        """Handle event to change key binding for selected line.
+    def create_extension_frame(self, ext_name):
+        """Create a frame holding the widgets to configure one extension"""
+        f = VerticalScrolledFrame(self.details_frame, height=250, width=250)
+        self.config_frame[ext_name] = f
+        entry_area = f.interior
+        # Create an entry for each configuration option.
+        for row, opt in enumerate(self.extensions[ext_name]):
+            # Create a row with a label and entry/checkbutton.
+            label = Label(entry_area, text=opt['name'])
+            label.grid(row=row, column=0, sticky=NW)
+            var = opt['var']
+            if opt['type'] == 'bool':
+                Checkbutton(entry_area, textvariable=var, variable=var,
+                            onvalue='True', offvalue='False',
+                            indicatoron=FALSE, selectcolor='', width=8
+                            ).grid(row=row, column=1, sticky=W, padx=7)
+            elif opt['type'] == 'int':
+                Entry(entry_area, textvariable=var, validate='key',
+                      validatecommand=(self.is_int, '%P')
+                      ).grid(row=row, column=1, sticky=NSEW, padx=7)
 
-        A selection of a key/binding in the list of current
-        bindings pops up a dialog to enter a new binding.  If
-        the current key set is builtin and a binding has
-        changed, then a name for a custom key set needs to be
-        entered for the change to be applied.
-        """
-        list_index = self.bindingslist.index(ANCHOR)
-        binding = self.bindingslist.get(list_index)
-        bind_name = binding.split()[0]
-        if self.keyset_source.get():
-            current_key_set_name = self.builtin_name.get()
-        else:
-            current_key_set_name = self.custom_name.get()
-        current_bindings = idleConf.GetCurrentKeySet()
-        if current_key_set_name in changes['keys']:  # unsaved changes
-            key_set_changes = changes['keys'][current_key_set_name]
-            for event in key_set_changes:
-                current_bindings[event] = key_set_changes[event].split()
-        current_key_sequences = list(current_bindings.values())
-        new_keys = GetKeysDialog(self, 'Get New Keys', bind_name,
-                current_key_sequences).result
-        if new_keys:
-            if self.keyset_source.get():  # Current key set is a built-in.
-                message = ('Your changes will be saved as a new Custom Key Set.'
-                           ' Enter a name for your new Custom Key Set below.')
-                new_keyset = self.get_new_keys_name(message)
-                if not new_keyset:  # User cancelled custom key set creation.
-                    self.bindingslist.select_set(list_index)
-                    self.bindingslist.select_anchor(list_index)
-                    return
-                else:  # Create new custom key set based on previously active key set.
-                    self.create_new_key_set(new_keyset)
-            self.bindingslist.delete(list_index)
-            self.bindingslist.insert(list_index, bind_name+' - '+new_keys)
-            self.bindingslist.select_set(list_index)
-            self.bindingslist.select_anchor(list_index)
-            self.keybinding.set(new_keys)
-        else:
-            self.bindingslist.select_set(list_index)
-            self.bindingslist.select_anchor(list_index)
+            else:
+                Entry(entry_area, textvariable=var
+                      ).grid(row=row, column=1, sticky=NSEW, padx=7)
+        return
 
-    def get_new_keys_name(self, message):
-        "Return new key set name from query popup."
-        used_names = (idleConf.GetSectionList('user', 'keys') +
-                idleConf.GetSectionList('default', 'keys'))
-        new_keyset = SectionName(
-                self, 'New Custom Key Set', message, used_names).result
-        return new_keyset
+    def set_extension_value(self, section, opt):
+        """Return True if the configuration was added or changed.
 
-    def save_as_new_key_set(self):
-        "Prompt for name of new key set and save changes using that name."
-        new_keys_name = self.get_new_keys_name('New Key Set Name:')
-        if new_keys_name:
-            self.create_new_key_set(new_keys_name)
+        If the value is the same as the default, then remove it
+        from user config file.
+        """
+        name = opt['name']
+        default = opt['default']
+        value = opt['var'].get().strip() or default
+        opt['var'].set(value)
+        # if self.defaultCfg.has_section(section):
+        # Currently, always true; if not, indent to return.
+        if (value == default):
+            return self.ext_userCfg.RemoveOption(section, name)
+        # Set the option.
+        return self.ext_userCfg.SetOption(section, name, value)
 
-    def on_bindingslist_select(self, event):
-        "Activate button to assign new keys to selected action."
-        self.button_new_keys['state'] = NORMAL
+    def save_all_changed_extensions(self):
+        """Save configuration changes to the user config file.
 
-    def create_new_key_set(self, new_key_set_name):
-        """Create a new custom key set with the given name.
+        Attributes accessed:
+            extensions
 
-        Copy the bindings/keys from the previously active keyset
-        to the new keyset and activate the new custom keyset.
+        Methods:
+            set_extension_value
         """
-        if self.keyset_source.get():
-            prev_key_set_name = self.builtin_name.get()
-        else:
-            prev_key_set_name = self.custom_name.get()
-        prev_keys = idleConf.GetCoreKeys(prev_key_set_name)
-        new_keys = {}
-        for event in prev_keys:  # Add key set to changed items.
-            event_name = event[2:-2]  # Trim off the angle brackets.
-            binding = ' '.join(prev_keys[event])
-            new_keys[event_name] = binding
-        # Handle any unsaved changes to prev key set.
-        if prev_key_set_name in changes['keys']:
-            key_set_changes = changes['keys'][prev_key_set_name]
-            for event in key_set_changes:
-                new_keys[event] = key_set_changes[event]
-        # Save the new key set.
-        self.save_new_key_set(new_key_set_name, new_keys)
-        # Change GUI over to the new key set.
-        custom_key_list = idleConf.GetSectionList('user', 'keys')
-        custom_key_list.sort()
-        self.customlist.SetMenu(custom_key_list, new_key_set_name)
-        self.keyset_source.set(0)
-        self.set_keys_type()
+        has_changes = False
+        for ext_name in self.extensions:
+            options = self.extensions[ext_name]
+            for opt in options:
+                if self.set_extension_value(ext_name, opt):
+                    has_changes = True
+        if has_changes:
+            self.ext_userCfg.Save()
 
-    def load_keys_list(self, keyset_name):
-        """Reload the list of action/key binding pairs for the active key set.
 
-        An action/key binding can be selected to change the key binding.
-        """
-        reselect = False
-        if self.bindingslist.curselection():
-            reselect = True
-            list_index = self.bindingslist.index(ANCHOR)
-        keyset = idleConf.GetKeySet(keyset_name)
-        bind_names = list(keyset.keys())
-        bind_names.sort()
-        self.bindingslist.delete(0, END)
-        for bind_name in bind_names:
-            key = ' '.join(keyset[bind_name])
-            bind_name = bind_name[2:-2]  # Trim off the angle brackets.
-            if keyset_name in changes['keys']:
-                # Handle any unsaved changes to this key set.
-                if bind_name in changes['keys'][keyset_name]:
-                    key = changes['keys'][keyset_name][bind_name]
-            self.bindingslist.insert(END, bind_name+' - '+key)
-        if reselect:
-            self.bindingslist.see(list_index)
-            self.bindingslist.select_set(list_index)
-            self.bindingslist.select_anchor(list_index)
-
-    def save_new_key_set(self, keyset_name, keyset):
-        """Save a newly created core key set.
-
-        Add keyset to idleConf.userCfg['keys'], not to disk.
-        If the keyset doesn't exist, it is created.  The
-        binding/keys are taken from the keyset argument.
-
-        keyset_name - string, the name of the new key set
-        keyset - dictionary containing the new keybindings
-        """
-        if not idleConf.userCfg['keys'].has_section(keyset_name):
-            idleConf.userCfg['keys'].add_section(keyset_name)
-        for event in keyset:
-            value = keyset[event]
-            idleConf.userCfg['keys'].SetOption(keyset_name, event, value)
+# class TabPage(Frame):  # A template for Page classes.
+#     def __init__(self, master):
+#         super().__init__(master)
+#         self.create_page_tab()
+#         self.load_tab_cfg()
+#     def create_page_tab(self):
+#         # Define tk vars and register var and callback with tracers.
+#         # Create subframes and widgets.
+#         # Pack widgets.
+#     def load_tab_cfg(self):
+#         # Initialize widgets with data from idleConf.
+#     def var_changed_var_name():
+#         # For each tk var that needs other than default callback.
+#     def other_methods():
+#         # Define tab-specific behavior.
 
-    def delete_custom_keys(self):
-        """Handle event to delete a custom key set.
 
-        Applying the delete deactivates the current configuration and
-        reverts to the default.  The custom key set is permanently
-        deleted from the config file.
-        """
-        keyset_name=self.custom_name.get()
-        delmsg = 'Are you sure you wish to delete the key set %r ?'
-        if not tkMessageBox.askyesno(
-                'Delete Key Set',  delmsg % keyset_name, parent=self):
-            return
-        self.deactivate_current_config()
-        # Remove key set from changes, config, and file.
-        changes.delete_section('keys', keyset_name)
-        # Reload user key set list.
-        item_list = idleConf.GetSectionList('user', 'keys')
-        item_list.sort()
-        if not item_list:
-            self.custom_keyset_on['state'] = DISABLED
-            self.customlist.SetMenu(item_list, '- no custom keys -')
-        else:
-            self.customlist.SetMenu(item_list, item_list[0])
-        # Revert to default key set.
-        self.keyset_source.set(idleConf.defaultCfg['main']
-                                .Get('Keys', 'default'))
-        self.builtin_name.set(idleConf.defaultCfg['main'].Get('Keys', 'name')
-                             or idleConf.default_keys())
-        # User can't back out of these changes, they must be applied now.
-        changes.save_all()
-        self.save_all_changed_extensions()
-        self.activate_config_changes()
-        self.set_keys_type()
+class FontPage(Frame):
 
-    def deactivate_current_config(self):
-        """Remove current key bindings.
+    def __init__(self, master, highpage):
+        super().__init__(master)
+        self.highlight_sample = highpage.highlight_sample
+        self.create_page_font_tab()
+        self.load_font_cfg()
+        self.load_tab_cfg()
 
-        Iterate over window instances defined in parent and remove
-        the keybindings.
-        """
-        # Before a config is saved, some cleanup of current
-        # config must be done - remove the previous keybindings.
-        win_instances = self.parent.instance_dict.keys()
-        for instance in win_instances:
-            instance.RemoveKeybindings()
+    def create_page_font_tab(self):
+        """Return frame of widgets for Font/Tabs tab.
 
-    def activate_config_changes(self):
-        """Apply configuration changes to current windows.
+        Fonts: Enable users to provisionally change font face, size, or
+        boldness and to see the consequence of proposed choices.  Each
+        action set 3 options in changes structuree and changes the
+        corresponding aspect of the font sample on this page and
+        highlight sample on highlight page.
 
-        Dynamically update the current parent window instances
-        with some of the configuration changes.
-        """
-        win_instances = self.parent.instance_dict.keys()
-        for instance in win_instances:
-            instance.ResetColorizer()
-            instance.ResetFont()
-            instance.set_notabs_indentwidth()
-            instance.ApplyKeybindings()
-            instance.reset_help_menu_entries()
+        Function load_font_cfg initializes font vars and widgets from
+        idleConf entries and tk.
 
-    def create_page_extensions(self):
-        """Part of the config dialog used for configuring IDLE extensions.
+        Fontlist: mouse button 1 click or up or down key invoke
+        on_fontlist_select(), which sets var font_name.
 
-        This code is generic - it works for any and all IDLE extensions.
+        Sizelist: clicking the menubutton opens the dropdown menu. A
+        mouse button 1 click or return key sets var font_size.
 
-        IDLE extensions save their configuration options using idleConf.
-        This code reads the current configuration using idleConf, supplies a
-        GUI interface to change the configuration values, and saves the
-        changes using idleConf.
+        Bold_toggle: clicking the box toggles var font_bold.
 
-        Not all changes take effect immediately - some may require restarting IDLE.
-        This depends on each extension's implementation.
+        Changing any of the font vars invokes var_changed_font, which
+        adds all 3 font options to changes and calls set_samples.
+        Set_samples applies a new font constructed from the font vars to
+        font_sample and to highlight_sample on the hightlight page.
 
-        All values are treated as text, and it is up to the user to supply
-        reasonable values. The only exception to this are the 'enable*' options,
-        which are boolean, and can be toggled with a True/False button.
+        Tabs: Enable users to change spaces entered for indent tabs.
+        Changing indent_scale value with the mouse sets Var space_num,
+        which invokes the default callback to add an entry to
+        changes.  Load_tab_cfg initializes space_num to default.
 
-        Methods:
-            load_extentions:
-            extension_selected: Handle selection from list.
-            create_extension_frame: Hold widgets for one extension.
-            set_extension_value: Set in userCfg['extensions'].
-            save_all_changed_extensions: Call extension page Save().
+        Widgets for FontPage(Frame):  (*) widgets bound to self
+            frame_font: LabelFrame
+                frame_font_name: Frame
+                    font_name_title: Label
+                    (*)fontlist: ListBox - font_name
+                    scroll_font: Scrollbar
+                frame_font_param: Frame
+                    font_size_title: Label
+                    (*)sizelist: DynOptionMenu - font_size
+                    (*)bold_toggle: Checkbutton - font_bold
+                frame_font_sample: Frame
+                    (*)font_sample: Label
+            frame_indent: LabelFrame
+                    indent_title: Label
+                    (*)indent_scale: Scale - space_num
         """
-        parent = self.parent
-        frame = Frame(self.note)
-        self.ext_defaultCfg = idleConf.defaultCfg['extensions']
-        self.ext_userCfg = idleConf.userCfg['extensions']
-        self.is_int = self.register(is_int)
-        self.load_extensions()
-        # Create widgets - a listbox shows all available extensions, with the
-        # controls for the extension selected in the listbox to the right.
-        self.extension_names = StringVar(self)
-        frame.rowconfigure(0, weight=1)
-        frame.columnconfigure(2, weight=1)
-        self.extension_list = Listbox(frame, listvariable=self.extension_names,
-                                      selectmode='browse')
-        self.extension_list.bind('<<ListboxSelect>>', self.extension_selected)
-        scroll = Scrollbar(frame, command=self.extension_list.yview)
-        self.extension_list.yscrollcommand=scroll.set
-        self.details_frame = LabelFrame(frame, width=250, height=250)
-        self.extension_list.grid(column=0, row=0, sticky='nws')
-        scroll.grid(column=1, row=0, sticky='ns')
-        self.details_frame.grid(column=2, row=0, sticky='nsew', padx=[10, 0])
-        frame.configure(padx=10, pady=10)
-        self.config_frame = {}
-        self.current_extension = None
+        self.font_name = tracers.add(StringVar(self), self.var_changed_font)
+        self.font_size = tracers.add(StringVar(self), self.var_changed_font)
+        self.font_bold = tracers.add(BooleanVar(self), self.var_changed_font)
+        self.space_num = tracers.add(IntVar(self), ('main', 'Indent', 'num-spaces'))
 
-        self.outerframe = self                      # TEMPORARY
-        self.tabbed_page_set = self.extension_list  # TEMPORARY
+        # Create widgets:
+        # body and body section frames.
+        frame_font = LabelFrame(
+                self, borderwidth=2, relief=GROOVE, text=' Base Editor Font ')
+        frame_indent = LabelFrame(
+                self, borderwidth=2, relief=GROOVE, text=' Indentation Width ')
+        # frame_font.
+        frame_font_name = Frame(frame_font)
+        frame_font_param = Frame(frame_font)
+        font_name_title = Label(
+                frame_font_name, justify=LEFT, text='Font Face :')
+        self.fontlist = Listbox(frame_font_name, height=5,
+                                takefocus=True, exportselection=FALSE)
+        self.fontlist.bind('<ButtonRelease-1>', self.on_fontlist_select)
+        self.fontlist.bind('<KeyRelease-Up>', self.on_fontlist_select)
+        self.fontlist.bind('<KeyRelease-Down>', self.on_fontlist_select)
+        scroll_font = Scrollbar(frame_font_name)
+        scroll_font.config(command=self.fontlist.yview)
+        self.fontlist.config(yscrollcommand=scroll_font.set)
+        font_size_title = Label(frame_font_param, text='Size :')
+        self.sizelist = DynOptionMenu(frame_font_param, self.font_size, None)
+        self.bold_toggle = Checkbutton(
+                frame_font_param, variable=self.font_bold,
+                onvalue=1, offvalue=0, text='Bold')
+        frame_font_sample = Frame(frame_font, relief=SOLID, borderwidth=1)
+        temp_font = tkFont.Font(self, ('courier', 10, 'normal'))
+        self.font_sample = Label(
+                frame_font_sample, justify=LEFT, font=temp_font,
+                text='AaBbCcDdEe\nFfGgHhIiJj\n1234567890\n#:+=(){}[]')
+        # frame_indent.
+        indent_title = Label(
+                frame_indent, justify=LEFT,
+                text='Python Standard: 4 Spaces!')
+        self.indent_scale = Scale(
+                frame_indent, variable=self.space_num,
+                orient='horizontal', tickinterval=2, from_=2, to=16)
 
-        # Create the frame holding controls for each extension.
-        ext_names = ''
-        for ext_name in sorted(self.extensions):
-            self.create_extension_frame(ext_name)
-            ext_names = ext_names + '{' + ext_name + '} '
-        self.extension_names.set(ext_names)
-        self.extension_list.selection_set(0)
-        self.extension_selected(None)
+        # Pack widgets:
+        # body.
+        frame_font.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
+        frame_indent.pack(side=LEFT, padx=5, pady=5, fill=Y)
+        # frame_font.
+        frame_font_name.pack(side=TOP, padx=5, pady=5, fill=X)
+        frame_font_param.pack(side=TOP, padx=5, pady=5, fill=X)
+        font_name_title.pack(side=TOP, anchor=W)
+        self.fontlist.pack(side=LEFT, expand=TRUE, fill=X)
+        scroll_font.pack(side=LEFT, fill=Y)
+        font_size_title.pack(side=LEFT, anchor=W)
+        self.sizelist.pack(side=LEFT, anchor=W)
+        self.bold_toggle.pack(side=LEFT, anchor=W, padx=20)
+        frame_font_sample.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
+        self.font_sample.pack(expand=TRUE, fill=BOTH)
+        # frame_indent.
+        frame_indent.pack(side=TOP, fill=X)
+        indent_title.pack(side=TOP, anchor=W, padx=5)
+        self.indent_scale.pack(side=TOP, padx=5, fill=X)
 
-        return frame
+    def load_font_cfg(self):
+        """Load current configuration settings for the font options.
 
-    def load_extensions(self):
-        "Fill self.extensions with data from the default and user configs."
-        self.extensions = {}
-        for ext_name in idleConf.GetExtensions(active_only=False):
-            self.extensions[ext_name] = []
+        Retrieve current font with idleConf.GetFont and font families
+        from tk. Setup fontlist and set font_name.  Setup sizelist,
+        which sets font_size.  Set font_bold.  Call set_samples.
+        """
+        configured_font = idleConf.GetFont(self, 'main', 'EditorWindow')
+        font_name = configured_font[0].lower()
+        font_size = configured_font[1]
+        font_bold  = configured_font[2]=='bold'
 
-        for ext_name in self.extensions:
-            opt_list = sorted(self.ext_defaultCfg.GetOptionList(ext_name))
-
-            # Bring 'enable' options to the beginning of the list.
-            enables = [opt_name for opt_name in opt_list
-                       if opt_name.startswith('enable')]
-            for opt_name in enables:
-                opt_list.remove(opt_name)
-            opt_list = enables + opt_list
-
-            for opt_name in opt_list:
-                def_str = self.ext_defaultCfg.Get(
-                        ext_name, opt_name, raw=True)
-                try:
-                    def_obj = {'True':True, 'False':False}[def_str]
-                    opt_type = 'bool'
-                except KeyError:
-                    try:
-                        def_obj = int(def_str)
-                        opt_type = 'int'
-                    except ValueError:
-                        def_obj = def_str
-                        opt_type = None
-                try:
-                    value = self.ext_userCfg.Get(
-                            ext_name, opt_name, type=opt_type, raw=True,
-                            default=def_obj)
-                except ValueError:  # Need this until .Get fixed.
-                    value = def_obj  # Bad values overwritten by entry.
-                var = StringVar(self)
-                var.set(str(value))
+        # Set editor font selection list and font_name.
+        fonts = list(tkFont.families(self))
+        fonts.sort()
+        for font in fonts:
+            self.fontlist.insert(END, font)
+        self.font_name.set(font_name)
+        lc_fonts = [s.lower() for s in fonts]
+        try:
+            current_font_index = lc_fonts.index(font_name)
+            self.fontlist.see(current_font_index)
+            self.fontlist.select_set(current_font_index)
+            self.fontlist.select_anchor(current_font_index)
+            self.fontlist.activate(current_font_index)
+        except ValueError:
+            pass
+        # Set font size dropdown.
+        self.sizelist.SetMenu(('7', '8', '9', '10', '11', '12', '13', '14',
+                               '16', '18', '20', '22', '25', '29', '34', '40'),
+                              font_size)
+        # Set font weight.
+        self.font_bold.set(font_bold)
+        self.set_samples()
 
-                self.extensions[ext_name].append({'name': opt_name,
-                                                  'type': opt_type,
-                                                  'default': def_str,
-                                                  'value': value,
-                                                  'var': var,
-                                                 })
+    def var_changed_font(self, *params):
+        """Store changes to font attributes.
 
-    def extension_selected(self, event):
-        "Handle selection of an extension from the list."
-        newsel = self.extension_list.curselection()
-        if newsel:
-            newsel = self.extension_list.get(newsel)
-        if newsel is None or newsel != self.current_extension:
-            if self.current_extension:
-                self.details_frame.config(text='')
-                self.config_frame[self.current_extension].grid_forget()
-                self.current_extension = None
-        if newsel:
-            self.details_frame.config(text=newsel)
-            self.config_frame[newsel].grid(column=0, row=0, sticky='nsew')
-            self.current_extension = newsel
+        When one font attribute changes, save them all, as they are
+        not independent from each other. In particular, when we are
+        overriding the default font, we need to write out everything.
+        """
+        value = self.font_name.get()
+        changes.add_option('main', 'EditorWindow', 'font', value)
+        value = self.font_size.get()
+        changes.add_option('main', 'EditorWindow', 'font-size', value)
+        value = self.font_bold.get()
+        changes.add_option('main', 'EditorWindow', 'font-bold', value)
+        self.set_samples()
 
-    def create_extension_frame(self, ext_name):
-        """Create a frame holding the widgets to configure one extension"""
-        f = VerticalScrolledFrame(self.details_frame, height=250, width=250)
-        self.config_frame[ext_name] = f
-        entry_area = f.interior
-        # Create an entry for each configuration option.
-        for row, opt in enumerate(self.extensions[ext_name]):
-            # Create a row with a label and entry/checkbutton.
-            label = Label(entry_area, text=opt['name'])
-            label.grid(row=row, column=0, sticky=NW)
-            var = opt['var']
-            if opt['type'] == 'bool':
-                Checkbutton(entry_area, textvariable=var, variable=var,
-                            onvalue='True', offvalue='False',
-                            indicatoron=FALSE, selectcolor='', width=8
-                            ).grid(row=row, column=1, sticky=W, padx=7)
-            elif opt['type'] == 'int':
-                Entry(entry_area, textvariable=var, validate='key',
-                      validatecommand=(self.is_int, '%P')
-                      ).grid(row=row, column=1, sticky=NSEW, padx=7)
+    def on_fontlist_select(self, event):
+        """Handle selecting a font from the list.
 
-            else:
-                Entry(entry_area, textvariable=var
-                      ).grid(row=row, column=1, sticky=NSEW, padx=7)
-        return
+        Event can result from either mouse click or Up or Down key.
+        Set font_name and example displays to selection.
+        """
+        font = self.fontlist.get(
+                ACTIVE if event.type.name == 'KeyRelease' else ANCHOR)
+        self.font_name.set(font.lower())
 
-    def set_extension_value(self, section, opt):
-        """Return True if the configuration was added or changed.
+    def set_samples(self, event=None):
+        """Update update both screen samples with the font settings.
 
-        If the value is the same as the default, then remove it
-        from user config file.
+        Called on font initialization and change events.
+        Accesses font_name, font_size, and font_bold Variables.
+        Updates font_sample and hightlight page highlight_sample.
         """
-        name = opt['name']
-        default = opt['default']
-        value = opt['var'].get().strip() or default
-        opt['var'].set(value)
-        # if self.defaultCfg.has_section(section):
-        # Currently, always true; if not, indent to return.
-        if (value == default):
-            return self.ext_userCfg.RemoveOption(section, name)
-        # Set the option.
-        return self.ext_userCfg.SetOption(section, name, value)
-
-    def save_all_changed_extensions(self):
-        """Save configuration changes to the user config file.
+        font_name = self.font_name.get()
+        font_weight = tkFont.BOLD if self.font_bold.get() else tkFont.NORMAL
+        new_font = (font_name, self.font_size.get(), font_weight)
+        self.font_sample['font'] = new_font
+        self.highlight_sample['font'] = new_font
 
-        Attributes accessed:
-            extensions
+    def load_tab_cfg(self):
+        """Load current configuration settings for the tab options.
 
-        Methods:
-            set_extension_value
+        Attributes updated:
+            space_num: Set to value from idleConf.
         """
-        has_changes = False
-        for ext_name in self.extensions:
-            options = self.extensions[ext_name]
-            for opt in options:
-                if self.set_extension_value(ext_name, opt):
-                    has_changes = True
-        if has_changes:
-            self.ext_userCfg.Save()
-
+        # Set indent sizes.
+        space_num = idleConf.GetOption(
+            'main', 'Indent', 'num-spaces', default=4, type='int')
+        self.space_num.set(space_num)
 
-# class TabPage(Frame):  # A template for Page classes.
-#     def __init__(self, master):
-#         super().__init__(master)
-#         self.create_page_tab()
-#         self.load_tab_cfg()
-#     def create_page_tab(self):
-#         # Define tk vars and register var and callback with tracers.
-#         # Create subframes and widgets.
-#         # Pack widgets.
-#     def load_tab_cfg(self):
-#         # Initialize widgets with data from idleConf.
-#     def var_changed_var_name():
-#         # For each tk var that needs other than default callback.
-#     def other_methods():
-#         # Define tab-specific behavior.
+    def var_changed_space_num(self, *params):
+        "Store change to indentation size."
+        value = self.space_num.get()
+        changes.add_option('main', 'Indent', 'num-spaces', value)
 
 
-class FontPage(Frame):
+class KeysPage(Frame):
 
-    def __init__(self, master, highpage):
+    def __init__(self, master):
         super().__init__(master)
-        self.highlight_sample = highpage.highlight_sample
-        self.create_page_font_tab()
-        self.load_font_cfg()
-        self.load_tab_cfg()
+        self.cd = master.master
+        self.create_page_keys()
+        self.load_key_cfg()
 
-    def create_page_font_tab(self):
-        """Return frame of widgets for Font/Tabs tab.
+    def create_page_keys(self):
+        """Return frame of widgets for Keys tab.
 
-        Fonts: Enable users to provisionally change font face, size, or
-        boldness and to see the consequence of proposed choices.  Each
-        action set 3 options in changes structuree and changes the
-        corresponding aspect of the font sample on this page and
-        highlight sample on highlight page.
+        Enable users to provisionally change both individual and sets of
+        keybindings (shortcut keys). Except for features implemented as
+        extensions, keybindings are stored in complete sets called
+        keysets. Built-in keysets in idlelib/config-keys.def are fixed
+        as far as the dialog is concerned. Any keyset can be used as the
+        base for a new custom keyset, stored in .idlerc/config-keys.cfg.
 
-        Function load_font_cfg initializes font vars and widgets from
-        idleConf entries and tk.
+        Function load_key_cfg() initializes tk variables and keyset
+        lists and calls load_keys_list for the current keyset.
+        Radiobuttons builtin_keyset_on and custom_keyset_on toggle var
+        keyset_source, which controls if the current set of keybindings
+        are from a builtin or custom keyset. DynOptionMenus builtinlist
+        and customlist contain lists of the builtin and custom keysets,
+        respectively, and the current item from each list is stored in
+        vars builtin_name and custom_name.
 
-        Fontlist: mouse button 1 click or up or down key invoke
-        on_fontlist_select(), which sets var font_name.
+        Button delete_custom_keys invokes delete_custom_keys() to delete
+        a custom keyset from idleConf.userCfg['keys'] and changes.  Button
+        save_custom_keys invokes save_as_new_key_set() which calls
+        get_new_keys_name() and create_new_key_set() to save a custom keyset
+        and its keybindings to idleConf.userCfg['keys'].
 
-        Sizelist: clicking the menubutton opens the dropdown menu. A
-        mouse button 1 click or return key sets var font_size.
+        Listbox bindingslist contains all of the keybindings for the
+        selected keyset.  The keybindings are loaded in load_keys_list()
+        and are pairs of (event, [keys]) where keys can be a list
+        of one or more key combinations to bind to the same event.
+        Mouse button 1 click invokes on_bindingslist_select(), which
+        allows button_new_keys to be clicked.
 
-        Bold_toggle: clicking the box toggles var font_bold.
+        So, an item is selected in listbindings, which activates
+        button_new_keys, and clicking button_new_keys calls function
+        get_new_keys().  Function get_new_keys() gets the key mappings from the
+        current keyset for the binding event item that was selected.  The
+        function then displays another dialog, GetKeysDialog, with the
+        selected binding event and current keys and always new key sequences
+        to be entered for that binding event.  If the keys aren't
+        changed, nothing happens.  If the keys are changed and the keyset
+        is a builtin, function get_new_keys_name() will be called
+        for input of a custom keyset name.  If no name is given, then the
+        change to the keybinding will abort and no updates will be made.  If
+        a custom name is entered in the prompt or if the current keyset was
+        already custom (and thus didn't require a prompt), then
+        idleConf.userCfg['keys'] is updated in function create_new_key_set()
+        with the change to the event binding.  The item listing in bindingslist
+        is updated with the new keys.  Var keybinding is also set which invokes
+        the callback function, var_changed_keybinding, to add the change to
+        the 'keys' or 'extensions' changes tracker based on the binding type.
 
-        Changing any of the font vars invokes var_changed_font, which
-        adds all 3 font options to changes and calls set_samples.
-        Set_samples applies a new font constructed from the font vars to
-        font_sample and to highlight_sample on the hightlight page.
+        Tk Variables:
+            keybinding: Action/key bindings.
 
-        Tabs: Enable users to change spaces entered for indent tabs.
-        Changing indent_scale value with the mouse sets Var space_num,
-        which invokes the default callback to add an entry to
-        changes.  Load_tab_cfg initializes space_num to default.
+        Methods:
+            load_keys_list: Reload active set.
+            create_new_key_set: Combine active keyset and changes.
+            set_keys_type: Command for keyset_source.
+            save_new_key_set: Save to idleConf.userCfg['keys'] (is function).
+            deactivate_current_config: Remove keys bindings in editors.
 
-        Widgets for FontPage(Frame):  (*) widgets bound to self
-            frame_font: LabelFrame
-                frame_font_name: Frame
-                    font_name_title: Label
-                    (*)fontlist: ListBox - font_name
-                    scroll_font: Scrollbar
-                frame_font_param: Frame
-                    font_size_title: Label
-                    (*)sizelist: DynOptionMenu - font_size
-                    (*)bold_toggle: Checkbutton - font_bold
-                frame_font_sample: Frame
-                    (*)font_sample: Label
-            frame_indent: LabelFrame
-                    indent_title: Label
-                    (*)indent_scale: Scale - space_num
+        Widgets for KeysPage(frame):  (*) widgets bound to self
+            frame_key_sets: LabelFrame
+                frames[0]: Frame
+                    (*)builtin_keyset_on: Radiobutton - var keyset_source
+                    (*)custom_keyset_on: Radiobutton - var keyset_source
+                    (*)builtinlist: DynOptionMenu - var builtin_name,
+                            func keybinding_selected
+                    (*)customlist: DynOptionMenu - var custom_name,
+                            func keybinding_selected
+                    (*)keys_message: Label
+                frames[1]: Frame
+                    (*)button_delete_custom_keys: Button - delete_custom_keys
+                    (*)button_save_custom_keys: Button -  save_as_new_key_set
+            frame_custom: LabelFrame
+                frame_target: Frame
+                    target_title: Label
+                    scroll_target_y: Scrollbar
+                    scroll_target_x: Scrollbar
+                    (*)bindingslist: ListBox - on_bindingslist_select
+                    (*)button_new_keys: Button - get_new_keys & ..._name
         """
-        self.font_name = tracers.add(StringVar(self), self.var_changed_font)
-        self.font_size = tracers.add(StringVar(self), self.var_changed_font)
-        self.font_bold = tracers.add(BooleanVar(self), self.var_changed_font)
-        self.space_num = tracers.add(IntVar(self), ('main', 'Indent', 'num-spaces'))
+        self.builtin_name = tracers.add(
+                StringVar(self), self.var_changed_builtin_name)
+        self.custom_name = tracers.add(
+                StringVar(self), self.var_changed_custom_name)
+        self.keyset_source = tracers.add(
+                BooleanVar(self), self.var_changed_keyset_source)
+        self.keybinding = tracers.add(
+                StringVar(self), self.var_changed_keybinding)
 
         # Create widgets:
-        # body and body section frames.
-        frame_font = LabelFrame(
-                self, borderwidth=2, relief=GROOVE, text=' Base Editor Font ')
-        frame_indent = LabelFrame(
-                self, borderwidth=2, relief=GROOVE, text=' Indentation Width ')
-        # frame_font.
-        frame_font_name = Frame(frame_font)
-        frame_font_param = Frame(frame_font)
-        font_name_title = Label(
-                frame_font_name, justify=LEFT, text='Font Face :')
-        self.fontlist = Listbox(frame_font_name, height=5,
-                                takefocus=True, exportselection=FALSE)
-        self.fontlist.bind('<ButtonRelease-1>', self.on_fontlist_select)
-        self.fontlist.bind('<KeyRelease-Up>', self.on_fontlist_select)
-        self.fontlist.bind('<KeyRelease-Down>', self.on_fontlist_select)
-        scroll_font = Scrollbar(frame_font_name)
-        scroll_font.config(command=self.fontlist.yview)
-        self.fontlist.config(yscrollcommand=scroll_font.set)
-        font_size_title = Label(frame_font_param, text='Size :')
-        self.sizelist = DynOptionMenu(frame_font_param, self.font_size, None)
-        self.bold_toggle = Checkbutton(
-                frame_font_param, variable=self.font_bold,
-                onvalue=1, offvalue=0, text='Bold')
-        frame_font_sample = Frame(frame_font, relief=SOLID, borderwidth=1)
-        temp_font = tkFont.Font(self, ('courier', 10, 'normal'))
-        self.font_sample = Label(
-                frame_font_sample, justify=LEFT, font=temp_font,
-                text='AaBbCcDdEe\nFfGgHhIiJj\n1234567890\n#:+=(){}[]')
-        # frame_indent.
-        indent_title = Label(
-                frame_indent, justify=LEFT,
-                text='Python Standard: 4 Spaces!')
-        self.indent_scale = Scale(
-                frame_indent, variable=self.space_num,
-                orient='horizontal', tickinterval=2, from_=2, to=16)
+        # body and section frames.
+        frame_custom = LabelFrame(
+                self, borderwidth=2, relief=GROOVE,
+                text=' Custom Key Bindings ')
+        frame_key_sets = LabelFrame(
+                self, borderwidth=2, relief=GROOVE, text=' Key Set ')
+        # frame_custom.
+        frame_target = Frame(frame_custom)
+        target_title = Label(frame_target, text='Action - Key(s)')
+        scroll_target_y = Scrollbar(frame_target)
+        scroll_target_x = Scrollbar(frame_target, orient=HORIZONTAL)
+        self.bindingslist = Listbox(
+                frame_target, takefocus=FALSE, exportselection=FALSE)
+        self.bindingslist.bind('<ButtonRelease-1>',
+                               self.on_bindingslist_select)
+        scroll_target_y['command'] = self.bindingslist.yview
+        scroll_target_x['command'] = self.bindingslist.xview
+        self.bindingslist['yscrollcommand'] = scroll_target_y.set
+        self.bindingslist['xscrollcommand'] = scroll_target_x.set
+        self.button_new_keys = Button(
+                frame_custom, text='Get New Keys for Selection',
+                command=self.get_new_keys, state=DISABLED)
+        # frame_key_sets.
+        frames = [Frame(frame_key_sets, padx=2, pady=2, borderwidth=0)
+                  for i in range(2)]
+        self.builtin_keyset_on = Radiobutton(
+                frames[0], variable=self.keyset_source, value=1,
+                command=self.set_keys_type, text='Use a Built-in Key Set')
+        self.custom_keyset_on = Radiobutton(
+                frames[0], variable=self.keyset_source, value=0,
+                command=self.set_keys_type, text='Use a Custom Key Set')
+        self.builtinlist = DynOptionMenu(
+                frames[0], self.builtin_name, None, command=None)
+        self.customlist = DynOptionMenu(
+                frames[0], self.custom_name, None, command=None)
+        self.button_delete_custom_keys = Button(
+                frames[1], text='Delete Custom Key Set',
+                command=self.delete_custom_keys)
+        self.button_save_custom_keys = Button(
+                frames[1], text='Save as New Custom Key Set',
+                command=self.save_as_new_key_set)
+        self.keys_message = Label(frames[0], bd=2)
+
+        # Pack widgets:
+        # body.
+        frame_custom.pack(side=BOTTOM, padx=5, pady=5, expand=TRUE, fill=BOTH)
+        frame_key_sets.pack(side=BOTTOM, padx=5, pady=5, fill=BOTH)
+        # frame_custom.
+        self.button_new_keys.pack(side=BOTTOM, fill=X, padx=5, pady=5)
+        frame_target.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
+        # frame_target.
+        frame_target.columnconfigure(0, weight=1)
+        frame_target.rowconfigure(1, weight=1)
+        target_title.grid(row=0, column=0, columnspan=2, sticky=W)
+        self.bindingslist.grid(row=1, column=0, sticky=NSEW)
+        scroll_target_y.grid(row=1, column=1, sticky=NS)
+        scroll_target_x.grid(row=2, column=0, sticky=EW)
+        # frame_key_sets.
+        self.builtin_keyset_on.grid(row=0, column=0, sticky=W+NS)
+        self.custom_keyset_on.grid(row=1, column=0, sticky=W+NS)
+        self.builtinlist.grid(row=0, column=1, sticky=NSEW)
+        self.customlist.grid(row=1, column=1, sticky=NSEW)
+        self.keys_message.grid(row=0, column=2, sticky=NSEW, padx=5, pady=5)
+        self.button_delete_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
+        self.button_save_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
+        frames[0].pack(side=TOP, fill=BOTH, expand=True)
+        frames[1].pack(side=TOP, fill=X, expand=True, pady=2)
+
+    def load_key_cfg(self):
+        "Load current configuration settings for the keybinding options."
+        # Set current keys type radiobutton.
+        self.keyset_source.set(idleConf.GetOption(
+                'main', 'Keys', 'default', type='bool', default=1))
+        # Set current keys.
+        current_option = idleConf.CurrentKeys()
+        # Load available keyset option menus.
+        if self.keyset_source.get():  # Default theme selected.
+            item_list = idleConf.GetSectionList('default', 'keys')
+            item_list.sort()
+            self.builtinlist.SetMenu(item_list, current_option)
+            item_list = idleConf.GetSectionList('user', 'keys')
+            item_list.sort()
+            if not item_list:
+                self.custom_keyset_on['state'] = DISABLED
+                self.custom_name.set('- no custom keys -')
+            else:
+                self.customlist.SetMenu(item_list, item_list[0])
+        else:  # User key set selected.
+            item_list = idleConf.GetSectionList('user', 'keys')
+            item_list.sort()
+            self.customlist.SetMenu(item_list, current_option)
+            item_list = idleConf.GetSectionList('default', 'keys')
+            item_list.sort()
+            self.builtinlist.SetMenu(item_list, idleConf.default_keys())
+        self.set_keys_type()
+        # Load keyset element list.
+        keyset_name = idleConf.CurrentKeys()
+        self.load_keys_list(keyset_name)
+
+    def var_changed_builtin_name(self, *params):
+        "Process selection of builtin key set."
+        old_keys = (
+            'IDLE Classic Windows',
+            'IDLE Classic Unix',
+            'IDLE Classic Mac',
+            'IDLE Classic OSX',
+        )
+        value = self.builtin_name.get()
+        if value not in old_keys:
+            if idleConf.GetOption('main', 'Keys', 'name') not in old_keys:
+                changes.add_option('main', 'Keys', 'name', old_keys[0])
+            changes.add_option('main', 'Keys', 'name2', value)
+            self.keys_message['text'] = 'New key set, see Help'
+            self.keys_message['fg'] = '#500000'
+        else:
+            changes.add_option('main', 'Keys', 'name', value)
+            changes.add_option('main', 'Keys', 'name2', '')
+            self.keys_message['text'] = ''
+            self.keys_message['fg'] = 'black'
+        self.load_keys_list(value)
+
+    def var_changed_custom_name(self, *params):
+        "Process selection of custom key set."
+        value = self.custom_name.get()
+        if value != '- no custom keys -':
+            changes.add_option('main', 'Keys', 'name', value)
+            self.load_keys_list(value)
+
+    def var_changed_keyset_source(self, *params):
+        "Process toggle between builtin key set and custom key set."
+        value = self.keyset_source.get()
+        changes.add_option('main', 'Keys', 'default', value)
+        if value:
+            self.var_changed_builtin_name()
+        else:
+            self.var_changed_custom_name()
+
+    def var_changed_keybinding(self, *params):
+        "Store change to a keybinding."
+        value = self.keybinding.get()
+        key_set = self.custom_name.get()
+        event = self.bindingslist.get(ANCHOR).split()[0]
+        if idleConf.IsCoreBinding(event):
+            changes.add_option('keys', key_set, event, value)
+        else:  # Event is an extension binding.
+            ext_name = idleConf.GetExtnNameForEvent(event)
+            ext_keybind_section = ext_name + '_cfgBindings'
+            changes.add_option('extensions', ext_keybind_section, event, value)
 
-        # Pack widgets:
-        # body.
-        frame_font.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
-        frame_indent.pack(side=LEFT, padx=5, pady=5, fill=Y)
-        # frame_font.
-        frame_font_name.pack(side=TOP, padx=5, pady=5, fill=X)
-        frame_font_param.pack(side=TOP, padx=5, pady=5, fill=X)
-        font_name_title.pack(side=TOP, anchor=W)
-        self.fontlist.pack(side=LEFT, expand=TRUE, fill=X)
-        scroll_font.pack(side=LEFT, fill=Y)
-        font_size_title.pack(side=LEFT, anchor=W)
-        self.sizelist.pack(side=LEFT, anchor=W)
-        self.bold_toggle.pack(side=LEFT, anchor=W, padx=20)
-        frame_font_sample.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
-        self.font_sample.pack(expand=TRUE, fill=BOTH)
-        # frame_indent.
-        frame_indent.pack(side=TOP, fill=X)
-        indent_title.pack(side=TOP, anchor=W, padx=5)
-        self.indent_scale.pack(side=TOP, padx=5, fill=X)
+    def set_keys_type(self):
+        "Set available screen options based on builtin or custom key set."
+        if self.keyset_source.get():
+            self.builtinlist['state'] = NORMAL
+            self.customlist['state'] = DISABLED
+            self.button_delete_custom_keys['state'] = DISABLED
+        else:
+            self.builtinlist['state'] = DISABLED
+            self.custom_keyset_on['state'] = NORMAL
+            self.customlist['state'] = NORMAL
+            self.button_delete_custom_keys['state'] = NORMAL
 
-    def load_font_cfg(self):
-        """Load current configuration settings for the font options.
+    def get_new_keys(self):
+        """Handle event to change key binding for selected line.
 
-        Retrieve current font with idleConf.GetFont and font families
-        from tk. Setup fontlist and set font_name.  Setup sizelist,
-        which sets font_size.  Set font_bold.  Call set_samples.
+        A selection of a key/binding in the list of current
+        bindings pops up a dialog to enter a new binding.  If
+        the current key set is builtin and a binding has
+        changed, then a name for a custom key set needs to be
+        entered for the change to be applied.
         """
-        configured_font = idleConf.GetFont(self, 'main', 'EditorWindow')
-        font_name = configured_font[0].lower()
-        font_size = configured_font[1]
-        font_bold  = configured_font[2]=='bold'
+        list_index = self.bindingslist.index(ANCHOR)
+        binding = self.bindingslist.get(list_index)
+        bind_name = binding.split()[0]
+        if self.keyset_source.get():
+            current_key_set_name = self.builtin_name.get()
+        else:
+            current_key_set_name = self.custom_name.get()
+        current_bindings = idleConf.GetCurrentKeySet()
+        if current_key_set_name in changes['keys']:  # unsaved changes
+            key_set_changes = changes['keys'][current_key_set_name]
+            for event in key_set_changes:
+                current_bindings[event] = key_set_changes[event].split()
+        current_key_sequences = list(current_bindings.values())
+        new_keys = GetKeysDialog(self, 'Get New Keys', bind_name,
+                current_key_sequences).result
+        if new_keys:
+            if self.keyset_source.get():  # Current key set is a built-in.
+                message = ('Your changes will be saved as a new Custom Key Set.'
+                           ' Enter a name for your new Custom Key Set below.')
+                new_keyset = self.get_new_keys_name(message)
+                if not new_keyset:  # User cancelled custom key set creation.
+                    self.bindingslist.select_set(list_index)
+                    self.bindingslist.select_anchor(list_index)
+                    return
+                else:  # Create new custom key set based on previously active key set.
+                    self.create_new_key_set(new_keyset)
+            self.bindingslist.delete(list_index)
+            self.bindingslist.insert(list_index, bind_name+' - '+new_keys)
+            self.bindingslist.select_set(list_index)
+            self.bindingslist.select_anchor(list_index)
+            self.keybinding.set(new_keys)
+        else:
+            self.bindingslist.select_set(list_index)
+            self.bindingslist.select_anchor(list_index)
 
-        # Set editor font selection list and font_name.
-        fonts = list(tkFont.families(self))
-        fonts.sort()
-        for font in fonts:
-            self.fontlist.insert(END, font)
-        self.font_name.set(font_name)
-        lc_fonts = [s.lower() for s in fonts]
-        try:
-            current_font_index = lc_fonts.index(font_name)
-            self.fontlist.see(current_font_index)
-            self.fontlist.select_set(current_font_index)
-            self.fontlist.select_anchor(current_font_index)
-            self.fontlist.activate(current_font_index)
-        except ValueError:
-            pass
-        # Set font size dropdown.
-        self.sizelist.SetMenu(('7', '8', '9', '10', '11', '12', '13', '14',
-                               '16', '18', '20', '22', '25', '29', '34', '40'),
-                              font_size)
-        # Set font weight.
-        self.font_bold.set(font_bold)
-        self.set_samples()
+    def get_new_keys_name(self, message):
+        "Return new key set name from query popup."
+        used_names = (idleConf.GetSectionList('user', 'keys') +
+                idleConf.GetSectionList('default', 'keys'))
+        new_keyset = SectionName(
+                self, 'New Custom Key Set', message, used_names).result
+        return new_keyset
 
-    def var_changed_font(self, *params):
-        """Store changes to font attributes.
+    def save_as_new_key_set(self):
+        "Prompt for name of new key set and save changes using that name."
+        new_keys_name = self.get_new_keys_name('New Key Set Name:')
+        if new_keys_name:
+            self.create_new_key_set(new_keys_name)
 
-        When one font attribute changes, save them all, as they are
-        not independent from each other. In particular, when we are
-        overriding the default font, we need to write out everything.
-        """
-        value = self.font_name.get()
-        changes.add_option('main', 'EditorWindow', 'font', value)
-        value = self.font_size.get()
-        changes.add_option('main', 'EditorWindow', 'font-size', value)
-        value = self.font_bold.get()
-        changes.add_option('main', 'EditorWindow', 'font-bold', value)
-        self.set_samples()
+    def on_bindingslist_select(self, event):
+        "Activate button to assign new keys to selected action."
+        self.button_new_keys['state'] = NORMAL
 
-    def on_fontlist_select(self, event):
-        """Handle selecting a font from the list.
+    def create_new_key_set(self, new_key_set_name):
+        """Create a new custom key set with the given name.
 
-        Event can result from either mouse click or Up or Down key.
-        Set font_name and example displays to selection.
+        Copy the bindings/keys from the previously active keyset
+        to the new keyset and activate the new custom keyset.
         """
-        font = self.fontlist.get(
-                ACTIVE if event.type.name == 'KeyRelease' else ANCHOR)
-        self.font_name.set(font.lower())
+        if self.keyset_source.get():
+            prev_key_set_name = self.builtin_name.get()
+        else:
+            prev_key_set_name = self.custom_name.get()
+        prev_keys = idleConf.GetCoreKeys(prev_key_set_name)
+        new_keys = {}
+        for event in prev_keys:  # Add key set to changed items.
+            event_name = event[2:-2]  # Trim off the angle brackets.
+            binding = ' '.join(prev_keys[event])
+            new_keys[event_name] = binding
+        # Handle any unsaved changes to prev key set.
+        if prev_key_set_name in changes['keys']:
+            key_set_changes = changes['keys'][prev_key_set_name]
+            for event in key_set_changes:
+                new_keys[event] = key_set_changes[event]
+        # Save the new key set.
+        self.save_new_key_set(new_key_set_name, new_keys)
+        # Change GUI over to the new key set.
+        custom_key_list = idleConf.GetSectionList('user', 'keys')
+        custom_key_list.sort()
+        self.customlist.SetMenu(custom_key_list, new_key_set_name)
+        self.keyset_source.set(0)
+        self.set_keys_type()
 
-    def set_samples(self, event=None):
-        """Update update both screen samples with the font settings.
+    def load_keys_list(self, keyset_name):
+        """Reload the list of action/key binding pairs for the active key set.
 
-        Called on font initialization and change events.
-        Accesses font_name, font_size, and font_bold Variables.
-        Updates font_sample and hightlight page highlight_sample.
+        An action/key binding can be selected to change the key binding.
         """
-        font_name = self.font_name.get()
-        font_weight = tkFont.BOLD if self.font_bold.get() else tkFont.NORMAL
-        new_font = (font_name, self.font_size.get(), font_weight)
-        self.font_sample['font'] = new_font
-        self.highlight_sample['font'] = new_font
+        reselect = False
+        if self.bindingslist.curselection():
+            reselect = True
+            list_index = self.bindingslist.index(ANCHOR)
+        keyset = idleConf.GetKeySet(keyset_name)
+        bind_names = list(keyset.keys())
+        bind_names.sort()
+        self.bindingslist.delete(0, END)
+        for bind_name in bind_names:
+            key = ' '.join(keyset[bind_name])
+            bind_name = bind_name[2:-2]  # Trim off the angle brackets.
+            if keyset_name in changes['keys']:
+                # Handle any unsaved changes to this key set.
+                if bind_name in changes['keys'][keyset_name]:
+                    key = changes['keys'][keyset_name][bind_name]
+            self.bindingslist.insert(END, bind_name+' - '+key)
+        if reselect:
+            self.bindingslist.see(list_index)
+            self.bindingslist.select_set(list_index)
+            self.bindingslist.select_anchor(list_index)
 
-    def load_tab_cfg(self):
-        """Load current configuration settings for the tab options.
+    @staticmethod
+    def save_new_key_set(keyset_name, keyset):
+        """Save a newly created core key set.
 
-        Attributes updated:
-            space_num: Set to value from idleConf.
+        Add keyset to idleConf.userCfg['keys'], not to disk.
+        If the keyset doesn't exist, it is created.  The
+        binding/keys are taken from the keyset argument.
+
+        keyset_name - string, the name of the new key set
+        keyset - dictionary containing the new keybindings
         """
-        # Set indent sizes.
-        space_num = idleConf.GetOption(
-            'main', 'Indent', 'num-spaces', default=4, type='int')
-        self.space_num.set(space_num)
+        if not idleConf.userCfg['keys'].has_section(keyset_name):
+            idleConf.userCfg['keys'].add_section(keyset_name)
+        for event in keyset:
+            value = keyset[event]
+            idleConf.userCfg['keys'].SetOption(keyset_name, event, value)
 
-    def var_changed_space_num(self, *params):
-        "Store change to indentation size."
-        value = self.space_num.get()
-        changes.add_option('main', 'Indent', 'num-spaces', value)
+    def delete_custom_keys(self):
+        """Handle event to delete a custom key set.
+
+        Applying the delete deactivates the current configuration and
+        reverts to the default.  The custom key set is permanently
+        deleted from the config file.
+        """
+        keyset_name = self.custom_name.get()
+        delmsg = 'Are you sure you wish to delete the key set %r ?'
+        if not tkMessageBox.askyesno(
+                'Delete Key Set',  delmsg % keyset_name, parent=self):
+            return
+        self.cd.deactivate_current_config()
+        # Remove key set from changes, config, and file.
+        changes.delete_section('keys', keyset_name)
+        # Reload user key set list.
+        item_list = idleConf.GetSectionList('user', 'keys')
+        item_list.sort()
+        if not item_list:
+            self.custom_keyset_on['state'] = DISABLED
+            self.customlist.SetMenu(item_list, '- no custom keys -')
+        else:
+            self.customlist.SetMenu(item_list, item_list[0])
+        # Revert to default key set.
+        self.keyset_source.set(idleConf.defaultCfg['main']
+                                .Get('Keys', 'default'))
+        self.builtin_name.set(idleConf.defaultCfg['main'].Get('Keys', 'name')
+                             or idleConf.default_keys())
+        # User can't back out of these changes, they must be applied now.
+        changes.save_all()
+        self.cd.save_all_changed_extensions()
+        self.cd.activate_config_changes()
+        self.set_keys_type()
 
 
 class GenPage(Frame):
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index b07a65cf56a..964784508f8 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -232,22 +232,27 @@ def setUp(self):
         changes.clear()
 
 
-class KeyTest(unittest.TestCase):
+class KeysPageTest(unittest.TestCase):
+    """Test that keys tab widgets enable users to make changes.
+
+    Test that widget actions set vars, that var changes add
+    options to changes and that key sets works correctly.
+    """
 
     @classmethod
     def setUpClass(cls):
-        d = dialog
-        dialog.note.select(d.keyspage)
-        d.set_keys_type = Func()
-        d.load_keys_list = Func()
+        page = cls.page = dialog.keyspage
+        dialog.note.select(page)
+        page.set_keys_type = Func()
+        page.load_keys_list = Func()
 
     @classmethod
     def tearDownClass(cls):
-        d = dialog
-        del d.set_keys_type, d.load_keys_list
+        page = cls.page
+        del page.set_keys_type, page.load_keys_list
 
     def setUp(self):
-        d = dialog
+        d = self.page
         # The following is needed for test_load_key_cfg, _delete_custom_keys.
         # This may indicate a defect in some test or function.
         for section in idleConf.GetSectionList('user', 'keys'):
@@ -258,7 +263,7 @@ def setUp(self):
 
     def test_load_key_cfg(self):
         tracers.detach()
-        d = dialog
+        d = self.page
         eq = self.assertEqual
 
         # Use builtin keyset with no user keysets created.
@@ -300,7 +305,7 @@ def test_load_key_cfg(self):
 
     def test_keyset_source(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         # Test these separately.
         d.var_changed_builtin_name = Func()
         d.var_changed_custom_name = Func()
@@ -321,7 +326,7 @@ def test_keyset_source(self):
 
     def test_builtin_name(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         idleConf.userCfg['main'].remove_section('Keys')
         item_list = ['IDLE Classic Windows', 'IDLE Classic OSX',
                      'IDLE Modern UNIX']
@@ -352,7 +357,7 @@ def test_builtin_name(self):
         eq(d.load_keys_list.args, ('IDLE Classic OSX', ))
 
     def test_custom_name(self):
-        d = dialog
+        d = self.page
 
         # If no selections, doesn't get added.
         d.customlist.SetMenu([], '- no custom keys -')
@@ -366,7 +371,7 @@ def test_custom_name(self):
         self.assertEqual(d.load_keys_list.called, 1)
 
     def test_keybinding(self):
-        d = dialog
+        d = self.page
         d.custom_name.set('my custom keys')
         d.bindingslist.delete(0, 'end')
         d.bindingslist.insert(0, 'copy')
@@ -386,7 +391,7 @@ def test_keybinding(self):
 
     def test_set_keys_type(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         del d.set_keys_type
 
         # Builtin keyset selected.
@@ -407,7 +412,7 @@ def test_set_keys_type(self):
 
     def test_get_new_keys(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         orig_getkeysdialog = configdialog.GetKeysDialog
         gkd = configdialog.GetKeysDialog = Func(return_self=True)
         gnkn = d.get_new_keys_name = Func()
@@ -456,7 +461,7 @@ def test_get_new_keys(self):
     def test_get_new_keys_name(self):
         orig_sectionname = configdialog.SectionName
         sn = configdialog.SectionName = Func(return_self=True)
-        d = dialog
+        d = self.page
 
         sn.result = 'New Keys'
         self.assertEqual(d.get_new_keys_name(''), 'New Keys')
@@ -464,7 +469,7 @@ def test_get_new_keys_name(self):
         configdialog.SectionName = orig_sectionname
 
     def test_save_as_new_key_set(self):
-        d = dialog
+        d = self.page
         gnkn = d.get_new_keys_name = Func()
         d.keyset_source.set(True)
 
@@ -482,7 +487,7 @@ def test_save_as_new_key_set(self):
         del d.get_new_keys_name
 
     def test_on_bindingslist_select(self):
-        d = dialog
+        d = self.page
         b = d.bindingslist
         b.delete(0, 'end')
         b.insert(0, 'copy')
@@ -504,7 +509,7 @@ def test_on_bindingslist_select(self):
 
     def test_create_new_key_set_and_save_new_key_set(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
 
         # Use default as previously active keyset.
         d.keyset_source.set(True)
@@ -535,7 +540,7 @@ def test_create_new_key_set_and_save_new_key_set(self):
 
     def test_load_keys_list(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         gks = idleConf.GetKeySet = Func()
         del d.load_keys_list
         b = d.bindingslist
@@ -578,11 +583,11 @@ def test_load_keys_list(self):
 
     def test_delete_custom_keys(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         d.button_delete_custom_keys['state'] = NORMAL
         yesno = configdialog.tkMessageBox.askyesno = Func()
-        d.deactivate_current_config = Func()
-        d.activate_config_changes = Func()
+        dialog.deactivate_current_config = Func()
+        dialog.activate_config_changes = Func()
 
         keyset_name = 'spam key set'
         idleConf.userCfg['keys'].SetOption(keyset_name, 'name', 'value')
@@ -598,8 +603,8 @@ def test_delete_custom_keys(self):
         eq(yesno.called, 1)
         eq(keyspage[keyset_name], {'option': 'True'})
         eq(idleConf.GetSectionList('user', 'keys'), ['spam key set'])
-        eq(d.deactivate_current_config.called, 0)
-        eq(d.activate_config_changes.called, 0)
+        eq(dialog.deactivate_current_config.called, 0)
+        eq(dialog.activate_config_changes.called, 0)
         eq(d.set_keys_type.called, 0)
 
         # Confirm deletion.
@@ -610,11 +615,11 @@ def test_delete_custom_keys(self):
         eq(idleConf.GetSectionList('user', 'keys'), [])
         eq(d.custom_keyset_on['state'], DISABLED)
         eq(d.custom_name.get(), '- no custom keys -')
-        eq(d.deactivate_current_config.called, 1)
-        eq(d.activate_config_changes.called, 1)
+        eq(dialog.deactivate_current_config.called, 1)
+        eq(dialog.activate_config_changes.called, 1)
         eq(d.set_keys_type.called, 1)
 
-        del d.activate_config_changes, d.deactivate_current_config
+        del dialog.activate_config_changes, dialog.deactivate_current_config
         del configdialog.tkMessageBox.askyesno
 
 
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-15-12-58-23.bpo-31205.iuziZ5.rst b/Misc/NEWS.d/next/IDLE/2017-08-15-12-58-23.bpo-31205.iuziZ5.rst
new file mode 100644
index 00000000000..007a2e2fc55
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-15-12-58-23.bpo-31205.iuziZ5.rst
@@ -0,0 +1,2 @@
+IDLE: Factor KeysPage(Frame) class from ConfigDialog.  The slightly
+modified tests continue to pass.  Patch by Cheryl Sabella.


From webhook-mailer at python.org  Tue Aug 15 19:15:07 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Tue, 15 Aug 2017 23:15:07 -0000
Subject: [Python-checkins] bpo-30928: Update idlelib/NEWS.txt to 2017-08-15.
 (#3098)
Message-ID: <mailman.18.1502838909.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/7f066844a79ea201a28b9555baf4bceded90484f
commit: 7f066844a79ea201a28b9555baf4bceded90484f
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-15T19:15:04-04:00
summary:

bpo-30928: Update idlelib/NEWS.txt to 2017-08-15. (#3098)

files:
M Lib/idlelib/NEWS.txt

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 7d6d362e2d5..e78818e5be3 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,34 @@ Released on 2018-06-18?
 ========================
 
 
+bpo-31205: Factor KeysPage(Frame) class from ConfigDialog.
+The slightly modified tests continue to pass.
+Patch by Cheryl Sabella.
+
+bpo-31002: Add tests for configdialog keys tab.
+Patch by Cheryl Sabella.
+
+bpo-19903: Change calltipes to use inspect.signature.
+Idlelib.calltips.get_argspec now uses inspect.signature instead of
+inspect.getfullargspec, like help() does.  This improves the signature
+in the call tip in a few different cases, including builtins converted
+to provide a signature.  A message is added if the object is not
+callable, has an invalid signature, or if it has positional-only
+parameters.  Patch by Louie Lu.
+
+bop-31083: Add an outline of a TabPage class in configdialog.
+Add template as comment. Update existing classes to match outline.
+Initial patch by Cheryl Sabella.
+
+bpo-31050: Factor GenPage(Frame) class from ConfigDialog.
+The slightly modified tests for the General tab continue to pass.
+Patch by Cheryl Sabella.
+
+bpo-31004: Factor FontPage(Frame) class from ConfigDialog.
+The slightly modified tests continue to pass. The General test
+broken by the switch to ttk.Notebook is fixed.
+Patch mostly by Cheryl Sabella.
+
 bpo-30781: IDLE - Use ttk Notebook in ConfigDialog.
 Patch by Terry Jan Reedy.
 
@@ -81,7 +109,7 @@ so that instances of the latter two can be placed with other widgets
 within a multiframe window.
 Patches by Cheryl Sabella and Terry Jan Reedy.
 
-bp0-30723: Make several improvements to parenmatch.
+bpo-30723: Make several improvements to parenmatch.
 * Add 'parens' style to highlight both opener and closer.
 * Make 'default' style, which is not default, a synonym for 'opener'.
 * Make time-delay work the same with all styles.


From webhook-mailer at python.org  Tue Aug 15 19:41:09 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Tue, 15 Aug 2017 23:41:09 -0000
Subject: [Python-checkins] [3.6] bpo-30928: Update idlelib/NEWS.txt to
 2017-08-15. (GH-3098) (#3099)
Message-ID: <mailman.19.1502840470.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/de36ba065e933648f5687998021175cf21d4564b
commit: de36ba065e933648f5687998021175cf21d4564b
branch: 3.6
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-15T19:41:03-04:00
summary:

[3.6] bpo-30928: Update idlelib/NEWS.txt to 2017-08-15. (GH-3098) (#3099)

(cherry picked from commit 7f06684)

files:
M Lib/idlelib/NEWS.txt

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 35a0115c73b..ff69d48d3df 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,34 @@ Released on 2017-09-25?
 ========================
 
 
+bpo-31205: Factor KeysPage(Frame) class from ConfigDialog.
+The slightly modified tests continue to pass.
+Patch by Cheryl Sabella.
+
+bpo-31002: Add tests for configdialog keys tab.
+Patch by Cheryl Sabella.
+
+bpo-19903: Change calltipes to use inspect.signature.
+Idlelib.calltips.get_argspec now uses inspect.signature instead of
+inspect.getfullargspec, like help() does.  This improves the signature
+in the call tip in a few different cases, including builtins converted
+to provide a signature.  A message is added if the object is not
+callable, has an invalid signature, or if it has positional-only
+parameters.  Patch by Louie Lu.
+
+bop-31083: Add an outline of a TabPage class in configdialog.
+Add template as comment. Update existing classes to match outline.
+Initial patch by Cheryl Sabella.
+
+bpo-31050: Factor GenPage(Frame) class from ConfigDialog.
+The slightly modified tests for the General tab continue to pass.
+Patch by Cheryl Sabella.
+
+bpo-31004: Factor FontPage(Frame) class from ConfigDialog.
+The slightly modified tests continue to pass. The General test
+broken by the switch to ttk.Notebook is fixed.
+Patch mostly by Cheryl Sabella.
+
 bpo-30781: IDLE - Use ttk Notebook in ConfigDialog.
 Patch by Terry Jan Reedy.
 
@@ -81,7 +109,7 @@ so that instances of the latter two can be placed with other widgets
 within a multiframe window.
 Patches by Cheryl Sabella and Terry Jan Reedy.
 
-bp0-30723: Make several improvements to parenmatch.
+bpo-30723: Make several improvements to parenmatch.
 * Add 'parens' style to highlight both opener and closer.
 * Make 'default' style, which is not default, a synonym for 'opener'.
 * Make time-delay work the same with all styles.


From lp_benchmark_robot at intel.com  Tue Aug 15 20:27:50 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Tue, 15 Aug 2017 17:27:50 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-15
Message-ID: <b580eb25-1918-4f49-a515-fe78e5a1e3ca@orsmsx103.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-15 03:03:56-07:00.
  - commit:		7b40cb7
  - previous commit:	48d9823
  - revision date:	2017-08-15 10:33:43+02:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.080% |  +0.017%   |  +4.227%   |  +7.609%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.819% |  +0.348%   |  +21.728%  |  +9.221%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 2.994% |  +0.103%   |  +23.788%  |  +7.403%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.460% |  +0.066%   |  +21.176%  |  +8.864%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.490% |  -0.006%   |  +2.922%   |  +14.915%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.678% |  +0.377%   |  +11.318%  |  +9.982%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.605% |  +0.124%   |  +6.211%   |  +10.217%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.589% |  +0.024%   |  +4.220%   |  +5.304%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.953% |  +0.784%   |  +6.398%   |  +18.007%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.777% |  -0.182%   |  +9.177%   |  +15.018%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.627% |  +0.177%   |  +4.347%   |  +5.948%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.476% |  +0.525%   |  +5.044%   |  +4.796%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.784% |  -0.117%   |  +2.878%   |  +5.773%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.390% |  +0.229%   |  +9.298%   |  +10.186%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.336% |  +0.674%   |  +7.954%   |  +9.708%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.803% |  +0.146%   |  +6.356%   |  +10.503%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.566% |  +0.080%   |  +9.109%   |  +10.293%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.421% |  -0.592%   |  +7.907%   |  +10.017%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.489% |  +0.143%   |  +4.652%   |  +9.208%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 2.260% |  -0.094%   |  +2.787%   |  +10.769%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.551% |  -1.027%   |  +7.998%   |  +13.705%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 3.000% |  -0.114%   |  +47.224%  |  +10.782%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.756% |  -1.194%   |  +9.170%   |  +14.302%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.466% |  +0.127%   |  +18.735%  |  +9.984%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 6.710% |  +0.247%   |  +5.601%   |  +14.166%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.840% |  -0.741%   |  +3.942%   |  +4.238%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.478% |  +0.000%   |  -1.898%   |  +2.485%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 2.348% |  +0.338%   |  +2.145%   |  +7.011%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.158% |  +1.151%   |  +5.761%   |  +8.723%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 3.132% |  +0.089%   |  +0.936%   |  +23.323%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.519% |  +0.053%   |  +2.546%   |  +18.843%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.857% |  -0.318%   |  +4.915%   |  +19.350%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.532% |  -0.119%   |  +12.064%  |  +7.839%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.039% |  +0.030%   |  +0.331%   |  +9.964%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.132% |  -0.082%   |  +8.927%   |  +4.508%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.096% |  -0.067%   |  +0.985%   |  +4.450%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 0.802% |  +0.001%   |  +9.335%   |  +12.254%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.527% |  -0.816%   |  -10.940%  |  +13.360%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.533% |  +0.016%   |  +1.451%   |  +8.785%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.362% |  +0.301%   |  +1.123%   |  +1.890%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.385% |  -0.121%   |  +11.228%  |  +4.807%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 2.023% |  -0.459%   |  +7.643%   |  +13.633%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 2.405% |  -0.464%   |  +0.436%   |  +3.072%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.138% |  +0.292%   |  +27.297%  |  +7.326%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.812% |  -0.134%   |  +3.083%   |  +5.980%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 1.024% |  -0.056%   |  +13.140%  |  +8.178%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 2.611% |  +0.135%   |  -0.634%   |  -2.978%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 1.620% |  -0.181%   |  +5.551%   |  +2.419%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.268% |  -0.034%   |  +5.381%   |  +8.543%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.853% |  -0.174%   |  +5.851%   |  +4.716%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 3.642% |  +1.167%   |  +4.205%   |  +8.594%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.095% |  +0.394%   |  +12.750%  |  +8.129%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.435% |  +0.096%   |  +10.463%  |  +6.537%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.814% |  +0.443%   |  +12.396%  |  +9.361%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.384% |  +0.044%   |  +13.669%  |  +10.254%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 6.139% |  +0.396%   |  +23.783%  |  +9.925%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.318% |  -0.139%   |  +5.834%   |  +7.080%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.419% |  -0.093%   |  +0.535%   |  +0.823%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle|10.280% |  -1.642%   |  +6.300%   |  +21.727%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 2.182% |  -0.341%   |  -3.789%   |  +19.764%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 2.418% |  -0.484%   |  +6.755%   |  +7.029%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.349% |  -0.168%   |  +5.612%   |  +8.364%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.089% |  -0.237%   |  +2.223%   |  +6.577%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 1.010% |  +0.029%   |  -5.264%   |  +9.799%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.488% |  -0.187%   |  +6.345%   |  +8.075%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-15

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Wed Aug 16 05:02:11 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 16 Aug 2017 09:02:11 -0000
Subject: [Python-checkins] bpo-30983: Revert changes which broke most
 buildbots (#3100)
Message-ID: <mailman.20.1502874132.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/7cc33998b83df6ab8cf2c1afe16a61ee232e39ec
commit: 7cc33998b83df6ab8cf2c1afe16a61ee232e39ec
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-16T11:02:05+02:00
summary:

bpo-30983: Revert changes which broke most buildbots (#3100)

* Revert "Add Bruno Penteado to ACKS (#3091)"

This reverts commit f978405b3f092e4005b92ba1dbaab15f609b3bb0.

* Revert "bpo-30983: eval frame rename in pep 0523 broke gdb's python extension (#2803)"

This reverts commit 2e0f4db114424a00354eab889ba8f7334a2ab8f0.

files:
M Misc/ACKS
M Tools/gdb/libpython.py

diff --git a/Misc/ACKS b/Misc/ACKS
index c55d09ac67c..6fc41b36b59 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1184,7 +1184,6 @@ Berker Peksag
 Andreas Pelme
 Steven Pemberton
 Bo Peng
-Bruno "Polaco" Penteado
 Santiago Peres?n
 George Peristerakis
 Thomas Perl
diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index 7c8874a7ace..cc23b8402df 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -1502,10 +1502,8 @@ def is_python_frame(self):
         return False
 
     def is_evalframeex(self):
-        '''Is this a PyEval_EvalFrameEx or _PyEval_EvalFrameDefault (PEP 0523)
-        frame?'''
-        if self._gdbframe.name() in ('PyEval_EvalFrameEx',
-                                     '_PyEval_EvalFrameDefault'):
+        '''Is this a PyEval_EvalFrameEx frame?'''
+        if self._gdbframe.name() == 'PyEval_EvalFrameEx':
             '''
             I believe we also need to filter on the inline
             struct frame_id.inline_depth, only regarding frames with


From webhook-mailer at python.org  Wed Aug 16 05:02:11 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 16 Aug 2017 09:02:11 -0000
Subject: [Python-checkins] Revert "[3.6] bpo-30983: eval frame rename in pep
 0523 broke gdb's python extension (GH-2803) (#3090)" (#3101)
Message-ID: <mailman.21.1502874133.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/98e26979aa4c15b391fd3780340772a17d513d4d
commit: 98e26979aa4c15b391fd3780340772a17d513d4d
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-16T11:02:08+02:00
summary:

Revert "[3.6] bpo-30983: eval frame rename in pep 0523 broke gdb's python extension (GH-2803) (#3090)" (#3101)

This reverts commit 09b77165e3fffa7b7ff160ad06042cdcfa004bf5.

files:
D Misc/NEWS.d/next/Tools-Demos/2017-08-14-15-37-38.bpo-30983.A7UzX8.rst
M Tools/gdb/libpython.py

diff --git a/Misc/NEWS.d/next/Tools-Demos/2017-08-14-15-37-38.bpo-30983.A7UzX8.rst b/Misc/NEWS.d/next/Tools-Demos/2017-08-14-15-37-38.bpo-30983.A7UzX8.rst
deleted file mode 100644
index 44c5e1c6967..00000000000
--- a/Misc/NEWS.d/next/Tools-Demos/2017-08-14-15-37-38.bpo-30983.A7UzX8.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-With PEP 523, gdb's Python integration stopped working properly for frames
-using the ``_PyEval_EvalFrameDefault`` function.  Affected functionality
-included `py-list` and `py-bt`.  This is now fixed.  Patch by Bruno "Polaco"
-Penteado.
diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index 40e0a677cd0..31ae8117c78 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -1502,10 +1502,8 @@ def is_python_frame(self):
         return False
 
     def is_evalframeex(self):
-        '''Is this a PyEval_EvalFrameEx or _PyEval_EvalFrameDefault (PEP 0523)
-        frame?'''
-        if self._gdbframe.name() in ('PyEval_EvalFrameEx',
-                                     '_PyEval_EvalFrameDefault'):
+        '''Is this a PyEval_EvalFrameEx frame?'''
+        if self._gdbframe.name() == 'PyEval_EvalFrameEx':
             '''
             I believe we also need to filter on the inline
             struct frame_id.inline_depth, only regarding frames with


From solipsis at pitrou.net  Wed Aug 16 05:05:39 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 16 Aug 2017 09:05:39 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=4
Message-ID: <20170816090537.85097.F4570BC3935EDEBB@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_fork leaked [2, -2, 0] memory blocks, sum=0


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogMeWcy_', '--timeout', '7200']

From webhook-mailer at python.org  Wed Aug 16 06:46:07 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 16 Aug 2017 10:46:07 -0000
Subject: [Python-checkins] bpo-31069,
 test_multiprocessing: Fix dangling process (#3103)
Message-ID: <mailman.22.1502880370.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/17657bb9458ff8f8804b7637d61686a68f4b9471
commit: 17657bb9458ff8f8804b7637d61686a68f4b9471
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-16T12:46:04+02:00
summary:

bpo-31069, test_multiprocessing: Fix dangling process (#3103)

Fix a warning about dangling processes in test_rapid_restart() of
_test_multiprocessing: join the process.

files:
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index cce3c0287e9..dce62df1d02 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -2596,12 +2596,13 @@ def test_rapid_restart(self):
         manager.start()
 
         p = self.Process(target=self._putter, args=(manager.address, authkey))
-        p.daemon = True
         p.start()
+        p.join()
         queue = manager.get_queue()
         self.assertEqual(queue.get(), 'hello world')
         del queue
         manager.shutdown()
+
         manager = QueueManager(
             address=addr, authkey=authkey, serializer=SERIALIZER)
         try:


From webhook-mailer at python.org  Wed Aug 16 07:14:41 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 16 Aug 2017 11:14:41 -0000
Subject: [Python-checkins] bpo-31069,
 test_multiprocessing: Fix dangling process (#3103) (#3104)
Message-ID: <mailman.23.1502882083.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/78c66a641a0d4fe61356ebfae8772e4fae24dcb7
commit: 78c66a641a0d4fe61356ebfae8772e4fae24dcb7
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-16T13:14:38+02:00
summary:

bpo-31069, test_multiprocessing: Fix dangling process (#3103) (#3104)

Fix a warning about dangling processes in test_rapid_restart() of
_test_multiprocessing: join the process.
(cherry picked from commit 17657bb9458ff8f8804b7637d61686a68f4b9471)

files:
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 4d3c6558374..db30e6b9d22 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -2425,12 +2425,13 @@ def test_rapid_restart(self):
         manager.start()
 
         p = self.Process(target=self._putter, args=(manager.address, authkey))
-        p.daemon = True
         p.start()
+        p.join()
         queue = manager.get_queue()
         self.assertEqual(queue.get(), 'hello world')
         del queue
         manager.shutdown()
+
         manager = QueueManager(
             address=addr, authkey=authkey, serializer=SERIALIZER)
         try:


From webhook-mailer at python.org  Wed Aug 16 07:14:43 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 16 Aug 2017 11:14:43 -0000
Subject: [Python-checkins] bpo-31069,
 test_multiprocessing: Fix dangling process (#3103) (#3105)
Message-ID: <mailman.24.1502882085.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/883520a846d87f01a14636978cfa9cee1ecc07c1
commit: 883520a846d87f01a14636978cfa9cee1ecc07c1
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-16T13:14:40+02:00
summary:

bpo-31069, test_multiprocessing: Fix dangling process (#3103) (#3105)

Fix a warning about dangling processes in test_rapid_restart() of
_test_multiprocessing: join the process.
(cherry picked from commit 17657bb9458ff8f8804b7637d61686a68f4b9471)

files:
M Lib/test/test_multiprocessing.py

diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 69bd8f79a85..a77bfee6718 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -1583,12 +1583,13 @@ def test_rapid_restart(self):
         manager.start()
 
         p = self.Process(target=self._putter, args=(manager.address, authkey))
-        p.daemon = True
         p.start()
+        p.join()
         queue = manager.get_queue()
         self.assertEqual(queue.get(), 'hello world')
         del queue
         manager.shutdown()
+
         manager = QueueManager(
             address=addr, authkey=authkey, serializer=SERIALIZER)
         manager.start()


From webhook-mailer at python.org  Wed Aug 16 14:53:32 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Wed, 16 Aug 2017 18:53:32 -0000
Subject: [Python-checkins] bpo-18966: non-daemonic threads created by a
 multiprocessing.Process should be joined on exit (#3111)
Message-ID: <mailman.25.1502909614.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/ee84a608587b930176d37303afae8a4358e15990
commit: ee84a608587b930176d37303afae8a4358e15990
branch: master
author: Antoine Pitrou <pitrou at free.fr>
committer: GitHub <noreply at github.com>
date: 2017-08-16T20:53:28+02:00
summary:

bpo-18966: non-daemonic threads created by a multiprocessing.Process should be joined on exit (#3111)

* bpo-18966: non-daemonic threads created by a multiprocessing.Process should be joined on exit

* Add NEWS blurb

files:
A Misc/NEWS.d/next/Library/2017-08-16-20-28-06.bpo-18966.mjHWk2.rst
M Lib/multiprocessing/process.py
M Lib/test/_test_multiprocessing.py
M Lib/threading.py

diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py
index 8e500dc93dc..8fff3e105ea 100644
--- a/Lib/multiprocessing/process.py
+++ b/Lib/multiprocessing/process.py
@@ -17,6 +17,7 @@
 import sys
 import signal
 import itertools
+import threading
 from _weakrefset import WeakSet
 
 #
@@ -311,6 +312,7 @@ def _bootstrap(self):
             sys.stderr.write('Process %s:\n' % self.name)
             traceback.print_exc()
         finally:
+            threading._shutdown()
             util.info('process exiting with exitcode %d' % exitcode)
             sys.stdout.flush()
             sys.stderr.flush()
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index dce62df1d02..d6fe7d62675 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -542,6 +542,32 @@ def test_child_fd_inflation(self):
                 p.join()
             close_queue(q)
 
+    @classmethod
+    def _test_wait_for_threads(self, evt):
+        def func1():
+            time.sleep(0.5)
+            evt.set()
+
+        def func2():
+            time.sleep(20)
+            evt.clear()
+
+        threading.Thread(target=func1).start()
+        threading.Thread(target=func2, daemon=True).start()
+
+    def test_wait_for_threads(self):
+        # A child process should wait for non-daemonic threads to end
+        # before exiting
+        if self.TYPE == 'threads':
+            self.skipTest('test not appropriate for {}'.format(self.TYPE))
+
+        evt = self.Event()
+        proc = self.Process(target=self._test_wait_for_threads, args=(evt,))
+        proc.start()
+        proc.join()
+        self.assertTrue(evt.is_set())
+
+
 #
 #
 #
diff --git a/Lib/threading.py b/Lib/threading.py
index 92c2ab365b4..06dbc682834 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -1284,6 +1284,9 @@ def _shutdown():
     # the main thread's tstate_lock - that won't happen until the interpreter
     # is nearly dead.  So we release it here.  Note that just calling _stop()
     # isn't enough:  other threads may already be waiting on _tstate_lock.
+    if _main_thread._is_stopped:
+        # _shutdown() was already called
+        return
     tlock = _main_thread._tstate_lock
     # The main thread isn't finished yet, so its thread state lock can't have
     # been released.
diff --git a/Misc/NEWS.d/next/Library/2017-08-16-20-28-06.bpo-18966.mjHWk2.rst b/Misc/NEWS.d/next/Library/2017-08-16-20-28-06.bpo-18966.mjHWk2.rst
new file mode 100644
index 00000000000..53bea710127
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-16-20-28-06.bpo-18966.mjHWk2.rst
@@ -0,0 +1,2 @@
+Non-daemonic threads created by a multiprocessing.Process are now joined on
+child exit.


From lp_benchmark_robot at intel.com  Wed Aug 16 20:17:39 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Wed, 16 Aug 2017 17:17:39 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-16
Message-ID: <6d7cf300-288d-4fa4-8a26-b14424ac3329@orsmsx106.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-16 03:03:58-07:00.
  - commit:		7cc3399
  - previous commit:	7b40cb7
  - revision date:	2017-08-16 11:02:05+02:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.152% |  +0.031%   |  +4.257%   |  +8.173%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.709% |  -0.198%   |  +21.573%  |  +11.282%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 1.723% |  +0.702%   |  +24.323%  |  +10.077%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.672% |  -0.188%   |  +21.028%  |  +7.930%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.369% |  -0.336%   |  +2.595%   |  +16.066%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.984% |  -0.321%   |  +11.034%  |  +10.838%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 1.848% |  -0.013%   |  +6.199%   |  +10.469%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.883% |  +0.056%   |  +4.273%   |  +5.507%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 5.342% |  -0.647%   |  +5.793%   |  +19.776%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 3.334% |  +0.167%   |  +9.329%   |  +13.980%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.633% |  -0.270%   |  +4.089%   |  +6.798%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 1.320% |  -0.955%   |  +4.137%   |  +4.027%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.608% |  +0.368%   |  +3.236%   |  +6.222%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.402% |  -0.370%   |  +8.962%   |  +10.713%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.956% |  -0.038%   |  +7.918%   |  +7.664%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.714% |  +0.056%   |  +6.408%   |  +11.480%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.438% |  -0.054%   |  +9.060%   |  +12.070%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.437% |  -0.123%   |  +7.794%   |  +11.028%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 2.699% |  -1.161%   |  +3.546%   |  +10.117%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 2.305% |  -0.018%   |  +2.770%   |  +11.345%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.314% |  +0.580%   |  +8.532%   |  +12.805%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.537% |  -0.009%   |  +47.219%  |  +11.156%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.522% |  +0.360%   |  +9.497%   |  +12.640%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.439% |  +0.036%   |  +18.764%  |  +11.115%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 6.431% |  -0.555%   |  +5.078%   |  +13.332%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.563% |  -0.580%   |  +3.384%   |  +5.400%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.974% |  -0.102%   |  -2.002%   |  +2.684%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.758% |  +0.574%   |  +2.707%   |  +6.271%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.134% |  +0.164%   |  +5.916%   |  +9.431%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.860% |  -0.123%   |  +0.814%   |  +22.410%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.240% |  -0.119%   |  +2.430%   |  +19.292%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.790% |  +0.229%   |  +5.133%   |  +18.193%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 2.174% |  +0.678%   |  +12.660%  |  +9.274%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.137% |  -0.033%   |  +0.299%   |  +10.052%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.135% |  -0.053%   |  +8.878%   |  +4.983%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.096% |  -0.084%   |  +0.903%   |  +4.776%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.381% |  -0.151%   |  +9.198%   |  +13.199%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.873% |  +1.523%   |  -9.251%   |  +11.600%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.434% |  +0.070%   |  +1.521%   |  +8.359%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.573% |  -0.385%   |  +0.743%   |  +3.360%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 0.872% |  +0.071%   |  +11.292%  |  +3.864%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.652% |  +0.090%   |  +7.726%   |  +14.711%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.479% |  +0.366%   |  +0.801%   |  +2.091%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 2.007% |  -0.714%   |  +26.778%  |  +8.282%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.439% |  +0.591%   |  +3.656%   |  +6.295%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.387% |  +0.212%   |  +13.324%  |  +9.544%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 1.762% |  +0.244%   |  -0.389%   |  -4.261%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 1.605% |  +0.087%   |  +5.632%   |  +2.312%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.284% |  -0.194%   |  +5.197%   |  +6.764%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.271% |  -0.526%   |  +5.356%   |  +3.977%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.231% |  -1.285%   |  +2.974%   |  +6.806%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.300% |  -0.571%   |  +12.252%  |  +7.873%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.484% |  -0.033%   |  +10.433%  |  +6.434%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.601% |  -0.325%   |  +12.112%  |  +8.021%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.284% |  +0.012%   |  +13.680%  |  +8.941%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 5.570% |  -0.904%   |  +23.094%  |  +10.781%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.057% |  +0.275%   |  +6.094%   |  +4.711%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.170% |  +0.371%   |  +0.905%   |  -1.236%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 8.489% |  +1.815%   |  +8.001%   |  +21.395%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 2.026% |  +0.366%   |  -3.410%   |  +18.766%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 2.652% |  +0.106%   |  +6.854%   |  +6.123%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.304% |  +0.116%   |  +5.721%   |  +7.843%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 1.946% |  +0.003%   |  +2.225%   |  +6.764%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 1.402% |  -0.115%   |  -5.385%   |  +11.070%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.152% |  +0.372%   |  +6.694%   |  +8.101%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-16

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From solipsis at pitrou.net  Thu Aug 17 05:07:16 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 17 Aug 2017 09:07:16 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=7
Message-ID: <20170817090715.90083.897D138A53998FA3@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_asyncio leaked [0, 0, 3] memory blocks, sum=3
test_functools leaked [0, 3, 1] memory blocks, sum=4


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogBRVFBa', '--timeout', '7200']

From webhook-mailer at python.org  Thu Aug 17 08:33:09 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 17 Aug 2017 12:33:09 -0000
Subject: [Python-checkins] bpo-29619: Do not use HAVE_LARGEFILE_SUPPORT for
 type conversions (GH-1666) (#3102)
Message-ID: <mailman.26.1502973192.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/ffbb6f7334ccf54f09dcc9e760766d861928f13e
commit: ffbb6f7334ccf54f09dcc9e760766d861928f13e
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-17T14:33:06+02:00
summary:

bpo-29619: Do not use HAVE_LARGEFILE_SUPPORT for type conversions (GH-1666) (#3102)

Use only the LongLong form for the conversions

(cherry picked from commit 50e86033de85294d87b7e942701d456342abde8e)

files:
M Modules/posixmodule.c

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 97b57198cd4..111e4c9fde5 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -1934,14 +1934,8 @@ _pystat_fromstructstat(STRUCT_STAT *st)
         return NULL;
 
     PyStructSequence_SET_ITEM(v, 0, PyLong_FromLong((long)st->st_mode));
-#if defined(HAVE_LARGEFILE_SUPPORT) || defined(MS_WINDOWS)
     Py_BUILD_ASSERT(sizeof(unsigned long long) >= sizeof(st->st_ino));
-    PyStructSequence_SET_ITEM(v, 1,
-                              PyLong_FromUnsignedLongLong(st->st_ino));
-#else
-    Py_BUILD_ASSERT(sizeof(unsigned long) >= sizeof(st->st_ino));
-    PyStructSequence_SET_ITEM(v, 1, PyLong_FromUnsignedLong(st->st_ino));
-#endif
+    PyStructSequence_SET_ITEM(v, 1, PyLong_FromUnsignedLongLong(st->st_ino));
 #ifdef MS_WINDOWS
     PyStructSequence_SET_ITEM(v, 2, PyLong_FromUnsignedLong(st->st_dev));
 #else
@@ -1955,12 +1949,8 @@ _pystat_fromstructstat(STRUCT_STAT *st)
     PyStructSequence_SET_ITEM(v, 4, _PyLong_FromUid(st->st_uid));
     PyStructSequence_SET_ITEM(v, 5, _PyLong_FromGid(st->st_gid));
 #endif
-#ifdef HAVE_LARGEFILE_SUPPORT
-    PyStructSequence_SET_ITEM(v, 6,
-                              PyLong_FromLongLong((long long)st->st_size));
-#else
-    PyStructSequence_SET_ITEM(v, 6, PyLong_FromLong(st->st_size));
-#endif
+    Py_BUILD_ASSERT(sizeof(long long) >= sizeof(st->st_size));
+    PyStructSequence_SET_ITEM(v, 6, PyLong_FromLongLong(st->st_size));
 
 #if defined(HAVE_STAT_TV_NSEC)
     ansec = st->st_atim.tv_nsec;
@@ -11484,11 +11474,8 @@ DirEntry_inode(DirEntry *self)
     Py_BUILD_ASSERT(sizeof(unsigned long long) >= sizeof(self->win32_file_index));
     return PyLong_FromUnsignedLongLong(self->win32_file_index);
 #else /* POSIX */
-#ifdef HAVE_LARGEFILE_SUPPORT
-    return PyLong_FromLongLong((long long)self->d_ino);
-#else
-    return PyLong_FromLong((long)self->d_ino);
-#endif
+    Py_BUILD_ASSERT(sizeof(unsigned long long) >= sizeof(self->d_ino));
+    return PyLong_FromUnsignedLongLong(self->d_ino);
 #endif
 }
 


From webhook-mailer at python.org  Thu Aug 17 08:46:09 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Thu, 17 Aug 2017 12:46:09 -0000
Subject: [Python-checkins] bpo-24700: Add a fast path for comparing
 array.array of equal type (#3009)
Message-ID: <mailman.27.1502973971.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/7c17e2304b9387f321c813516bf134e4f0bd332a
commit: 7c17e2304b9387f321c813516bf134e4f0bd332a
branch: master
author: Adrian Wielgosik <adrian17 at users.noreply.github.com>
committer: Antoine Pitrou <pitrou at free.fr>
date: 2017-08-17T14:46:06+02:00
summary:

bpo-24700: Add a fast path for comparing array.array of equal type (#3009)

files:
A Misc/NEWS.d/next/Library/2017-08-08-15-14-34.bpo-24700.44mvNV.rst
M Lib/test/test_array.py
M Modules/arraymodule.c

diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
index d67f9195eba..e9218f3dd68 100644
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -1342,6 +1342,16 @@ class FPTest(NumberTest):
     def assertEntryEqual(self, entry1, entry2):
         self.assertAlmostEqual(entry1, entry2)
 
+    def test_nan(self):
+        a = array.array(self.typecode, [float('nan')])
+        b = array.array(self.typecode, [float('nan')])
+        self.assertIs(a != b, True)
+        self.assertIs(a == b, False)
+        self.assertIs(a > b, False)
+        self.assertIs(a >= b, False)
+        self.assertIs(a < b, False)
+        self.assertIs(a <= b, False)
+
     def test_byteswap(self):
         a = array.array(self.typecode, self.example)
         self.assertRaises(TypeError, a.byteswap, 42)
diff --git a/Misc/NEWS.d/next/Library/2017-08-08-15-14-34.bpo-24700.44mvNV.rst b/Misc/NEWS.d/next/Library/2017-08-08-15-14-34.bpo-24700.44mvNV.rst
new file mode 100644
index 00000000000..a78172e0423
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-08-15-14-34.bpo-24700.44mvNV.rst
@@ -0,0 +1,2 @@
+Optimize array.array comparison. It is now from 10x up to 70x faster when
+comparing arrays holding values of the same integer type.
\ No newline at end of file
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 06461c38036..1d9a4f11d87 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -31,6 +31,7 @@ struct arraydescr {
     int itemsize;
     PyObject * (*getitem)(struct arrayobject *, Py_ssize_t);
     int (*setitem)(struct arrayobject *, Py_ssize_t, PyObject *);
+    int (*compareitems)(const void *, const void *, Py_ssize_t);
     const char *formats;
     int is_integer_type;
     int is_signed;
@@ -518,6 +519,28 @@ d_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
     return 0;
 }
 
+#define DEFINE_COMPAREITEMS(code, type) \
+    static int \
+    code##_compareitems(const void *lhs, const void *rhs, Py_ssize_t length) \
+    { \
+        const type *a = lhs, *b = rhs; \
+        for (Py_ssize_t i = 0; i < length; ++i) \
+            if (a[i] != b[i]) \
+                return a[i] < b[i] ? -1 : 1; \
+        return 0; \
+    }
+
+DEFINE_COMPAREITEMS(b, signed char)
+DEFINE_COMPAREITEMS(BB, unsigned char)
+DEFINE_COMPAREITEMS(u, Py_UNICODE)
+DEFINE_COMPAREITEMS(h, short)
+DEFINE_COMPAREITEMS(HH, unsigned short)
+DEFINE_COMPAREITEMS(i, int)
+DEFINE_COMPAREITEMS(II, unsigned int)
+DEFINE_COMPAREITEMS(l, long)
+DEFINE_COMPAREITEMS(LL, unsigned long)
+DEFINE_COMPAREITEMS(q, long long)
+DEFINE_COMPAREITEMS(QQ, unsigned long long)
 
 /* Description of types.
  *
@@ -525,19 +548,19 @@ d_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
  * typecode.
  */
 static const struct arraydescr descriptors[] = {
-    {'b', 1, b_getitem, b_setitem, "b", 1, 1},
-    {'B', 1, BB_getitem, BB_setitem, "B", 1, 0},
-    {'u', sizeof(Py_UNICODE), u_getitem, u_setitem, "u", 0, 0},
-    {'h', sizeof(short), h_getitem, h_setitem, "h", 1, 1},
-    {'H', sizeof(short), HH_getitem, HH_setitem, "H", 1, 0},
-    {'i', sizeof(int), i_getitem, i_setitem, "i", 1, 1},
-    {'I', sizeof(int), II_getitem, II_setitem, "I", 1, 0},
-    {'l', sizeof(long), l_getitem, l_setitem, "l", 1, 1},
-    {'L', sizeof(long), LL_getitem, LL_setitem, "L", 1, 0},
-    {'q', sizeof(long long), q_getitem, q_setitem, "q", 1, 1},
-    {'Q', sizeof(long long), QQ_getitem, QQ_setitem, "Q", 1, 0},
-    {'f', sizeof(float), f_getitem, f_setitem, "f", 0, 0},
-    {'d', sizeof(double), d_getitem, d_setitem, "d", 0, 0},
+    {'b', 1, b_getitem, b_setitem, b_compareitems, "b", 1, 1},
+    {'B', 1, BB_getitem, BB_setitem, BB_compareitems, "B", 1, 0},
+    {'u', sizeof(Py_UNICODE), u_getitem, u_setitem, u_compareitems, "u", 0, 0},
+    {'h', sizeof(short), h_getitem, h_setitem, h_compareitems, "h", 1, 1},
+    {'H', sizeof(short), HH_getitem, HH_setitem, HH_compareitems, "H", 1, 0},
+    {'i', sizeof(int), i_getitem, i_setitem, i_compareitems, "i", 1, 1},
+    {'I', sizeof(int), II_getitem, II_setitem, II_compareitems, "I", 1, 0},
+    {'l', sizeof(long), l_getitem, l_setitem, l_compareitems, "l", 1, 1},
+    {'L', sizeof(long), LL_getitem, LL_setitem, LL_compareitems, "L", 1, 0},
+    {'q', sizeof(long long), q_getitem, q_setitem, q_compareitems, "q", 1, 1},
+    {'Q', sizeof(long long), QQ_getitem, QQ_setitem, QQ_compareitems, "Q", 1, 0},
+    {'f', sizeof(float), f_getitem, f_setitem, NULL, "f", 0, 0},
+    {'d', sizeof(double), d_getitem, d_setitem, NULL, "d", 0, 0},
     {'\0', 0, 0, 0, 0, 0, 0} /* Sentinel */
 };
 
@@ -664,6 +687,31 @@ array_richcompare(PyObject *v, PyObject *w, int op)
         return res;
     }
 
+    if (va->ob_descr == wa->ob_descr && va->ob_descr->compareitems != NULL) {
+        /* Fast path:
+           arrays with same types can have their buffers compared directly */
+        Py_ssize_t common_length = Py_MIN(Py_SIZE(va), Py_SIZE(wa));
+        int result = va->ob_descr->compareitems(va->ob_item, wa->ob_item,
+                                                common_length);
+        if (result == 0)
+            goto compare_sizes;
+
+        int cmp;
+        switch (op) {
+        case Py_LT: cmp = result < 0; break;
+        case Py_LE: cmp = result <= 0; break;
+        case Py_EQ: cmp = result == 0; break;
+        case Py_NE: cmp = result != 0; break;
+        case Py_GT: cmp = result > 0; break;
+        case Py_GE: cmp = result >= 0; break;
+        default: return NULL; /* cannot happen */
+        }
+        PyObject *res = cmp ? Py_True : Py_False;
+        Py_INCREF(res);
+        return res;
+    }
+
+
     /* Search for the first index where items are different */
     k = 1;
     for (i = 0; i < Py_SIZE(va) && i < Py_SIZE(wa); i++) {
@@ -685,14 +733,17 @@ array_richcompare(PyObject *v, PyObject *w, int op)
 
     if (k) {
         /* No more items to compare -- compare sizes */
+        compare_sizes: ;
         Py_ssize_t vs = Py_SIZE(va);
         Py_ssize_t ws = Py_SIZE(wa);
         int cmp;
         switch (op) {
         case Py_LT: cmp = vs <  ws; break;
         case Py_LE: cmp = vs <= ws; break;
-        case Py_EQ: cmp = vs == ws; break;
-        case Py_NE: cmp = vs != ws; break;
+        /* If the lengths were not equal,
+           the earlier fast-path check would have caught that. */
+        case Py_EQ: assert(vs == ws); cmp = 1; break;
+        case Py_NE: assert(vs == ws); cmp = 0; break;
         case Py_GT: cmp = vs >  ws; break;
         case Py_GE: cmp = vs >= ws; break;
         default: return NULL; /* cannot happen */


From webhook-mailer at python.org  Thu Aug 17 10:24:06 2017
From: webhook-mailer at python.org (Mariatta)
Date: Thu, 17 Aug 2017 14:24:06 -0000
Subject: [Python-checkins] Update the language selection in the docs
 language switch. (GH-3114)
Message-ID: <mailman.28.1502979847.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/b616b972999cdd5fe54ef8a43c131a27ca538dee
commit: b616b972999cdd5fe54ef8a43c131a27ca538dee
branch: master
author: Julien Palard <julien at palard.fr>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-08-17T07:24:02-07:00
summary:

Update the language selection in the docs language switch. (GH-3114)

Change the option for `Fran?ais` into `French` to be consistent with the other language selections that are already in English.

files:
M Doc/tools/static/switchers.js

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index ff23202a5e0..bd31faca4c6 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -20,7 +20,7 @@
 
   var all_languages = {
       'en': 'English',
-      'fr': 'Fran?ais',
+      'fr': 'French',
       'ja': 'Japanese',
   };
 


From webhook-mailer at python.org  Thu Aug 17 10:29:18 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 17 Aug 2017 14:29:18 -0000
Subject: [Python-checkins] bpo-31221: patchcheck ignores external libraries
 (#3109)
Message-ID: <mailman.29.1502980159.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/4a347ce426fe7381885703d9074d7a6b3aeb2f2b
commit: 4a347ce426fe7381885703d9074d7a6b3aeb2f2b
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-17T16:29:15+02:00
summary:

bpo-31221: patchcheck ignores external libraries (#3109)

Tools/scripts/patchcheck.py now ignores changes in directories which
are copies of external libraries:

* Modules/_ctypes/libffi_msvc/
* Modules/_ctypes/libffi_osx/
* Modules/_decimal/libmpdec/
* Modules/expat/
* Modules/zlib/

Drop also support for Mercurial, since CPython migrated to Git.

Exclude also libmpdec

patchcheck: exclude also libffi_osx and libffi_msvc

files:
M Tools/scripts/patchcheck.py

diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py
index 2204ba0a605..8f7924fe934 100755
--- a/Tools/scripts/patchcheck.py
+++ b/Tools/scripts/patchcheck.py
@@ -11,8 +11,16 @@
 import untabify
 
 
+# Excluded directories which are copies of external libraries:
+# don't check their coding style
+EXCLUDE_DIRS = [os.path.join('Modules', '_ctypes', 'libffi_osx'),
+                os.path.join('Modules', '_ctypes', 'libffi_msvc'),
+                os.path.join('Modules', '_decimal', 'libmpdec'),
+                os.path.join('Modules', 'expat'),
+                os.path.join('Modules', 'zlib')]
 SRCDIR = sysconfig.get_config_var('srcdir')
 
+
 def n_files_str(count):
     """Return 'N file(s)' with the proper plurality on 'file'."""
     return "{} file{}".format(count, "s" if count != 1 else "")
@@ -98,7 +106,7 @@ def changed_files(base_branch=None):
         if mq_patches_applied():
             cmd += ' --rev qparent'
         with subprocess.Popen(cmd.split(), stdout=subprocess.PIPE) as st:
-            return [x.decode().rstrip() for x in st.stdout]
+            filenames = [x.decode().rstrip() for x in st.stdout]
     elif os.path.exists(os.path.join(SRCDIR, '.git')):
         # We just use an existence check here as:
         #  directory = normal git checkout/clone
@@ -120,10 +128,20 @@ def changed_files(base_branch=None):
                     # file is renamed
                     filename = filename.split(' -> ', 2)[1].strip()
                 filenames.append(filename)
-        return filenames
     else:
         sys.exit('need a Mercurial or git checkout to get modified files')
 
+    filenames2 = []
+    for filename in filenames:
+        # Normalize the path to be able to match using .startswith()
+        filename = os.path.normpath(filename)
+        if any(filename.startswith(path) for path in EXCLUDE_DIRS):
+            # Exclude the file
+            continue
+        filenames2.append(filename)
+
+    return filenames2
+
 
 def report_modified_files(file_paths):
     count = len(file_paths)


From webhook-mailer at python.org  Thu Aug 17 10:37:03 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 17 Aug 2017 14:37:03 -0000
Subject: [Python-checkins] Update the language selection in the docs
 language switch. (GH-3114) (#3115)
Message-ID: <mailman.30.1502980624.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/fcecb0e365c35fb0e8410609d78881289bee7c26
commit: fcecb0e365c35fb0e8410609d78881289bee7c26
branch: 3.6
author: Julien Palard <julien at palard.fr>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-08-17T16:37:00+02:00
summary:

Update the language selection in the docs language switch. (GH-3114) (#3115)

Change the option for `Fran?ais` into `French` to be consistent with the other language selections that are already in English.
(cherry picked from commit b616b972999cdd5fe54ef8a43c131a27ca538dee)

files:
M Doc/tools/static/switchers.js

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index ff23202a5e0..bd31faca4c6 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -20,7 +20,7 @@
 
   var all_languages = {
       'en': 'English',
-      'fr': 'Fran?ais',
+      'fr': 'French',
       'ja': 'Japanese',
   };
 


From webhook-mailer at python.org  Thu Aug 17 10:37:59 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 17 Aug 2017 14:37:59 -0000
Subject: [Python-checkins] Update the language selection in the docs
 language switch. (GH-3114) (#3117)
Message-ID: <mailman.31.1502980680.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/3cc46bb3ed8005b1d9b74bcb08a9c01b99e84c63
commit: 3cc46bb3ed8005b1d9b74bcb08a9c01b99e84c63
branch: 2.7
author: Julien Palard <julien at palard.fr>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-08-17T16:37:56+02:00
summary:

Update the language selection in the docs language switch. (GH-3114) (#3117)

Change the option for `Fran?ais` into `French` to be consistent with the other language selections that are already in English.
(cherry picked from commit b616b972999cdd5fe54ef8a43c131a27ca538dee)

files:
M Doc/tools/static/switchers.js

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index ff23202a5e0..bd31faca4c6 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -20,7 +20,7 @@
 
   var all_languages = {
       'en': 'English',
-      'fr': 'Fran?ais',
+      'fr': 'French',
       'ja': 'Japanese',
   };
 


From webhook-mailer at python.org  Thu Aug 17 10:40:54 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 17 Aug 2017 14:40:54 -0000
Subject: [Python-checkins] bpo-30871: Add test.pythoninfo (#3075)
Message-ID: <mailman.32.1502980856.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/b907abc88589f7bea52c5afe172ececc6edcda70
commit: b907abc88589f7bea52c5afe172ececc6edcda70
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-17T16:40:51+02:00
summary:

bpo-30871: Add test.pythoninfo (#3075)

* Add Lib/test/pythoninfo.py: script collecting various informations
  about Python to help debugging test failures.
* regrtest: remove sys.hash_info and sys.flags from header.
* Travis CI, Appveyor: run pythoninfo before tests

files:
A Lib/test/pythoninfo.py
M .github/appveyor.yml
M .travis.yml
M Lib/test/libregrtest/main.py

diff --git a/.github/appveyor.yml b/.github/appveyor.yml
index deb0e309a9d..cb9821ccc65 100644
--- a/.github/appveyor.yml
+++ b/.github/appveyor.yml
@@ -7,6 +7,7 @@ branches:
     - buildbot-custom
 build_script:
 - cmd: PCbuild\build.bat -e
+- cmd: PCbuild\win32\python.exe -m test.pythoninfo
 test_script:
 - cmd: PCbuild\rt.bat -q -uall -u-cpu -rwW --slowest --timeout=1200 --fail-env-changed -j0
 environment:
diff --git a/.travis.yml b/.travis.yml
index ba1e417c633..4c431241680 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,6 +60,7 @@ matrix:
             # Need a venv that can parse covered code.
             ./python -m venv venv
             ./venv/bin/python -m pip install -U coverage
+            ./venv/bin/python -m test.pythoninfo
       script:
         # Skip tests that re-run the entire test suite.
         - ./venv/bin/python -m coverage run --pylib -m test -uall,-cpu -x test_multiprocessing_fork -x test_multiprocessing_forkserver -x test_multiprocessing_spawn
@@ -87,6 +88,7 @@ before_script:
         echo "$changes"
         exit 1
       fi
+      ./python -m test.pythoninfo
 
 script:
   # Using the built Python as patchcheck.py is built around the idea of using
diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index 0b48bebb0d7..9871a28dbf2 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -424,8 +424,6 @@ def display_header(self):
         print("==", platform.python_implementation(), *sys.version.split())
         print("==", platform.platform(aliased=True),
                       "%s-endian" % sys.byteorder)
-        print("== hash algorithm:", sys.hash_info.algorithm,
-              "64bit" if sys.maxsize > 2**32 else "32bit")
         print("== cwd:", os.getcwd())
         cpu_count = os.cpu_count()
         if cpu_count:
@@ -433,7 +431,6 @@ def display_header(self):
         print("== encodings: locale=%s, FS=%s"
               % (locale.getpreferredencoding(False),
                  sys.getfilesystemencoding()))
-        print("Testing with flags:", sys.flags)
 
     def run_tests(self):
         # For a partial run, we do not need to clutter the output.
diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
new file mode 100644
index 00000000000..03081b6dddc
--- /dev/null
+++ b/Lib/test/pythoninfo.py
@@ -0,0 +1,407 @@
+"""
+Collect various informations about Python to help debugging test failures.
+"""
+from __future__ import print_function
+import re
+import sys
+import traceback
+
+
+def normalize_text(text):
+    if text is None:
+        return None
+    text = str(text)
+    text = re.sub(r'\s+', ' ', text)
+    return text.strip()
+
+
+class PythonInfo:
+    def __init__(self):
+        self.info = {}
+
+    def add(self, key, value):
+        if key in self.info:
+            raise ValueError("duplicate key: %r" % key)
+
+        if isinstance(value, str):
+            value = value.strip()
+            if not value:
+                return
+        elif value is None:
+            return
+        elif not isinstance(value, int):
+            raise TypeError("value type must be str, int or None")
+
+        self.info[key] = value
+
+    def get_infos(self):
+        """
+        Get informations as a key:value dictionary where values are strings.
+        """
+        return {key: str(value) for key, value in self.info.items()}
+
+
+def copy_attributes(info_add, obj, name_fmt, attributes, *, formatter=None):
+    for attr in attributes:
+        value = getattr(obj, attr, None)
+        if value is None:
+            continue
+        name = name_fmt % attr
+        if formatter is not None:
+            value = formatter(attr, value)
+        info_add(name, value)
+
+
+def collect_sys(info_add):
+    def format_attr(attr, value):
+        if attr == 'flags':
+            # convert sys.flags tuple to string
+            return str(value)
+        else:
+            return value
+
+    attributes = (
+        '_framework',
+        'byteorder',
+        'executable',
+        'flags',
+        'maxsize',
+        'maxunicode',
+        'version',
+    )
+    copy_attributes(info_add, sys, 'sys.%s', attributes,
+                    formatter=format_attr)
+
+    encoding = sys.getfilesystemencoding()
+    if hasattr(sys, 'getfilesystemencodeerrors'):
+        encoding = '%s/%s' % (encoding, sys.getfilesystemencodeerrors())
+    info_add('sys.filesystem_encoding', encoding)
+
+    for name in ('stdin', 'stdout', 'stderr'):
+        stream = getattr(sys, name)
+        if stream is None:
+            continue
+        encoding = getattr(stream, 'encoding', None)
+        if not encoding:
+            continue
+        errors = getattr(stream, 'errors', None)
+        if errors:
+            encoding = '%s/%s' % (encoding, errors)
+        info_add('sys.%s.encoding' % name, encoding)
+
+    if hasattr(sys, 'hash_info'):
+        alg = sys.hash_info.algorithm
+        bits = 64 if sys.maxsize > 2**32 else 32
+        alg = '%s (%s bits)' % (alg, bits)
+        info_add('sys.hash_info', alg)
+
+    if hasattr(sys, 'getandroidapilevel'):
+        info_add('sys.androidapilevel', sys.getandroidapilevel())
+
+
+def collect_platform(info_add):
+    import platform
+
+    arch = platform.architecture()
+    arch = ' '.join(filter(bool, arch))
+    info_add('platform.architecture', arch)
+
+    info_add('platform.python_implementation',
+             platform.python_implementation())
+    info_add('platform.platform',
+             platform.platform(aliased=True))
+
+
+def collect_locale(info_add):
+    import locale
+
+    info_add('locale.encoding', locale.getpreferredencoding(False))
+
+
+def collect_os(info_add):
+    import os
+
+    if hasattr(os, 'getrandom'):
+        # PEP 524: Check is system urandom is initialized
+        try:
+            os.getrandom(1, os.GRND_NONBLOCK)
+            state = 'ready (initialized)'
+        except BlockingIOError as exc:
+            state = 'not seeded yet (%s)' % exc
+        info_add('os.getrandom', state)
+
+    info_add("os.cwd", os.getcwd())
+
+    if hasattr(os, 'getuid'):
+        info_add("os.uid", os.getuid())
+        info_add("os.gid", os.getgid())
+
+    if hasattr(os, 'getgroups'):
+        groups = os.getgroups()
+        groups = map(str, groups)
+        groups = ', '.join(groups)
+        info_add("os.groups", groups)
+
+    if hasattr(os, 'getlogin'):
+        try:
+            login = os.getlogin()
+        except OSError:
+            # getlogin() fails with "OSError: [Errno 25] Inappropriate ioctl
+            # for device" on Travis CI
+            pass
+        else:
+            info_add("os.login", login)
+
+    if hasattr(os, 'cpu_count'):
+        cpu_count = os.cpu_count()
+        if cpu_count:
+            info_add('os.cpu_count', cpu_count)
+
+    if hasattr(os, 'getloadavg'):
+        load = os.getloadavg()
+        info_add('os.loadavg', str(load))
+
+    # Get environment variables: filter to list
+    # to not leak sensitive information
+    ENV_VARS = (
+        "CC",
+        "COMSPEC",
+        "DISPLAY",
+        "DISTUTILS_USE_SDK",
+        "DYLD_LIBRARY_PATH",
+        "HOME",
+        "HOMEDRIVE",
+        "HOMEPATH",
+        "LANG",
+        "LD_LIBRARY_PATH",
+        "MACOSX_DEPLOYMENT_TARGET",
+        "MAKEFLAGS",
+        "MSSDK",
+        "PATH",
+        "SDK_TOOLS_BIN",
+        "SHELL",
+        "TEMP",
+        "TERM",
+        "TMP",
+        "TMPDIR",
+        "USERPROFILE",
+        "WAYLAND_DISPLAY",
+    )
+    for name, value in os.environ.items():
+        uname = name.upper()
+        if (uname in ENV_VARS or uname.startswith(("PYTHON", "LC_"))
+           # Visual Studio: VS140COMNTOOLS
+           or (uname.startswith("VS") and uname.endswith("COMNTOOLS"))):
+            info_add('os.environ[%s]' % name, value)
+
+
+def collect_readline(info_add):
+    try:
+        import readline
+    except ImportError:
+        return
+
+    def format_attr(attr, value):
+        if isinstance(value, int):
+            return "%#x" % value
+        else:
+            return value
+
+    attributes = (
+        "_READLINE_VERSION",
+        "_READLINE_RUNTIME_VERSION",
+        "_READLINE_LIBRARY_VERSION",
+    )
+    copy_attributes(info_add, readline, 'readline.%s', attributes,
+                    formatter=format_attr)
+
+
+def collect_gdb(info_add):
+    import subprocess
+
+    try:
+        proc = subprocess.Popen(["gdb", "-nx", "--version"],
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE,
+                                universal_newlines=True)
+        version = proc.communicate()[0]
+    except OSError:
+        return
+
+    # Only keep the first line
+    version = version.splitlines()[0]
+    info_add('gdb_version', version)
+
+
+def collect_tkinter(info_add):
+    try:
+        import _tkinter
+    except ImportError:
+        pass
+    else:
+        attributes = ('TK_VERSION', 'TCL_VERSION')
+        copy_attributes(info_add, _tkinter, 'tkinter.%s', attributes)
+
+    try:
+        import tkinter
+    except ImportError:
+        pass
+    else:
+        tcl = tkinter.Tcl()
+        patchlevel = tcl.call('info', 'patchlevel')
+        info_add('tkinter.info_patchlevel', patchlevel)
+
+
+def collect_time(info_add):
+    import time
+
+    if not hasattr(time, 'get_clock_info'):
+        return
+
+    for clock in ('time', 'perf_counter'):
+        tinfo = time.get_clock_info(clock)
+        info_add('time.%s' % clock, str(tinfo))
+
+
+def collect_sysconfig(info_add):
+    import sysconfig
+
+    for name in (
+        'ABIFLAGS',
+        'ANDROID_API_LEVEL',
+        'CC',
+        'CCSHARED',
+        'CFLAGS',
+        'CFLAGSFORSHARED',
+        'PY_LDFLAGS',
+        'CONFIG_ARGS',
+        'HOST_GNU_TYPE',
+        'MACHDEP',
+        'MULTIARCH',
+        'OPT',
+        'PY_CFLAGS',
+        'PY_CFLAGS_NODIST',
+        'Py_DEBUG',
+        'Py_ENABLE_SHARED',
+        'SHELL',
+        'SOABI',
+        'prefix',
+    ):
+        value = sysconfig.get_config_var(name)
+        if name == 'ANDROID_API_LEVEL' and not value:
+            # skip ANDROID_API_LEVEL=0
+            continue
+        value = normalize_text(value)
+        info_add('sysconfig[%s]' % name, value)
+
+
+def collect_ssl(info_add):
+    try:
+        import ssl
+    except ImportError:
+        return
+
+    def format_attr(attr, value):
+        if attr.startswith('OP_'):
+            return '%#8x' % value
+        else:
+            # Convert OPENSSL_VERSION_INFO tuple to str
+            return str(value)
+
+    attributes = (
+        'OPENSSL_VERSION',
+        'OPENSSL_VERSION_INFO',
+        'HAS_SNI',
+        'OP_ALL',
+        'OP_NO_TLSv1_1',
+    )
+    copy_attributes(info_add, ssl, 'ssl.%s', attributes, formatter=format_attr)
+
+
+def collect_socket(info_add):
+    import socket
+
+    hostname = socket.gethostname()
+    info_add('socket.hostname', hostname)
+
+
+def collect_sqlite(info_add):
+    try:
+        import sqlite3
+    except ImportError:
+        return
+
+    attributes = ('version', 'sqlite_version')
+    copy_attributes(info_add, sqlite3, 'sqlite3.%s', attributes)
+
+
+def collect_zlib(info_add):
+    try:
+        import zlib
+    except ImportError:
+        return
+
+    attributes = ('ZLIB_VERSION', 'ZLIB_RUNTIME_VERSION')
+    copy_attributes(info_add, zlib, 'zlib.%s', attributes)
+
+
+def collect_info(info):
+    error = False
+    info_add = info.add
+
+    for collect_func in (
+        # collect_os() should be the first, to check the getrandom() status
+        collect_os,
+
+        collect_gdb,
+        collect_locale,
+        collect_platform,
+        collect_readline,
+        collect_socket,
+        collect_sqlite,
+        collect_ssl,
+        collect_sys,
+        collect_sysconfig,
+        collect_time,
+        collect_tkinter,
+        collect_zlib,
+    ):
+        try:
+            collect_func(info_add)
+        except Exception as exc:
+            error = True
+            print("ERROR: %s() failed" % (collect_func.__name__),
+                  file=sys.stderr)
+            traceback.print_exc(file=sys.stderr)
+            print(file=sys.stderr)
+            sys.stderr.flush()
+
+    return error
+
+
+def dump_info(info, file=None):
+    title = "Python debug information"
+    print(title)
+    print("=" * len(title))
+    print()
+
+    infos = info.get_infos()
+    infos = sorted(infos.items())
+    for key, value in infos:
+        value = value.replace("\n", " ")
+        print("%s: %s" % (key, value))
+    print()
+
+
+def main():
+    info = PythonInfo()
+    error = collect_info(info)
+    dump_info(info)
+
+    if error:
+        print("Collection failed: exit with error", file=sys.stderr)
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()


From webhook-mailer at python.org  Thu Aug 17 10:53:30 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 17 Aug 2017 14:53:30 -0000
Subject: [Python-checkins] [3.6] bpo-31221: patchcheck ignores external
 libraries (#3109) (#3116)
Message-ID: <mailman.33.1502981612.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/d23b1c4fd82a326e729027a791220d6011e097b4
commit: d23b1c4fd82a326e729027a791220d6011e097b4
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-17T16:53:27+02:00
summary:

[3.6] bpo-31221: patchcheck ignores external libraries (#3109) (#3116)

* bpo-31221: patchcheck ignores external libraries (#3109)

Tools/scripts/patchcheck.py now ignores changes in directories which
are copies of external libraries:

* Modules/_ctypes/libffi_msvc/
* Modules/_ctypes/libffi_osx/
* Modules/_decimal/libmpdec/
* Modules/expat/
* Modules/zlib/

Drop also support for Mercurial, since CPython migrated to Git.

Exclude also libmpdec

patchcheck: exclude also libffi_osx and libffi_msvc
(cherry picked from commit 4a347ce426fe7381885703d9074d7a6b3aeb2f2b)

* Exclude also Modules/_ctypes/libffi on Python 3.6

files:
M Tools/scripts/patchcheck.py

diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py
index 436b277b6ae..5a1c94edee8 100755
--- a/Tools/scripts/patchcheck.py
+++ b/Tools/scripts/patchcheck.py
@@ -11,8 +11,17 @@
 import untabify
 
 
+# Excluded directories which are copies of external libraries:
+# don't check their coding style
+EXCLUDE_DIRS = [os.path.join('Modules', '_ctypes', 'libffi'),
+                os.path.join('Modules', '_ctypes', 'libffi_osx'),
+                os.path.join('Modules', '_ctypes', 'libffi_msvc'),
+                os.path.join('Modules', '_decimal', 'libmpdec'),
+                os.path.join('Modules', 'expat'),
+                os.path.join('Modules', 'zlib')]
 SRCDIR = sysconfig.get_config_var('srcdir')
 
+
 def n_files_str(count):
     """Return 'N file(s)' with the proper plurality on 'file'."""
     return "{} file{}".format(count, "s" if count != 1 else "")
@@ -98,7 +107,7 @@ def changed_files(base_branch=None):
         if mq_patches_applied():
             cmd += ' --rev qparent'
         with subprocess.Popen(cmd.split(), stdout=subprocess.PIPE) as st:
-            return [x.decode().rstrip() for x in st.stdout]
+            filenames = [x.decode().rstrip() for x in st.stdout]
     elif os.path.exists(os.path.join(SRCDIR, '.git')):
         # We just use an existence check here as:
         #  directory = normal git checkout/clone
@@ -120,10 +129,20 @@ def changed_files(base_branch=None):
                     # file is renamed
                     filename = filename.split(' -> ', 2)[1].strip()
                 filenames.append(filename)
-        return filenames
     else:
         sys.exit('need a Mercurial or git checkout to get modified files')
 
+    filenames2 = []
+    for filename in filenames:
+        # Normalize the path to be able to match using .startswith()
+        filename = os.path.normpath(filename)
+        if any(filename.startswith(path) for path in EXCLUDE_DIRS):
+            # Exclude the file
+            continue
+        filenames2.append(filename)
+
+    return filenames2
+
 
 def report_modified_files(file_paths):
     count = len(file_paths)


From webhook-mailer at python.org  Thu Aug 17 11:13:04 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 17 Aug 2017 15:13:04 -0000
Subject: [Python-checkins] [2.7] bpo-31221: patchcheck ignores external
 libraries (#3109) (#3118)
Message-ID: <mailman.34.1502982786.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/d45cb040b9fcd74e8824d417bf789fcef4c9592c
commit: d45cb040b9fcd74e8824d417bf789fcef4c9592c
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-17T17:13:01+02:00
summary:

[2.7] bpo-31221: patchcheck ignores external libraries (#3109) (#3118)

* bpo-31221: patchcheck ignores external libraries (#3109)

Tools/scripts/patchcheck.py now ignores changes in directories which
are copies of external libraries:

* Modules/_ctypes/libffi_msvc/
* Modules/_ctypes/libffi_osx/
* Modules/_decimal/libmpdec/
* Modules/expat/
* Modules/zlib/

Drop also support for Mercurial, since CPython migrated to Git.

Exclude also libmpdec

patchcheck: exclude also libffi_osx and libffi_msvc
(cherry picked from commit 4a347ce426fe7381885703d9074d7a6b3aeb2f2b)

* Exclude also Modules/_ctypes/libffi on Python 2.7

* Remove _decimal/libmpdec, not in Python 2.7

files:
M Tools/scripts/patchcheck.py

diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py
index be46fe3d083..b69d54029ac 100755
--- a/Tools/scripts/patchcheck.py
+++ b/Tools/scripts/patchcheck.py
@@ -10,8 +10,16 @@
 import untabify
 
 
+# Excluded directories which are copies of external libraries:
+# don't check their coding style
+EXCLUDE_DIRS = [os.path.join('Modules', '_ctypes', 'libffi'),
+                os.path.join('Modules', '_ctypes', 'libffi_osx'),
+                os.path.join('Modules', '_ctypes', 'libffi_msvc'),
+                os.path.join('Modules', 'expat'),
+                os.path.join('Modules', 'zlib')]
 SRCDIR = sysconfig.get_config_var('srcdir')
 
+
 def n_files_str(count):
     """Return 'N file(s)' with the proper plurality on 'file'."""
     return "{} file{}".format(count, "s" if count != 1 else "")
@@ -102,7 +110,7 @@ def changed_files(base_branch=None):
             cmd += ' --rev qparent'
         st = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE)
         try:
-            return [x.decode().rstrip() for x in st.stdout]
+            filenames = [x.decode().rstrip() for x in st.stdout]
         finally:
             st.stdout.close()
     elif os.path.exists(os.path.join(SRCDIR, '.git')):
@@ -129,9 +137,19 @@ def changed_files(base_branch=None):
                 filenames.append(filename)
         finally:
             st.stdout.close()
-        return filenames
     else:
-        sys.exit('need a checkout to get modified files')
+        sys.exit('need a Mercurial or git checkout to get modified files')
+
+    filenames2 = []
+    for filename in filenames:
+        # Normalize the path to be able to match using .startswith()
+        filename = os.path.normpath(filename)
+        if any(filename.startswith(path) for path in EXCLUDE_DIRS):
+            # Exclude the file
+            continue
+        filenames2.append(filename)
+
+    return filenames2
 
 
 def report_modified_files(file_paths):


From webhook-mailer at python.org  Thu Aug 17 13:24:20 2017
From: webhook-mailer at python.org (Steve Dower)
Date: Thu, 17 Aug 2017 17:24:20 -0000
Subject: [Python-checkins] Adds nuget symbols package for daily builds.
 (#3122)
Message-ID: <mailman.35.1502990661.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/f1ff2c4b613ba7acc5d80e67d3c175d8443191b1
commit: f1ff2c4b613ba7acc5d80e67d3c175d8443191b1
branch: master
author: Steve Dower <steve.dower at microsoft.com>
committer: GitHub <noreply at github.com>
date: 2017-08-17T10:24:18-07:00
summary:

Adds nuget symbols package for daily builds. (#3122)

files:
A Tools/nuget/pythondaily.symbols.nuspec
M Tools/nuget/make_pkg.proj

diff --git a/Tools/nuget/make_pkg.proj b/Tools/nuget/make_pkg.proj
index 3750d8dcc86..f21d21ee693 100644
--- a/Tools/nuget/make_pkg.proj
+++ b/Tools/nuget/make_pkg.proj
@@ -30,8 +30,8 @@
         <PipArguments>"$(IntermediateOutputPath)\python.exe" -B -c "import sys; sys.path.append(r'$(PySourcePath)\Lib'); import ensurepip; ensurepip._main()"</PipArguments>
         <PackageArguments Condition="$(Packages) != ''">"$(IntermediateOutputPath)\python.exe" -B -m pip install -U $(Packages)</PackageArguments>
         
-        <NugetArguments>"$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).nuspec"</NugetArguments>
-        <NugetArguments>$(NugetArguments) -BasePath "$(IntermediateOutputPath)"</NugetArguments>
+        <NugetPackCommand>"$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).nuspec" -BasePath "$(IntermediateOutputPath)"</NugetPackCommand>
+        <NugetPackSymbolsCommand Condition="Exists('$(MSBuildThisFileDirectory)\$(OutputName).symbols.nuspec')">"$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).symbols.nuspec" -BasePath "$(BuildPath.TrimEnd(`\`))"</NugetPackSymbolsCommand>
         <NugetArguments>$(NugetArguments) -OutputDirectory "$(OutputPath.Trim(`\`))"</NugetArguments>
         <NugetArguments>$(NugetArguments) -Version "$(NuspecVersion)"</NugetArguments>
         <NugetArguments>$(NugetArguments) -NoPackageAnalysis -NonInteractive</NugetArguments>
@@ -51,7 +51,8 @@
         <Exec Command="setlocal%0D%0A$(Environment)%0D%0A$(PythonArguments)" />
         <Exec Command="$(PipArguments)" />
         <Exec Command="$(PackageArguments)" Condition="$(PackageArguments) != ''" />
-        <Exec Command="$(NugetArguments)" />
+        <Exec Command="$(NugetPackCommand) $(NugetArguments)" />
+        <Exec Command="$(NugetPackSymbolsCommand) $(NugetArguments)" Condition="$(NugetPackSymbolsCommand) != ''" />
     </Target>
 
     <Target Name="AfterBuild" />
diff --git a/Tools/nuget/pythondaily.symbols.nuspec b/Tools/nuget/pythondaily.symbols.nuspec
new file mode 100644
index 00000000000..77792b8c24d
--- /dev/null
+++ b/Tools/nuget/pythondaily.symbols.nuspec
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>pythondaily.symbols</id>
+    <title>Python (Daily build)</title>
+    <version>0.0.0.0</version>
+    <authors>Python Software Foundation</authors>
+    <licenseUrl>https://docs.python.org/3/license.html</licenseUrl>
+    <projectUrl>https://www.python.org/</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Contains symbols for the daily build of Python.</description>
+    <iconUrl>https://www.python.org/static/favicon.ico</iconUrl>
+    <tags>python</tags>
+  </metadata>
+  <files>
+    <file src="python*.dll" target="tools" exclude="*_d*" />
+    <file src="python*.exe" target="tools" exclude="*_d*" />
+    <file src="python*.pdb" target="tools" exclude="*_d*" />
+    <file src="*.pdb" target="tools\DLLs" exclude="python*;*_test*;xx*;_freeze*;*_d*;py.*;pyw.*;pyshellext.*" />
+    <file src="*.pyd" target="tools\DLLs" exclude="python*;*_test*;xx*;_freeze*;*_d*;py.*;pyw.*;pyshellext.*" />
+    <file src="libeay32.dll;ssleay32.dll;sqlite3.dll" target="tools\DLLs" />
+    <file src="libeay32.pdb;ssleay32.pdb;sqlite3.pdb" target="tools\DLLs" />
+  </files>
+</package>


From webhook-mailer at python.org  Thu Aug 17 16:13:16 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 17 Aug 2017 20:13:16 -0000
Subject: [Python-checkins] bpo-30871: pythoninfo: add expat and _decimal
 (#3121)
Message-ID: <mailman.36.1503000797.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/f6ebd838f00b4c211c72d85ee49749e910cd3afe
commit: f6ebd838f00b4c211c72d85ee49749e910cd3afe
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-17T22:13:11+02:00
summary:

bpo-30871: pythoninfo: add expat and _decimal (#3121)

* bpo-30871: pythoninfo: add expat and _decimal

* Remove _decimal.__version__

The string is hardcoded, not really interesting.

files:
M Lib/test/pythoninfo.py

diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
index 03081b6dddc..e0541135331 100644
--- a/Lib/test/pythoninfo.py
+++ b/Lib/test/pythoninfo.py
@@ -345,6 +345,26 @@ def collect_zlib(info_add):
     copy_attributes(info_add, zlib, 'zlib.%s', attributes)
 
 
+def collect_expat(info_add):
+    try:
+        from xml.parsers import expat
+    except ImportError:
+        return
+
+    attributes = ('EXPAT_VERSION',)
+    copy_attributes(info_add, expat, 'expat.%s', attributes)
+
+
+def collect_decimal(info_add):
+    try:
+        import _decimal
+    except ImportError:
+        return
+
+    attributes = ('__libmpdec_version__',)
+    copy_attributes(info_add, _decimal, '_decimal.%s', attributes)
+
+
 def collect_info(info):
     error = False
     info_add = info.add
@@ -365,6 +385,8 @@ def collect_info(info):
         collect_time,
         collect_tkinter,
         collect_zlib,
+        collect_expat,
+        collect_decimal,
     ):
         try:
             collect_func(info_add)


From lp_benchmark_robot at intel.com  Thu Aug 17 20:08:27 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Thu, 17 Aug 2017 17:08:27 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-17
Message-ID: <00127181-e84b-4481-b991-ff29b53f5eb2@orsmsx154.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-17 03:04:01-07:00.
  - commit:		ee84a60
  - previous commit:	7cc3399
  - revision date:	2017-08-16 20:53:28+02:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.061% |  -0.145%   |  +4.118%   |  +8.632%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 3.056% |  -1.580%   |  +20.334%  |  +15.601%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 2.353% |  -0.665%   |  +23.820%  |  +12.999%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.970% |  -0.074%   |  +20.970%  |  +13.868%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.254% |  -0.294%   |  +2.309%   |  +15.976%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.357% |  +0.580%   |  +11.549%  |  +10.002%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.580% |  +0.024%   |  +6.221%   |  +11.565%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.525% |  +0.250%   |  +4.512%   |  +4.916%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.261% |  +0.238%   |  +6.017%   |  +20.053%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.672% |  -0.842%   |  +8.565%   |  +15.787%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.067% |  +0.646%   |  +4.708%   |  +6.384%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.482% |  +0.368%   |  +4.489%   |  +4.997%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.820% |  -0.050%   |  +3.187%   |  +7.701%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.567% |  -0.294%   |  +8.695%   |  +12.135%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.170% |  +0.088%   |  +8.000%   |  +9.063%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.753% |  -0.272%   |  +6.154%   |  +11.793%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.422% |  +0.093%   |  +9.145%   |  +11.709%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.461% |  +0.125%   |  +7.909%   |  +10.865%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.573% |  +0.748%   |  +4.267%   |  +9.951%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 0.994% |  +0.065%   |  +2.833%   |  +9.916%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.608% |  +0.451%   |  +8.945%   |  +10.220%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 3.015% |  -0.789%   |  +46.803%  |  +12.647%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.844% |  +0.208%   |  +9.685%   |  +10.853%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.458% |  +0.105%   |  +18.850%  |  +11.197%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 6.226% |  +1.154%   |  +6.173%   |  +13.678%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.576% |  +0.139%   |  +3.518%   |  +5.935%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.864% |  -0.101%   |  -2.105%   |  +3.456%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 1.402% |  +0.080%   |  +2.785%   |  +4.555%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.563% |  -0.988%   |  +4.987%   |  +9.645%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 3.104% |  -0.360%   |  +0.457%   |  +22.779%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.492% |  +0.113%   |  +2.541%   |  +23.735%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.921% |  +0.507%   |  +5.614%   |  +21.342%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 6.366% |  -2.590%   |  +10.398%  |  +12.269%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.101% |  +0.012%   |  +0.311%   |  +10.089%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.128% |  +0.156%   |  +9.021%   |  +4.616%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.090% |  +0.131%   |  +1.032%   |  +4.363%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.003% |  +0.144%   |  +9.329%   |  +13.942%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.699% |  -2.998%   |  -12.526%  |  +15.165%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.529% |  -0.030%   |  +1.491%   |  +4.331%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.835% |  -0.212%   |  +0.532%   |  -3.299%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 0.588% |  +0.541%   |  +11.771%  |  +4.028%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.912% |  +0.084%   |  +7.804%   |  +14.127%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 1.861% |  -0.205%   |  +0.598%   |  +2.790%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 2.355% |  -0.347%   |  +26.524%  |  +8.732%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.791% |  -0.746%   |  +2.937%   |  +8.354%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.890% |  -0.227%   |  +13.127%  |  +11.853%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 1.013% |  +0.037%   |  -0.352%   |  +1.565%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.356% |  +0.025%   |  +5.656%   |  -1.513%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.266% |  +0.309%   |  +5.490%   |  +7.527%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.732% |  +0.108%   |  +5.458%   |  +6.671%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 3.776% |  +1.377%   |  +4.310%   |  +8.164%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.319% |  +0.087%   |  +12.328%  |  +9.157%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.580% |  -0.140%   |  +10.308%  |  +7.254%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.823% |  +0.026%   |  +12.135%  |  +10.055%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.877% |  -0.325%   |  +13.399%  |  +10.733%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 4.928% |  +0.578%   |  +23.538%  |  +9.948%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.072% |  -0.038%   |  +6.058%   |  +7.421%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.473% |  -0.524%   |  +0.385%   |  +1.629%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 9.315% |  -0.623%   |  +7.428%   |  +21.719%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.635% |  +0.616%   |  -2.773%   |  +20.149%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 1.616% |  +0.153%   |  +6.997%   |  +7.610%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.110% |  -0.022%   |  +5.701%   |  +8.478%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.001% |  +0.378%   |  +2.595%   |  +5.540%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 1.124% |  +0.212%   |  -5.162%   |  +10.738%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.371% |  -0.120%   |  +6.582%   |  +8.902%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-17

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Thu Aug 17 20:39:03 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Fri, 18 Aug 2017 00:39:03 -0000
Subject: [Python-checkins] bpo-31001: IDLE: Add tests for configdialog
 highlight tab (#3123)
Message-ID: <mailman.37.1503016745.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/82aff62462e65077a6614b466c986f93a601c33d
commit: 82aff62462e65077a6614b466c986f93a601c33d
branch: master
author: Cheryl Sabella <cheryl.sabella at gmail.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-08-17T20:39:00-04:00
summary:

bpo-31001: IDLE: Add tests for configdialog highlight tab (#3123)

files:
A Misc/NEWS.d/next/IDLE/2017-08-17-15-00-20.bpo-31001.KLxYHC.rst
M Lib/idlelib/configdialog.py
M Lib/idlelib/idle_test/test_configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index e1ac82b7df3..a36bf83ad0f 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -222,13 +222,79 @@ def help(self):
     def create_page_highlight(self):
         """Return frame of widgets for Highlighting tab.
 
+        Enable users to provisionally change foreground and background
+        colors applied to textual tags.  Color mappings are stored in
+        complete listings called themes.  Built-in themes in
+        idlelib/config-highlight.def are fixed as far as the dialog is
+        concerned. Any theme can be used as the base for a new custom
+        theme, stored in .idlerc/config-highlight.cfg.
+
+        Function load_theme_cfg() initializes tk variables and theme
+        lists and calls paint_theme_sample() and set_highlight_target()
+        for the current theme.  Radiobuttons builtin_theme_on and
+        custom_theme_on toggle var theme_source, which controls if the
+        current set of colors are from a builtin or custom theme.
+        DynOptionMenus builtinlist and customlist contain lists of the
+        builtin and custom themes, respectively, and the current item
+        from each list is stored in vars builtin_name and custom_name.
+
+        Function paint_theme_sample() applies the colors from the theme
+        to the tags in text widget highlight_sample and then invokes
+        set_color_sample().  Function set_highlight_target() sets the state
+        of the radiobuttons fg_on and bg_on based on the tag and it also
+        invokes set_color_sample().
+
+        Function set_color_sample() sets the background color for the frame
+        holding the color selector.  This provides a larger visual of the
+        color for the current tag and plane (foreground/background).
+
+        Note: set_color_sample() is called from many places and is often
+        called more than once when a change is made.  It is invoked when
+        foreground or background is selected (radiobuttons), from
+        paint_theme_sample() (theme is changed or load_cfg is called), and
+        from set_highlight_target() (target tag is changed or load_cfg called).
+
+        Button delete_custom invokes delete_custom() to delete
+        a custom theme from idleConf.userCfg['highlight'] and changes.
+        Button save_custom invokes save_as_new_theme() which calls
+        get_new_theme_name() and create_new() to save a custom theme
+        and its colors to idleConf.userCfg['highlight'].
+
+        Radiobuttons fg_on and bg_on toggle var fg_bg_toggle to control
+        if the current selected color for a tag is for the foreground or
+        background.
+
+        DynOptionMenu targetlist contains a readable description of the
+        tags applied to Python source within IDLE.  Selecting one of the
+        tags from this list populates highlight_target, which has a callback
+        function set_highlight_target().
+
+        Text widget highlight_sample displays a block of text (which is
+        mock Python code) in which is embedded the defined tags and reflects
+        the color attributes of the current theme and changes for those tags.
+        Mouse button 1 allows for selection of a tag and updates
+        highlight_target with that tag value.
+
+        Note: The font in highlight_sample is set through the config in
+        the fonts tab.
+
+        In other words, a tag can be selected either from targetlist or
+        by clicking on the sample text within highlight_sample.  The
+        plane (foreground/background) is selected via the radiobutton.
+        Together, these two (tag and plane) control what color is
+        shown in set_color_sample() for the current theme.  Button set_color
+        invokes get_color() which displays a ColorChooser to change the
+        color for the selected tag/plane.  If a new color is picked,
+        it will be saved to changes and the highlight_sample and
+        frame background will be updated.
+
         Tk Variables:
             color: Color of selected target.
-            builtin_theme: Menu variable for built-in theme.
-            custom_theme: Menu variable for custom theme.
+            builtin_name: Menu variable for built-in theme.
+            custom_name: Menu variable for custom theme.
             fg_bg_toggle: Toggle for foreground/background color.
                 Note: this has no callback.
-            is_builtin_theme: Selector for built-in or custom theme.
+            theme_source: Selector for built-in or custom theme.
             highlight_target: Menu variable for the highlight tag target.
 
         Instance Data Attributes:
@@ -245,30 +311,30 @@ def create_page_highlight(self):
             on_new_color_set: Set new color and add option.
             paint_theme_sample: Recolor sample.
             get_new_theme_name: Get from popup.
-            create_new_theme: Combine theme with changes and save.
-            save_as_new_theme: Save [button_save_custom_theme].
-            set_theme_type: Command for [is_builtin_theme].
-            delete_custom_theme: Ativate default [button_delete_custom_theme].
-            save_new_theme: Save to userCfg['theme'] (is function).
+            create_new: Combine theme with changes and save.
+            save_as_new_theme: Save [button_save_custom].
+            set_theme_type: Command for [theme_source].
+            delete_custom: Activate default [button_delete_custom].
+            save_new: Save to userCfg['theme'] (is function).
 
         Widgets of highlights page frame:  (*) widgets bound to self
             frame_custom: LabelFrame
                 (*)highlight_sample: Text
                 (*)frame_color_set: Frame
-                    button_set_color: Button
-                    (*)opt_menu_highlight_target: DynOptionMenu - highlight_target
+                    (*)button_set_color: Button
+                    (*)targetlist: DynOptionMenu - highlight_target
                 frame_fg_bg_toggle: Frame
-                    (*)radio_fg: Radiobutton - fg_bg_toggle
-                    (*)radio_bg: Radiobutton - fg_bg_toggle
-                button_save_custom_theme: Button
+                    (*)fg_on: Radiobutton - fg_bg_toggle
+                    (*)bg_on: Radiobutton - fg_bg_toggle
+                (*)button_save_custom: Button
             frame_theme: LabelFrame
                 theme_type_title: Label
-                (*)radio_theme_builtin: Radiobutton - is_builtin_theme
-                (*)radio_theme_custom: Radiobutton - is_builtin_theme
-                (*)opt_menu_theme_builtin: DynOptionMenu - builtin_theme
-                (*)opt_menu_theme_custom: DynOptionMenu - custom_theme
-                (*)button_delete_custom_theme: Button
-                (*)new_custom_theme: Label
+                (*)builtin_theme_on: Radiobutton - theme_source
+                (*)custom_theme_on: Radiobutton - theme_source
+                (*)builtinlist: DynOptionMenu - builtin_name
+                (*)customlist: DynOptionMenu - custom_name
+                (*)button_delete_custom: Button
+                (*)theme_message: Label
         """
         self.theme_elements={
             'Normal Text': ('normal', '00'),
@@ -287,31 +353,30 @@ def create_page_highlight(self):
             'Shell Stderr Text': ('stderr', '13'),
             }
         parent = self.parent
-        self.builtin_theme = tracers.add(
-                StringVar(parent), self.var_changed_builtin_theme)
-        self.custom_theme = tracers.add(
-                StringVar(parent), self.var_changed_custom_theme)
+        self.builtin_name = tracers.add(
+                StringVar(parent), self.var_changed_builtin_name)
+        self.custom_name = tracers.add(
+                StringVar(parent), self.var_changed_custom_name)
         self.fg_bg_toggle = BooleanVar(parent)
         self.color = tracers.add(
                 StringVar(parent), self.var_changed_color)
-        self.is_builtin_theme = tracers.add(
-                BooleanVar(parent), self.var_changed_is_builtin_theme)
+        self.theme_source = tracers.add(
+                BooleanVar(parent), self.var_changed_theme_source)
         self.highlight_target = tracers.add(
                 StringVar(parent), self.var_changed_highlight_target)
 
-        # Widget creation:
-        # body frame and section frames
+        # Create widgets:
+        # body frame and section frames.
         frame = Frame(self.note)
         frame_custom = LabelFrame(frame, borderwidth=2, relief=GROOVE,
                                  text=' Custom Highlighting ')
         frame_theme = LabelFrame(frame, borderwidth=2, relief=GROOVE,
                                 text=' Highlighting Theme ')
-        #frame_custom
+        # frame_custom.
         text = self.highlight_sample = frame.highlight_sample = Text(
                 frame_custom, relief=SOLID, borderwidth=1,
                 font=('courier', 12, ''), cursor='hand2', width=21, height=13,
                 takefocus=FALSE, highlightthickness=0, wrap=NONE)
-        text=self.highlight_sample
         text.bind('<Double-Button-1>', lambda e: 'break')
         text.bind('<B1-Motion>', lambda e: 'break')
         text_and_tags=(('\n', 'normal'),
@@ -341,78 +406,77 @@ def tem(event, elem=element):
         text['state'] = DISABLED
         self.frame_color_set = Frame(frame_custom, relief=SOLID, borderwidth=1)
         frame_fg_bg_toggle = Frame(frame_custom)
-        button_set_color = Button(
+        self.button_set_color = Button(
                 self.frame_color_set, text='Choose Color for :',
                 command=self.get_color, highlightthickness=0)
-        self.opt_menu_highlight_target = DynOptionMenu(
+        self.targetlist = DynOptionMenu(
                 self.frame_color_set, self.highlight_target, None,
                 highlightthickness=0) #, command=self.set_highlight_targetBinding
-        self.radio_fg = Radiobutton(
+        self.fg_on = Radiobutton(
                 frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=1,
                 text='Foreground', command=self.set_color_sample_binding)
-        self.radio_bg=Radiobutton(
+        self.bg_on = Radiobutton(
                 frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=0,
                 text='Background', command=self.set_color_sample_binding)
         self.fg_bg_toggle.set(1)
-        button_save_custom_theme = Button(
+        self.button_save_custom = Button(
                 frame_custom, text='Save as New Custom Theme',
                 command=self.save_as_new_theme)
-        #frame_theme
+        # frame_theme.
         theme_type_title = Label(frame_theme, text='Select : ')
-        self.radio_theme_builtin = Radiobutton(
-                frame_theme, variable=self.is_builtin_theme, value=1,
+        self.builtin_theme_on = Radiobutton(
+                frame_theme, variable=self.theme_source, value=1,
                 command=self.set_theme_type, text='a Built-in Theme')
-        self.radio_theme_custom = Radiobutton(
-                frame_theme, variable=self.is_builtin_theme, value=0,
+        self.custom_theme_on = Radiobutton(
+                frame_theme, variable=self.theme_source, value=0,
                 command=self.set_theme_type, text='a Custom Theme')
-        self.opt_menu_theme_builtin = DynOptionMenu(
-                frame_theme, self.builtin_theme, None, command=None)
-        self.opt_menu_theme_custom=DynOptionMenu(
-                frame_theme, self.custom_theme, None, command=None)
-        self.button_delete_custom_theme=Button(
+        self.builtinlist = DynOptionMenu(
+                frame_theme, self.builtin_name, None, command=None)
+        self.customlist = DynOptionMenu(
+                frame_theme, self.custom_name, None, command=None)
+        self.button_delete_custom = Button(
                 frame_theme, text='Delete Custom Theme',
-                command=self.delete_custom_theme)
-        self.new_custom_theme = Label(frame_theme, bd=2)
+                command=self.delete_custom)
+        self.theme_message = Label(frame_theme, bd=2)
 
-        ##widget packing
-        #body
+        # Pack widgets:
+        # body.
         frame_custom.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
         frame_theme.pack(side=LEFT, padx=5, pady=5, fill=Y)
-        #frame_custom
+        # frame_custom.
         self.frame_color_set.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=X)
         frame_fg_bg_toggle.pack(side=TOP, padx=5, pady=0)
         self.highlight_sample.pack(
                 side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
-        button_set_color.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=4)
-        self.opt_menu_highlight_target.pack(
-                side=TOP, expand=TRUE, fill=X, padx=8, pady=3)
-        self.radio_fg.pack(side=LEFT, anchor=E)
-        self.radio_bg.pack(side=RIGHT, anchor=W)
-        button_save_custom_theme.pack(side=BOTTOM, fill=X, padx=5, pady=5)
-        #frame_theme
+        self.button_set_color.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=4)
+        self.targetlist.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=3)
+        self.fg_on.pack(side=LEFT, anchor=E)
+        self.bg_on.pack(side=RIGHT, anchor=W)
+        self.button_save_custom.pack(side=BOTTOM, fill=X, padx=5, pady=5)
+        # frame_theme.
         theme_type_title.pack(side=TOP, anchor=W, padx=5, pady=5)
-        self.radio_theme_builtin.pack(side=TOP, anchor=W, padx=5)
-        self.radio_theme_custom.pack(side=TOP, anchor=W, padx=5, pady=2)
-        self.opt_menu_theme_builtin.pack(side=TOP, fill=X, padx=5, pady=5)
-        self.opt_menu_theme_custom.pack(side=TOP, fill=X, anchor=W, padx=5, pady=5)
-        self.button_delete_custom_theme.pack(side=TOP, fill=X, padx=5, pady=5)
-        self.new_custom_theme.pack(side=TOP, fill=X, pady=5)
+        self.builtin_theme_on.pack(side=TOP, anchor=W, padx=5)
+        self.custom_theme_on.pack(side=TOP, anchor=W, padx=5, pady=2)
+        self.builtinlist.pack(side=TOP, fill=X, padx=5, pady=5)
+        self.customlist.pack(side=TOP, fill=X, anchor=W, padx=5, pady=5)
+        self.button_delete_custom.pack(side=TOP, fill=X, padx=5, pady=5)
+        self.theme_message.pack(side=TOP, fill=X, pady=5)
         return frame
 
     def load_theme_cfg(self):
         """Load current configuration settings for the theme options.
 
-        Based on the is_builtin_theme toggle, the theme is set as
+        Based on the theme_source toggle, the theme is set as
         either builtin or custom and the initial widget values
         reflect the current settings from idleConf.
 
         Attributes updated:
-            is_builtin_theme: Set from idleConf.
-            opt_menu_theme_builtin: List of default themes from idleConf.
-            opt_menu_theme_custom: List of custom themes from idleConf.
-            radio_theme_custom: Disabled if there are no custom themes.
+            theme_source: Set from idleConf.
+            builtinlist: List of default themes from idleConf.
+            customlist: List of custom themes from idleConf.
+            custom_theme_on: Disabled if there are no custom themes.
             custom_theme: Message with additional information.
-            opt_menu_highlight_target: Create menu from self.theme_elements.
+            targetlist: Create menu from self.theme_elements.
 
         Methods:
             set_theme_type
@@ -420,80 +484,81 @@ def load_theme_cfg(self):
             set_highlight_target
         """
         # Set current theme type radiobutton.
-        self.is_builtin_theme.set(idleConf.GetOption(
+        self.theme_source.set(idleConf.GetOption(
                 'main', 'Theme', 'default', type='bool', default=1))
         # Set current theme.
         current_option = idleConf.CurrentTheme()
         # Load available theme option menus.
-        if self.is_builtin_theme.get():  # Default theme selected.
+        if self.theme_source.get():  # Default theme selected.
             item_list = idleConf.GetSectionList('default', 'highlight')
             item_list.sort()
-            self.opt_menu_theme_builtin.SetMenu(item_list, current_option)
+            self.builtinlist.SetMenu(item_list, current_option)
             item_list = idleConf.GetSectionList('user', 'highlight')
             item_list.sort()
             if not item_list:
-                self.radio_theme_custom['state'] = DISABLED
-                self.custom_theme.set('- no custom themes -')
+                self.custom_theme_on['state'] = DISABLED
+                self.custom_name.set('- no custom themes -')
             else:
-                self.opt_menu_theme_custom.SetMenu(item_list, item_list[0])
+                self.customlist.SetMenu(item_list, item_list[0])
         else:  # User theme selected.
             item_list = idleConf.GetSectionList('user', 'highlight')
             item_list.sort()
-            self.opt_menu_theme_custom.SetMenu(item_list, current_option)
+            self.customlist.SetMenu(item_list, current_option)
             item_list = idleConf.GetSectionList('default', 'highlight')
             item_list.sort()
-            self.opt_menu_theme_builtin.SetMenu(item_list, item_list[0])
+            self.builtinlist.SetMenu(item_list, item_list[0])
         self.set_theme_type()
         # Load theme element option menu.
         theme_names = list(self.theme_elements.keys())
         theme_names.sort(key=lambda x: self.theme_elements[x][1])
-        self.opt_menu_highlight_target.SetMenu(theme_names, theme_names[0])
+        self.targetlist.SetMenu(theme_names, theme_names[0])
         self.paint_theme_sample()
         self.set_highlight_target()
 
-    def var_changed_builtin_theme(self, *params):
+    def var_changed_builtin_name(self, *params):
         """Process new builtin theme selection.
 
         Add the changed theme's name to the changed_items and recreate
         the sample with the values from the selected theme.
         """
         old_themes = ('IDLE Classic', 'IDLE New')
-        value = self.builtin_theme.get()
+        value = self.builtin_name.get()
         if value not in old_themes:
             if idleConf.GetOption('main', 'Theme', 'name') not in old_themes:
                 changes.add_option('main', 'Theme', 'name', old_themes[0])
             changes.add_option('main', 'Theme', 'name2', value)
-            self.new_custom_theme.config(text='New theme, see Help',
-                                         fg='#500000')
+            self.theme_message['text'] = 'New theme, see Help'
+            self.theme_message['fg'] = '#500000'
         else:
             changes.add_option('main', 'Theme', 'name', value)
             changes.add_option('main', 'Theme', 'name2', '')
-            self.new_custom_theme.config(text='', fg='black')
+            self.theme_message['text'] = ''
+            self.theme_message['fg'] = 'black'
         self.paint_theme_sample()
 
-    def var_changed_custom_theme(self, *params):
+    def var_changed_custom_name(self, *params):
         """Process new custom theme selection.
 
         If a new custom theme is selected, add the name to the
         changed_items and apply the theme to the sample.
         """
-        value = self.custom_theme.get()
+        value = self.custom_name.get()
         if value != '- no custom themes -':
             changes.add_option('main', 'Theme', 'name', value)
             self.paint_theme_sample()
 
-    def var_changed_is_builtin_theme(self, *params):
+    def var_changed_theme_source(self, *params):
         """Process toggle between builtin and custom theme.
 
         Update the default toggle value and apply the newly
         selected theme type.
         """
-        value = self.is_builtin_theme.get()
+        value = self.theme_source.get()
         changes.add_option('main', 'Theme', 'default', value)
         if value:
-            self.var_changed_builtin_theme()
+            self.var_changed_builtin_name()
         else:
-            self.var_changed_custom_theme()
+            self.var_changed_custom_name()
 
     def var_changed_color(self, *params):
         "Process change to color choice."
@@ -507,29 +572,29 @@ def set_theme_type(self):
         """Set available screen options based on builtin or custom theme.
 
         Attributes accessed:
-            is_builtin_theme
+            theme_source
 
         Attributes updated:
-            opt_menu_theme_builtin
-            opt_menu_theme_custom
-            button_delete_custom_theme
-            radio_theme_custom
+            builtinlist
+            customlist
+            button_delete_custom
+            custom_theme_on
 
         Called from:
-            handler for radio_theme_builtin and radio_theme_custom
-            delete_custom_theme
-            create_new_theme
+            handler for builtin_theme_on and custom_theme_on
+            delete_custom
+            create_new
             load_theme_cfg
         """
-        if self.is_builtin_theme.get():
-            self.opt_menu_theme_builtin['state'] = NORMAL
-            self.opt_menu_theme_custom['state'] = DISABLED
-            self.button_delete_custom_theme['state'] = DISABLED
+        if self.theme_source.get():
+            self.builtinlist['state'] = NORMAL
+            self.customlist['state'] = DISABLED
+            self.button_delete_custom['state'] = DISABLED
         else:
-            self.opt_menu_theme_builtin['state'] = DISABLED
-            self.radio_theme_custom['state'] = NORMAL
-            self.opt_menu_theme_custom['state'] = NORMAL
-            self.button_delete_custom_theme['state'] = NORMAL
+            self.builtinlist['state'] = DISABLED
+            self.custom_theme_on['state'] = NORMAL
+            self.customlist['state'] = NORMAL
+            self.button_delete_custom['state'] = NORMAL
 
     def get_color(self):
         """Handle button to select a new color for the target tag.
@@ -540,14 +605,14 @@ def get_color(self):
         Attributes accessed:
             highlight_target
             frame_color_set
-            is_builtin_theme
+            theme_source
 
         Attributes updated:
             color
 
         Methods:
             get_new_theme_name
-            create_new_theme
+            create_new
         """
         target = self.highlight_target.get()
         prev_color = self.frame_color_set.cget('bg')
@@ -556,26 +621,26 @@ def get_color(self):
                 initialcolor=prev_color)
         if color_string and (color_string != prev_color):
             # User didn't cancel and they chose a new color.
-            if self.is_builtin_theme.get():  # Current theme is a built-in.
+            if self.theme_source.get():  # Current theme is a built-in.
                 message = ('Your changes will be saved as a new Custom Theme. '
                            'Enter a name for your new Custom Theme below.')
                 new_theme = self.get_new_theme_name(message)
                 if not new_theme:  # User cancelled custom theme creation.
                     return
                 else:  # Create new custom theme based on previously active theme.
-                    self.create_new_theme(new_theme)
+                    self.create_new(new_theme)
                     self.color.set(color_string)
             else:  # Current theme is user defined.
                 self.color.set(color_string)
 
     def on_new_color_set(self):
         "Display sample of new color selection on the dialog."
-        new_color=self.color.get()
-        self.frame_color_set.config(bg=new_color)  # Set sample.
-        plane ='foreground' if self.fg_bg_toggle.get() else 'background'
+        new_color = self.color.get()
+        self.frame_color_set['bg'] = new_color  # Set sample.
+        plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
         sample_element = self.theme_elements[self.highlight_target.get()][0]
-        self.highlight_sample.tag_config(sample_element, **{plane:new_color})
-        theme = self.custom_theme.get()
+        self.highlight_sample.tag_config(sample_element, **{plane: new_color})
+        theme = self.custom_name.get()
         theme_element = sample_element + '-' + plane
         changes.add_option('highlight', theme, theme_element, new_color)
 
@@ -592,13 +657,13 @@ def save_as_new_theme(self):
 
         Methods:
             get_new_theme_name
-            create_new_theme
+            create_new
         """
         new_theme_name = self.get_new_theme_name('New Theme Name:')
         if new_theme_name:
-            self.create_new_theme(new_theme_name)
+            self.create_new(new_theme_name)
 
-    def create_new_theme(self, new_theme_name):
+    def create_new(self, new_theme_name):
         """Create a new custom theme with the given name.
 
         Create the new theme based on the previously active theme
@@ -606,23 +671,23 @@ def create_new_theme(self, new_theme_name):
         activate the new theme.
 
         Attributes accessed:
-            builtin_theme
-            custom_theme
+            builtin_name
+            custom_name
 
         Attributes updated:
-            opt_menu_theme_custom
-            is_builtin_theme
+            customlist
+            theme_source
 
         Method:
-            save_new_theme
+            save_new
             set_theme_type
         """
-        if self.is_builtin_theme.get():
+        if self.theme_source.get():
             theme_type = 'default'
-            theme_name = self.builtin_theme.get()
+            theme_name = self.builtin_name.get()
         else:
             theme_type = 'user'
-            theme_name = self.custom_theme.get()
+            theme_name = self.custom_name.get()
         new_theme = idleConf.GetThemeDict(theme_type, theme_name)
         # Apply any of the old theme's unsaved changes to the new theme.
         if theme_name in changes['highlight']:
@@ -630,12 +695,12 @@ def create_new_theme(self, new_theme_name):
             for element in theme_changes:
                 new_theme[element] = theme_changes[element]
         # Save the new theme.
-        self.save_new_theme(new_theme_name, new_theme)
+        self.save_new(new_theme_name, new_theme)
         # Change GUI over to the new theme.
         custom_theme_list = idleConf.GetSectionList('user', 'highlight')
         custom_theme_list.sort()
-        self.opt_menu_theme_custom.SetMenu(custom_theme_list, new_theme_name)
-        self.is_builtin_theme.set(0)
+        self.customlist.SetMenu(custom_theme_list, new_theme_name)
+        self.theme_source.set(0)
         self.set_theme_type()
 
     def set_highlight_target(self):
@@ -645,8 +710,8 @@ def set_highlight_target(self):
             highlight_target
 
         Attributes updated:
-            radio_fg
-            radio_bg
+            fg_on
+            bg_on
             fg_bg_toggle
 
         Methods:
@@ -657,12 +722,12 @@ def set_highlight_target(self):
             load_theme_cfg
         """
         if self.highlight_target.get() == 'Cursor':  # bg not possible
-            self.radio_fg['state'] = DISABLED
-            self.radio_bg['state'] = DISABLED
+            self.fg_on['state'] = DISABLED
+            self.bg_on['state'] = DISABLED
             self.fg_bg_toggle.set(1)
         else:  # Both fg and bg can be set.
-            self.radio_fg['state'] = NORMAL
-            self.radio_bg['state'] = NORMAL
+            self.fg_on['state'] = NORMAL
+            self.bg_on['state'] = NORMAL
             self.fg_bg_toggle.set(1)
         self.set_color_sample()
 
@@ -690,16 +755,16 @@ def set_color_sample(self):
         tag = self.theme_elements[self.highlight_target.get()][0]
         plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
         color = self.highlight_sample.tag_cget(tag, plane)
-        self.frame_color_set.config(bg=color)
+        self.frame_color_set['bg'] = color
 
     def paint_theme_sample(self):
         """Apply the theme colors to each element tag in the sample text.
 
         Instance attributes accessed:
             theme_elements
-            is_builtin_theme
-            builtin_theme
-            custom_theme
+            theme_source
+            builtin_name
+            custom_name
 
         Attributes updated:
             highlight_sample: Set the tag elements to the theme.
@@ -708,14 +773,14 @@ def paint_theme_sample(self):
             set_color_sample
 
         Called from:
-            var_changed_builtin_theme
-            var_changed_custom_theme
+            var_changed_builtin_name
+            var_changed_custom_name
             load_theme_cfg
         """
-        if self.is_builtin_theme.get():  # Default theme
-            theme = self.builtin_theme.get()
+        if self.theme_source.get():  # Default theme
+            theme = self.builtin_name.get()
         else:  # User theme
-            theme = self.custom_theme.get()
+            theme = self.custom_name.get()
         for element_title in self.theme_elements:
             element = self.theme_elements[element_title][0]
             colors = idleConf.GetHighlight(theme, element)
@@ -732,7 +797,7 @@ def paint_theme_sample(self):
             self.highlight_sample.tag_config(element, **colors)
         self.set_color_sample()
 
-    def save_new_theme(self, theme_name, theme):
+    def save_new(self, theme_name, theme):
         """Save a newly created theme to idleConf.
 
         theme_name - string, the name of the new theme
@@ -744,7 +809,7 @@ def save_new_theme(self, theme_name, theme):
             value = theme[element]
             idleConf.userCfg['highlight'].SetOption(theme_name, element, value)
 
-    def delete_custom_theme(self):
+    def delete_custom(self):
         """Handle event to delete custom theme.
 
         The current theme is deactivated and the default theme is
@@ -752,13 +817,13 @@ def delete_custom_theme(self):
         the config file.
 
         Attributes accessed:
-            custom_theme
+            custom_name
 
         Attributes updated:
-            radio_theme_custom
-            opt_menu_theme_custom
-            is_builtin_theme
-            builtin_theme
+            custom_theme_on
+            customlist
+            theme_source
+            builtin_name
 
         Methods:
             deactivate_current_config
@@ -766,7 +831,7 @@ def delete_custom_theme(self):
             activate_config_changes
             set_theme_type
         """
-        theme_name = self.custom_theme.get()
+        theme_name = self.custom_name.get()
         delmsg = 'Are you sure you wish to delete the theme %r ?'
         if not tkMessageBox.askyesno(
                 'Delete Theme',  delmsg % theme_name, parent=self):
@@ -778,13 +843,13 @@ def delete_custom_theme(self):
         item_list = idleConf.GetSectionList('user', 'highlight')
         item_list.sort()
         if not item_list:
-            self.radio_theme_custom['state'] = DISABLED
-            self.opt_menu_theme_custom.SetMenu(item_list, '- no custom themes -')
+            self.custom_theme_on['state'] = DISABLED
+            self.customlist.SetMenu(item_list, '- no custom themes -')
         else:
-            self.opt_menu_theme_custom.SetMenu(item_list, item_list[0])
+            self.customlist.SetMenu(item_list, item_list[0])
         # Revert to default theme.
-        self.is_builtin_theme.set(idleConf.defaultCfg['main'].Get('Theme', 'default'))
-        self.builtin_theme.set(idleConf.defaultCfg['main'].Get('Theme', 'name'))
+        self.theme_source.set(idleConf.defaultCfg['main'].Get('Theme', 'default'))
+        self.builtin_name.set(idleConf.defaultCfg['main'].Get('Theme', 'name'))
         # User can't back out of these changes, they must be applied now.
         changes.save_all()
         self.save_all_changed_extensions()
@@ -1270,7 +1335,7 @@ def create_page_keys(self):
         get_new_keys().  Function get_new_keys() gets the key mappings from the
         current keyset for the binding event item that was selected.  The
         function then displays another dialog, GetKeysDialog, with the
-        selected binding event and current keys and always new key sequences
+        selected binding event and current keys and allows new key sequences
         to be entered for that binding event.  If the keys aren't
         changed, nothing happens.  If the keys are changed and the keyset
         is a builtin, function get_new_keys_name() will be called
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index 964784508f8..966a72b50a9 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -139,7 +139,7 @@ def test_fontlist_mouse(self):
         self.assertIn(d.font_name.get(), font1.lower())
 
     def test_sizelist(self):
-        # Click on number shouod select that number
+        # Click on number should select that number
         d = self.page
         d.sizelist.variable.set(40)
         self.assertEqual(d.font_size.get(), '40')
@@ -227,9 +227,457 @@ def test_indent_scale(self):
 
 
 class HighlightTest(unittest.TestCase):
+    """Test that highlight tab widgets enable users to make changes.
+
+    Test that widget actions set vars, that var changes add
+    options to changes and that themes work correctly.
+    """
+
+    @classmethod
+    def setUpClass(cls):
+        d = dialog
+        dialog.note.select(d.highpage)
+        d.set_theme_type = Func()
+        d.paint_theme_sample = Func()
+        d.set_highlight_target = Func()
+        d.set_color_sample = Func()
+
+    @classmethod
+    def tearDownClass(cls):
+        d = dialog
+        del d.set_theme_type, d.paint_theme_sample
+        del d.set_highlight_target, d.set_color_sample
 
     def setUp(self):
+        d = dialog
+        # The following is needed for test_load_key_cfg, _delete_custom_keys.
+        # This may indicate a defect in some test or function.
+        for section in idleConf.GetSectionList('user', 'highlight'):
+            idleConf.userCfg['highlight'].remove_section(section)
         changes.clear()
+        d.set_theme_type.called = 0
+        d.paint_theme_sample.called = 0
+        d.set_highlight_target.called = 0
+        d.set_color_sample.called = 0
+
+    def test_load_theme_cfg(self):
+        tracers.detach()
+        d = dialog
+        eq = self.assertEqual
+
+        # Use builtin theme with no user themes created.
+        idleConf.CurrentTheme = mock.Mock(return_value='IDLE Classic')
+        d.load_theme_cfg()
+        self.assertTrue(d.theme_source.get())
+        # builtinlist sets variable builtin_name to the CurrentTheme default.
+        eq(d.builtin_name.get(), 'IDLE Classic')
+        eq(d.custom_name.get(), '- no custom themes -')
+        eq(d.custom_theme_on['state'], DISABLED)
+        eq(d.set_theme_type.called, 1)
+        eq(d.paint_theme_sample.called, 1)
+        eq(d.set_highlight_target.called, 1)
+
+        # Builtin theme with non-empty user theme list.
+        idleConf.SetOption('highlight', 'test1', 'option', 'value')
+        idleConf.SetOption('highlight', 'test2', 'option2', 'value2')
+        d.load_theme_cfg()
+        eq(d.builtin_name.get(), 'IDLE Classic')
+        eq(d.custom_name.get(), 'test1')
+        eq(d.set_theme_type.called, 2)
+        eq(d.paint_theme_sample.called, 2)
+        eq(d.set_highlight_target.called, 2)
+
+        # Use custom theme.
+        idleConf.CurrentTheme = mock.Mock(return_value='test2')
+        idleConf.SetOption('main', 'Theme', 'default', '0')
+        d.load_theme_cfg()
+        self.assertFalse(d.theme_source.get())
+        eq(d.builtin_name.get(), 'IDLE Classic')
+        eq(d.custom_name.get(), 'test2')
+        eq(d.set_theme_type.called, 3)
+        eq(d.paint_theme_sample.called, 3)
+        eq(d.set_highlight_target.called, 3)
+
+        del idleConf.CurrentTheme
+        tracers.attach()
+
+    def test_theme_source(self):
+        eq = self.assertEqual
+        d = dialog
+        # Test these separately.
+        d.var_changed_builtin_name = Func()
+        d.var_changed_custom_name = Func()
+        # Builtin selected.
+        d.builtin_theme_on.invoke()
+        eq(mainpage, {'Theme': {'default': 'True'}})
+        eq(d.var_changed_builtin_name.called, 1)
+        eq(d.var_changed_custom_name.called, 0)
+        changes.clear()
+
+        # Custom selected.
+        d.custom_theme_on['state'] = NORMAL
+        d.custom_theme_on.invoke()
+        self.assertEqual(mainpage, {'Theme': {'default': 'False'}})
+        eq(d.var_changed_builtin_name.called, 1)
+        eq(d.var_changed_custom_name.called, 1)
+        del d.var_changed_builtin_name, d.var_changed_custom_name
+
+    def test_builtin_name(self):
+        eq = self.assertEqual
+        d = dialog
+        item_list = ['IDLE Classic', 'IDLE Dark', 'IDLE New']
+
+        # Not in old_themes, defaults name to first item.
+        idleConf.SetOption('main', 'Theme', 'name', 'spam')
+        d.builtinlist.SetMenu(item_list, 'IDLE Dark')
+        eq(mainpage, {'Theme': {'name': 'IDLE Classic',
+                                'name2': 'IDLE Dark'}})
+        eq(d.theme_message['text'], 'New theme, see Help')
+        eq(d.paint_theme_sample.called, 1)
+
+        # Not in old themes - uses name2.
+        changes.clear()
+        idleConf.SetOption('main', 'Theme', 'name', 'IDLE New')
+        d.builtinlist.SetMenu(item_list, 'IDLE Dark')
+        eq(mainpage, {'Theme': {'name2': 'IDLE Dark'}})
+        eq(d.theme_message['text'], 'New theme, see Help')
+        eq(d.paint_theme_sample.called, 2)
+
+        # Builtin name in old_themes.
+        changes.clear()
+        d.builtinlist.SetMenu(item_list, 'IDLE Classic')
+        eq(mainpage, {'Theme': {'name': 'IDLE Classic', 'name2': ''}})
+        eq(d.theme_message['text'], '')
+        eq(d.paint_theme_sample.called, 3)
+
+    def test_custom_name(self):
+        d = dialog
+
+        # If no selections, doesn't get added.
+        d.customlist.SetMenu([], '- no custom themes -')
+        self.assertNotIn('Theme', mainpage)
+        self.assertEqual(d.paint_theme_sample.called, 0)
+
+        # Custom name selected.
+        changes.clear()
+        d.customlist.SetMenu(['a', 'b', 'c'], 'c')
+        self.assertEqual(mainpage, {'Theme': {'name': 'c'}})
+        self.assertEqual(d.paint_theme_sample.called, 1)
+
+    def test_color(self):
+        d = dialog
+        d.on_new_color_set = Func()
+        # self.color is only set in get_color through ColorChooser.
+        d.color.set('green')
+        self.assertEqual(d.on_new_color_set.called, 1)
+        del d.on_new_color_set
+
+    def test_highlight_target_list_mouse(self):
+        # Set highlight_target through targetlist.
+        eq = self.assertEqual
+        d = dialog
+
+        d.targetlist.SetMenu(['a', 'b', 'c'], 'c')
+        eq(d.highlight_target.get(), 'c')
+        eq(d.set_highlight_target.called, 1)
+
+    def test_highlight_target_text_mouse(self):
+        # Set highlight_target through clicking highlight_sample.
+        eq = self.assertEqual
+        d = dialog
+
+        elem = {}
+        count = 0
+        hs = d.highlight_sample
+        hs.focus_force()
+        hs.see(1.0)
+        hs.update_idletasks()
+
+        def tag_to_element(elem):
+            for element, tag in d.theme_elements.items():
+                elem[tag[0]] = element
+
+        def click_it(start):
+            x, y, dx, dy = hs.bbox(start)
+            x += dx // 2
+            y += dy // 2
+            hs.event_generate('<Enter>', x=0, y=0)
+            hs.event_generate('<Motion>', x=x, y=y)
+            hs.event_generate('<ButtonPress-1>', x=x, y=y)
+            hs.event_generate('<ButtonRelease-1>', x=x, y=y)
+
+        # Flip theme_elements to make the tag the key.
+        tag_to_element(elem)
+
+        # If highlight_sample has a tag that isn't in theme_elements, there
+        # will be a KeyError in the test run.
+        for tag in hs.tag_names():
+            for start_index in hs.tag_ranges(tag)[0::2]:
+                count += 1
+                click_it(start_index)
+                eq(d.highlight_target.get(), elem[tag])
+                eq(d.set_highlight_target.called, count)
+
+    def test_set_theme_type(self):
+        eq = self.assertEqual
+        d = dialog
+        del d.set_theme_type
+
+        # Builtin theme selected.
+        d.theme_source.set(True)
+        d.set_theme_type()
+        eq(d.builtinlist['state'], NORMAL)
+        eq(d.customlist['state'], DISABLED)
+        eq(d.button_delete_custom['state'], DISABLED)
+
+        # Custom theme selected.
+        d.theme_source.set(False)
+        d.set_theme_type()
+        eq(d.builtinlist['state'], DISABLED)
+        eq(d.custom_theme_on['state'], NORMAL)
+        eq(d.customlist['state'], NORMAL)
+        eq(d.button_delete_custom['state'], NORMAL)
+        d.set_theme_type = Func()
+
+    def test_get_color(self):
+        eq = self.assertEqual
+        d = dialog
+        orig_chooser = configdialog.tkColorChooser.askcolor
+        chooser = configdialog.tkColorChooser.askcolor = Func()
+        gntn = d.get_new_theme_name = Func()
+
+        d.highlight_target.set('Editor Breakpoint')
+        d.color.set('#ffffff')
+
+        # Nothing selected.
+        chooser.result = (None, None)
+        d.button_set_color.invoke()
+        eq(d.color.get(), '#ffffff')
+
+        # Selection same as previous color.
+        chooser.result = ('', d.frame_color_set.cget('bg'))
+        d.button_set_color.invoke()
+        eq(d.color.get(), '#ffffff')
+
+        # Select different color.
+        chooser.result = ((222.8671875, 0.0, 0.0), '#de0000')
+
+        # Default theme.
+        d.color.set('#ffffff')
+        d.theme_source.set(True)
+
+        # No theme name selected therefore color not saved.
+        gntn.result = ''
+        d.button_set_color.invoke()
+        eq(gntn.called, 1)
+        eq(d.color.get(), '#ffffff')
+        # Theme name selected.
+        gntn.result = 'My New Theme'
+        d.button_set_color.invoke()
+        eq(d.custom_name.get(), gntn.result)
+        eq(d.color.get(), '#de0000')
+
+        # Custom theme.
+        d.color.set('#ffffff')
+        d.theme_source.set(False)
+        d.button_set_color.invoke()
+        eq(d.color.get(), '#de0000')
+
+        del d.get_new_theme_name
+        configdialog.tkColorChooser.askcolor = orig_chooser
+
+    def test_on_new_color_set(self):
+        d = dialog
+        color = '#3f7cae'
+        d.custom_name.set('Python')
+        d.highlight_target.set('Selected Text')
+        d.fg_bg_toggle.set(True)
+
+        d.color.set(color)
+        self.assertEqual(d.frame_color_set.cget('bg'), color)
+        self.assertEqual(d.highlight_sample.tag_cget('hilite', 'foreground'), color)
+        self.assertEqual(highpage,
+                         {'Python': {'hilite-foreground': color}})
+
+    def test_get_new_theme_name(self):
+        orig_sectionname = configdialog.SectionName
+        sn = configdialog.SectionName = Func(return_self=True)
+        d = dialog
+
+        sn.result = 'New Theme'
+        self.assertEqual(d.get_new_theme_name(''), 'New Theme')
+
+        configdialog.SectionName = orig_sectionname
+
+    def test_save_as_new_theme(self):
+        d = dialog
+        gntn = d.get_new_theme_name = Func()
+        d.theme_source.set(True)
+
+        # No name entered.
+        gntn.result = ''
+        d.button_save_custom.invoke()
+        self.assertNotIn(gntn.result, idleConf.userCfg['highlight'])
+
+        # Name entered.
+        gntn.result = 'my new theme'
+        gntn.called = 0
+        self.assertNotIn(gntn.result, idleConf.userCfg['highlight'])
+        d.button_save_custom.invoke()
+        self.assertIn(gntn.result, idleConf.userCfg['highlight'])
+
+        del d.get_new_theme_name
+
+    def test_create_new_and_save_new(self):
+        eq = self.assertEqual
+        d = dialog
+
+        # Use default as previously active theme.
+        d.theme_source.set(True)
+        d.builtin_name.set('IDLE Classic')
+        first_new = 'my new custom theme'
+        second_new = 'my second custom theme'
+
+        # No changes, so themes are an exact copy.
+        self.assertNotIn(first_new, idleConf.userCfg)
+        d.create_new(first_new)
+        eq(idleConf.GetSectionList('user', 'highlight'), [first_new])
+        eq(idleConf.GetThemeDict('default', 'IDLE Classic'),
+           idleConf.GetThemeDict('user', first_new))
+        eq(d.custom_name.get(), first_new)
+        self.assertFalse(d.theme_source.get())  # Use custom set.
+        eq(d.set_theme_type.called, 1)
+
+        # Test that changed targets are in new theme.
+        changes.add_option('highlight', first_new, 'hit-background', 'yellow')
+        self.assertNotIn(second_new, idleConf.userCfg)
+        d.create_new(second_new)
+        eq(idleConf.GetSectionList('user', 'highlight'), [first_new, second_new])
+        self.assertNotEqual(idleConf.GetThemeDict('user', first_new),
+                            idleConf.GetThemeDict('user', second_new))
+        # Check that difference in themes was in `hit-background` from `changes`.
+        idleConf.SetOption('highlight', first_new, 'hit-background', 'yellow')
+        eq(idleConf.GetThemeDict('user', first_new),
+           idleConf.GetThemeDict('user', second_new))
+
+    def test_set_highlight_target(self):
+        eq = self.assertEqual
+        d = dialog
+        del d.set_highlight_target
+
+        # Target is cursor.
+        d.highlight_target.set('Cursor')
+        eq(d.fg_on['state'], DISABLED)
+        eq(d.bg_on['state'], DISABLED)
+        self.assertTrue(d.fg_bg_toggle)
+        eq(d.set_color_sample.called, 1)
+
+        # Target is not cursor.
+        d.highlight_target.set('Comment')
+        eq(d.fg_on['state'], NORMAL)
+        eq(d.bg_on['state'], NORMAL)
+        self.assertTrue(d.fg_bg_toggle)
+        eq(d.set_color_sample.called, 2)
+
+        d.set_highlight_target = Func()
+
+    def test_set_color_sample_binding(self):
+        d = dialog
+        scs = d.set_color_sample
+
+        d.fg_on.invoke()
+        self.assertEqual(scs.called, 1)
+
+        d.bg_on.invoke()
+        self.assertEqual(scs.called, 2)
+
+    def test_set_color_sample(self):
+        d = dialog
+        del d.set_color_sample
+        d.highlight_target.set('Selected Text')
+        d.fg_bg_toggle.set(True)
+        d.set_color_sample()
+        self.assertEqual(d.frame_color_set.cget('bg'),
+                         d.highlight_sample.tag_cget('hilite', 'foreground'))
+        d.set_color_sample = Func()
+
+    def test_paint_theme_sample(self):
+        eq = self.assertEqual
+        d = dialog
+        del d.paint_theme_sample
+        hs_tag = d.highlight_sample.tag_cget
+        gh = idleConf.GetHighlight
+        fg = 'foreground'
+        bg = 'background'
+
+        # Create custom theme based on IDLE Dark.
+        d.theme_source.set(True)
+        d.builtin_name.set('IDLE Dark')
+        theme = 'IDLE Test'
+        d.create_new(theme)
+        d.set_color_sample.called = 0
+
+        # Base theme with nothing in `changes`.
+        d.paint_theme_sample()
+        eq(hs_tag('break', fg), gh(theme, 'break', fgBg='fg'))
+        eq(hs_tag('cursor', bg), gh(theme, 'normal', fgBg='bg'))
+        self.assertNotEqual(hs_tag('console', fg), 'blue')
+        self.assertNotEqual(hs_tag('console', bg), 'yellow')
+        eq(d.set_color_sample.called, 1)
+
+        # Apply changes.
+        changes.add_option('highlight', theme, 'console-foreground', 'blue')
+        changes.add_option('highlight', theme, 'console-background', 'yellow')
+        d.paint_theme_sample()
+
+        eq(hs_tag('break', fg), gh(theme, 'break', fgBg='fg'))
+        eq(hs_tag('cursor', bg), gh(theme, 'normal', fgBg='bg'))
+        eq(hs_tag('console', fg), 'blue')
+        eq(hs_tag('console', bg), 'yellow')
+        eq(d.set_color_sample.called, 2)
+
+        d.paint_theme_sample = Func()
+
+    def test_delete_custom(self):
+        eq = self.assertEqual
+        d = dialog
+        d.button_delete_custom['state'] = NORMAL
+        yesno = configdialog.tkMessageBox.askyesno = Func()
+        dialog.deactivate_current_config = Func()
+        dialog.activate_config_changes = Func()
+
+        theme_name = 'spam theme'
+        idleConf.userCfg['highlight'].SetOption(theme_name, 'name', 'value')
+        highpage[theme_name] = {'option': 'True'}
+
+        # Force custom theme.
+        d.theme_source.set(False)
+        d.custom_name.set(theme_name)
+
+        # Cancel deletion.
+        yesno.result = False
+        d.button_delete_custom.invoke()
+        eq(yesno.called, 1)
+        eq(highpage[theme_name], {'option': 'True'})
+        eq(idleConf.GetSectionList('user', 'highlight'), ['spam theme'])
+        eq(dialog.deactivate_current_config.called, 0)
+        eq(dialog.activate_config_changes.called, 0)
+        eq(d.set_theme_type.called, 0)
+
+        # Confirm deletion.
+        yesno.result = True
+        d.button_delete_custom.invoke()
+        eq(yesno.called, 2)
+        self.assertNotIn(theme_name, highpage)
+        eq(idleConf.GetSectionList('user', 'highlight'), [])
+        eq(d.custom_theme_on['state'], DISABLED)
+        eq(d.custom_name.get(), '- no custom themes -')
+        eq(dialog.deactivate_current_config.called, 1)
+        eq(dialog.activate_config_changes.called, 1)
+        eq(d.set_theme_type.called, 1)
+
+        del dialog.activate_config_changes, dialog.deactivate_current_config
+        del configdialog.tkMessageBox.askyesno
 
 
 class KeysPageTest(unittest.TestCase):
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-17-15-00-20.bpo-31001.KLxYHC.rst b/Misc/NEWS.d/next/IDLE/2017-08-17-15-00-20.bpo-31001.KLxYHC.rst
new file mode 100644
index 00000000000..5e1eeee0419
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-17-15-00-20.bpo-31001.KLxYHC.rst
@@ -0,0 +1 @@
+Add tests for configdialog highlight tab.  Patch by Cheryl Sabella.


From webhook-mailer at python.org  Thu Aug 17 21:02:24 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Fri, 18 Aug 2017 01:02:24 -0000
Subject: [Python-checkins] [3.6] bpo-31001: IDLE: Add tests for configdialog
 highlight tab (GH-3123) (#3124)
Message-ID: <mailman.38.1503018148.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/6db2edbe050cc9ac9026f350a24f2d525bcadecd
commit: 6db2edbe050cc9ac9026f350a24f2d525bcadecd
branch: 3.6
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-17T21:02:20-04:00
summary:

[3.6] bpo-31001: IDLE: Add tests for configdialog highlight tab (GH-3123) (#3124)

(cherry picked from commit 82aff62)

files:
A Misc/NEWS.d/next/IDLE/2017-08-17-15-00-20.bpo-31001.KLxYHC.rst
M Lib/idlelib/configdialog.py
M Lib/idlelib/idle_test/test_configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index e1ac82b7df3..a36bf83ad0f 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -222,13 +222,79 @@ def help(self):
     def create_page_highlight(self):
         """Return frame of widgets for Highlighting tab.
 
+        Enable users to provisionally change foreground and background
+        colors applied to textual tags.  Color mappings are stored in
+        complete listings called themes.  Built-in themes in
+        idlelib/config-highlight.def are fixed as far as the dialog is
+        concerned. Any theme can be used as the base for a new custom
+        theme, stored in .idlerc/config-highlight.cfg.
+
+        Function load_theme_cfg() initializes tk variables and theme
+        lists and calls paint_theme_sample() and set_highlight_target()
+        for the current theme.  Radiobuttons builtin_theme_on and
+        custom_theme_on toggle var theme_source, which controls if the
+        current set of colors are from a builtin or custom theme.
+        DynOptionMenus builtinlist and customlist contain lists of the
+        builtin and custom themes, respectively, and the current item
+        from each list is stored in vars builtin_name and custom_name.
+
+        Function paint_theme_sample() applies the colors from the theme
+        to the tags in text widget highlight_sample and then invokes
+        set_color_sample().  Function set_highlight_target() sets the state
+        of the radiobuttons fg_on and bg_on based on the tag and it also
+        invokes set_color_sample().
+
+        Function set_color_sample() sets the background color for the frame
+        holding the color selector.  This provides a larger visual of the
+        color for the current tag and plane (foreground/background).
+
+        Note: set_color_sample() is called from many places and is often
+        called more than once when a change is made.  It is invoked when
+        foreground or background is selected (radiobuttons), from
+        paint_theme_sample() (theme is changed or load_cfg is called), and
+        from set_highlight_target() (target tag is changed or load_cfg called).
+
+        Button delete_custom invokes delete_custom() to delete
+        a custom theme from idleConf.userCfg['highlight'] and changes.
+        Button save_custom invokes save_as_new_theme() which calls
+        get_new_theme_name() and create_new() to save a custom theme
+        and its colors to idleConf.userCfg['highlight'].
+
+        Radiobuttons fg_on and bg_on toggle var fg_bg_toggle to control
+        if the current selected color for a tag is for the foreground or
+        background.
+
+        DynOptionMenu targetlist contains a readable description of the
+        tags applied to Python source within IDLE.  Selecting one of the
+        tags from this list populates highlight_target, which has a callback
+        function set_highlight_target().
+
+        Text widget highlight_sample displays a block of text (which is
+        mock Python code) in which is embedded the defined tags and reflects
+        the color attributes of the current theme and changes for those tags.
+        Mouse button 1 allows for selection of a tag and updates
+        highlight_target with that tag value.
+
+        Note: The font in highlight_sample is set through the config in
+        the fonts tab.
+
+        In other words, a tag can be selected either from targetlist or
+        by clicking on the sample text within highlight_sample.  The
+        plane (foreground/background) is selected via the radiobutton.
+        Together, these two (tag and plane) control what color is
+        shown in set_color_sample() for the current theme.  Button set_color
+        invokes get_color() which displays a ColorChooser to change the
+        color for the selected tag/plane.  If a new color is picked,
+        it will be saved to changes and the highlight_sample and
+        frame background will be updated.
+
         Tk Variables:
             color: Color of selected target.
-            builtin_theme: Menu variable for built-in theme.
-            custom_theme: Menu variable for custom theme.
+            builtin_name: Menu variable for built-in theme.
+            custom_name: Menu variable for custom theme.
             fg_bg_toggle: Toggle for foreground/background color.
                 Note: this has no callback.
-            is_builtin_theme: Selector for built-in or custom theme.
+            theme_source: Selector for built-in or custom theme.
             highlight_target: Menu variable for the highlight tag target.
 
         Instance Data Attributes:
@@ -245,30 +311,30 @@ def create_page_highlight(self):
             on_new_color_set: Set new color and add option.
             paint_theme_sample: Recolor sample.
             get_new_theme_name: Get from popup.
-            create_new_theme: Combine theme with changes and save.
-            save_as_new_theme: Save [button_save_custom_theme].
-            set_theme_type: Command for [is_builtin_theme].
-            delete_custom_theme: Ativate default [button_delete_custom_theme].
-            save_new_theme: Save to userCfg['theme'] (is function).
+            create_new: Combine theme with changes and save.
+            save_as_new_theme: Save [button_save_custom].
+            set_theme_type: Command for [theme_source].
+            delete_custom: Activate default [button_delete_custom].
+            save_new: Save to userCfg['theme'] (is function).
 
         Widgets of highlights page frame:  (*) widgets bound to self
             frame_custom: LabelFrame
                 (*)highlight_sample: Text
                 (*)frame_color_set: Frame
-                    button_set_color: Button
-                    (*)opt_menu_highlight_target: DynOptionMenu - highlight_target
+                    (*)button_set_color: Button
+                    (*)targetlist: DynOptionMenu - highlight_target
                 frame_fg_bg_toggle: Frame
-                    (*)radio_fg: Radiobutton - fg_bg_toggle
-                    (*)radio_bg: Radiobutton - fg_bg_toggle
-                button_save_custom_theme: Button
+                    (*)fg_on: Radiobutton - fg_bg_toggle
+                    (*)bg_on: Radiobutton - fg_bg_toggle
+                (*)button_save_custom: Button
             frame_theme: LabelFrame
                 theme_type_title: Label
-                (*)radio_theme_builtin: Radiobutton - is_builtin_theme
-                (*)radio_theme_custom: Radiobutton - is_builtin_theme
-                (*)opt_menu_theme_builtin: DynOptionMenu - builtin_theme
-                (*)opt_menu_theme_custom: DynOptionMenu - custom_theme
-                (*)button_delete_custom_theme: Button
-                (*)new_custom_theme: Label
+                (*)builtin_theme_on: Radiobutton - theme_source
+                (*)custom_theme_on: Radiobutton - theme_source
+                (*)builtinlist: DynOptionMenu - builtin_name
+                (*)customlist: DynOptionMenu - custom_name
+                (*)button_delete_custom: Button
+                (*)theme_message: Label
         """
         self.theme_elements={
             'Normal Text': ('normal', '00'),
@@ -287,31 +353,30 @@ def create_page_highlight(self):
             'Shell Stderr Text': ('stderr', '13'),
             }
         parent = self.parent
-        self.builtin_theme = tracers.add(
-                StringVar(parent), self.var_changed_builtin_theme)
-        self.custom_theme = tracers.add(
-                StringVar(parent), self.var_changed_custom_theme)
+        self.builtin_name = tracers.add(
+                StringVar(parent), self.var_changed_builtin_name)
+        self.custom_name = tracers.add(
+                StringVar(parent), self.var_changed_custom_name)
         self.fg_bg_toggle = BooleanVar(parent)
         self.color = tracers.add(
                 StringVar(parent), self.var_changed_color)
-        self.is_builtin_theme = tracers.add(
-                BooleanVar(parent), self.var_changed_is_builtin_theme)
+        self.theme_source = tracers.add(
+                BooleanVar(parent), self.var_changed_theme_source)
         self.highlight_target = tracers.add(
                 StringVar(parent), self.var_changed_highlight_target)
 
-        # Widget creation:
-        # body frame and section frames
+        # Create widgets:
+        # body frame and section frames.
         frame = Frame(self.note)
         frame_custom = LabelFrame(frame, borderwidth=2, relief=GROOVE,
                                  text=' Custom Highlighting ')
         frame_theme = LabelFrame(frame, borderwidth=2, relief=GROOVE,
                                 text=' Highlighting Theme ')
-        #frame_custom
+        # frame_custom.
         text = self.highlight_sample = frame.highlight_sample = Text(
                 frame_custom, relief=SOLID, borderwidth=1,
                 font=('courier', 12, ''), cursor='hand2', width=21, height=13,
                 takefocus=FALSE, highlightthickness=0, wrap=NONE)
-        text=self.highlight_sample
         text.bind('<Double-Button-1>', lambda e: 'break')
         text.bind('<B1-Motion>', lambda e: 'break')
         text_and_tags=(('\n', 'normal'),
@@ -341,78 +406,77 @@ def tem(event, elem=element):
         text['state'] = DISABLED
         self.frame_color_set = Frame(frame_custom, relief=SOLID, borderwidth=1)
         frame_fg_bg_toggle = Frame(frame_custom)
-        button_set_color = Button(
+        self.button_set_color = Button(
                 self.frame_color_set, text='Choose Color for :',
                 command=self.get_color, highlightthickness=0)
-        self.opt_menu_highlight_target = DynOptionMenu(
+        self.targetlist = DynOptionMenu(
                 self.frame_color_set, self.highlight_target, None,
                 highlightthickness=0) #, command=self.set_highlight_targetBinding
-        self.radio_fg = Radiobutton(
+        self.fg_on = Radiobutton(
                 frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=1,
                 text='Foreground', command=self.set_color_sample_binding)
-        self.radio_bg=Radiobutton(
+        self.bg_on = Radiobutton(
                 frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=0,
                 text='Background', command=self.set_color_sample_binding)
         self.fg_bg_toggle.set(1)
-        button_save_custom_theme = Button(
+        self.button_save_custom = Button(
                 frame_custom, text='Save as New Custom Theme',
                 command=self.save_as_new_theme)
-        #frame_theme
+        # frame_theme.
         theme_type_title = Label(frame_theme, text='Select : ')
-        self.radio_theme_builtin = Radiobutton(
-                frame_theme, variable=self.is_builtin_theme, value=1,
+        self.builtin_theme_on = Radiobutton(
+                frame_theme, variable=self.theme_source, value=1,
                 command=self.set_theme_type, text='a Built-in Theme')
-        self.radio_theme_custom = Radiobutton(
-                frame_theme, variable=self.is_builtin_theme, value=0,
+        self.custom_theme_on = Radiobutton(
+                frame_theme, variable=self.theme_source, value=0,
                 command=self.set_theme_type, text='a Custom Theme')
-        self.opt_menu_theme_builtin = DynOptionMenu(
-                frame_theme, self.builtin_theme, None, command=None)
-        self.opt_menu_theme_custom=DynOptionMenu(
-                frame_theme, self.custom_theme, None, command=None)
-        self.button_delete_custom_theme=Button(
+        self.builtinlist = DynOptionMenu(
+                frame_theme, self.builtin_name, None, command=None)
+        self.customlist = DynOptionMenu(
+                frame_theme, self.custom_name, None, command=None)
+        self.button_delete_custom = Button(
                 frame_theme, text='Delete Custom Theme',
-                command=self.delete_custom_theme)
-        self.new_custom_theme = Label(frame_theme, bd=2)
+                command=self.delete_custom)
+        self.theme_message = Label(frame_theme, bd=2)
 
-        ##widget packing
-        #body
+        # Pack widgets:
+        # body.
         frame_custom.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
         frame_theme.pack(side=LEFT, padx=5, pady=5, fill=Y)
-        #frame_custom
+        # frame_custom.
         self.frame_color_set.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=X)
         frame_fg_bg_toggle.pack(side=TOP, padx=5, pady=0)
         self.highlight_sample.pack(
                 side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
-        button_set_color.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=4)
-        self.opt_menu_highlight_target.pack(
-                side=TOP, expand=TRUE, fill=X, padx=8, pady=3)
-        self.radio_fg.pack(side=LEFT, anchor=E)
-        self.radio_bg.pack(side=RIGHT, anchor=W)
-        button_save_custom_theme.pack(side=BOTTOM, fill=X, padx=5, pady=5)
-        #frame_theme
+        self.button_set_color.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=4)
+        self.targetlist.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=3)
+        self.fg_on.pack(side=LEFT, anchor=E)
+        self.bg_on.pack(side=RIGHT, anchor=W)
+        self.button_save_custom.pack(side=BOTTOM, fill=X, padx=5, pady=5)
+        # frame_theme.
         theme_type_title.pack(side=TOP, anchor=W, padx=5, pady=5)
-        self.radio_theme_builtin.pack(side=TOP, anchor=W, padx=5)
-        self.radio_theme_custom.pack(side=TOP, anchor=W, padx=5, pady=2)
-        self.opt_menu_theme_builtin.pack(side=TOP, fill=X, padx=5, pady=5)
-        self.opt_menu_theme_custom.pack(side=TOP, fill=X, anchor=W, padx=5, pady=5)
-        self.button_delete_custom_theme.pack(side=TOP, fill=X, padx=5, pady=5)
-        self.new_custom_theme.pack(side=TOP, fill=X, pady=5)
+        self.builtin_theme_on.pack(side=TOP, anchor=W, padx=5)
+        self.custom_theme_on.pack(side=TOP, anchor=W, padx=5, pady=2)
+        self.builtinlist.pack(side=TOP, fill=X, padx=5, pady=5)
+        self.customlist.pack(side=TOP, fill=X, anchor=W, padx=5, pady=5)
+        self.button_delete_custom.pack(side=TOP, fill=X, padx=5, pady=5)
+        self.theme_message.pack(side=TOP, fill=X, pady=5)
         return frame
 
     def load_theme_cfg(self):
         """Load current configuration settings for the theme options.
 
-        Based on the is_builtin_theme toggle, the theme is set as
+        Based on the theme_source toggle, the theme is set as
         either builtin or custom and the initial widget values
         reflect the current settings from idleConf.
 
         Attributes updated:
-            is_builtin_theme: Set from idleConf.
-            opt_menu_theme_builtin: List of default themes from idleConf.
-            opt_menu_theme_custom: List of custom themes from idleConf.
-            radio_theme_custom: Disabled if there are no custom themes.
+            theme_source: Set from idleConf.
+            builtinlist: List of default themes from idleConf.
+            customlist: List of custom themes from idleConf.
+            custom_theme_on: Disabled if there are no custom themes.
             custom_theme: Message with additional information.
-            opt_menu_highlight_target: Create menu from self.theme_elements.
+            targetlist: Create menu from self.theme_elements.
 
         Methods:
             set_theme_type
@@ -420,80 +484,81 @@ def load_theme_cfg(self):
             set_highlight_target
         """
         # Set current theme type radiobutton.
-        self.is_builtin_theme.set(idleConf.GetOption(
+        self.theme_source.set(idleConf.GetOption(
                 'main', 'Theme', 'default', type='bool', default=1))
         # Set current theme.
         current_option = idleConf.CurrentTheme()
         # Load available theme option menus.
-        if self.is_builtin_theme.get():  # Default theme selected.
+        if self.theme_source.get():  # Default theme selected.
             item_list = idleConf.GetSectionList('default', 'highlight')
             item_list.sort()
-            self.opt_menu_theme_builtin.SetMenu(item_list, current_option)
+            self.builtinlist.SetMenu(item_list, current_option)
             item_list = idleConf.GetSectionList('user', 'highlight')
             item_list.sort()
             if not item_list:
-                self.radio_theme_custom['state'] = DISABLED
-                self.custom_theme.set('- no custom themes -')
+                self.custom_theme_on['state'] = DISABLED
+                self.custom_name.set('- no custom themes -')
             else:
-                self.opt_menu_theme_custom.SetMenu(item_list, item_list[0])
+                self.customlist.SetMenu(item_list, item_list[0])
         else:  # User theme selected.
             item_list = idleConf.GetSectionList('user', 'highlight')
             item_list.sort()
-            self.opt_menu_theme_custom.SetMenu(item_list, current_option)
+            self.customlist.SetMenu(item_list, current_option)
             item_list = idleConf.GetSectionList('default', 'highlight')
             item_list.sort()
-            self.opt_menu_theme_builtin.SetMenu(item_list, item_list[0])
+            self.builtinlist.SetMenu(item_list, item_list[0])
         self.set_theme_type()
         # Load theme element option menu.
         theme_names = list(self.theme_elements.keys())
         theme_names.sort(key=lambda x: self.theme_elements[x][1])
-        self.opt_menu_highlight_target.SetMenu(theme_names, theme_names[0])
+        self.targetlist.SetMenu(theme_names, theme_names[0])
         self.paint_theme_sample()
         self.set_highlight_target()
 
-    def var_changed_builtin_theme(self, *params):
+    def var_changed_builtin_name(self, *params):
         """Process new builtin theme selection.
 
         Add the changed theme's name to the changed_items and recreate
         the sample with the values from the selected theme.
         """
         old_themes = ('IDLE Classic', 'IDLE New')
-        value = self.builtin_theme.get()
+        value = self.builtin_name.get()
         if value not in old_themes:
             if idleConf.GetOption('main', 'Theme', 'name') not in old_themes:
                 changes.add_option('main', 'Theme', 'name', old_themes[0])
             changes.add_option('main', 'Theme', 'name2', value)
-            self.new_custom_theme.config(text='New theme, see Help',
-                                         fg='#500000')
+            self.theme_message['text'] = 'New theme, see Help'
+            self.theme_message['fg'] = '#500000'
         else:
             changes.add_option('main', 'Theme', 'name', value)
             changes.add_option('main', 'Theme', 'name2', '')
-            self.new_custom_theme.config(text='', fg='black')
+            self.theme_message['text'] = ''
+            self.theme_message['fg'] = 'black'
         self.paint_theme_sample()
 
-    def var_changed_custom_theme(self, *params):
+    def var_changed_custom_name(self, *params):
         """Process new custom theme selection.
 
         If a new custom theme is selected, add the name to the
         changed_items and apply the theme to the sample.
         """
-        value = self.custom_theme.get()
+        value = self.custom_name.get()
         if value != '- no custom themes -':
             changes.add_option('main', 'Theme', 'name', value)
             self.paint_theme_sample()
 
-    def var_changed_is_builtin_theme(self, *params):
+    def var_changed_theme_source(self, *params):
         """Process toggle between builtin and custom theme.
 
         Update the default toggle value and apply the newly
         selected theme type.
         """
-        value = self.is_builtin_theme.get()
+        value = self.theme_source.get()
         changes.add_option('main', 'Theme', 'default', value)
         if value:
-            self.var_changed_builtin_theme()
+            self.var_changed_builtin_name()
         else:
-            self.var_changed_custom_theme()
+            self.var_changed_custom_name()
 
     def var_changed_color(self, *params):
         "Process change to color choice."
@@ -507,29 +572,29 @@ def set_theme_type(self):
         """Set available screen options based on builtin or custom theme.
 
         Attributes accessed:
-            is_builtin_theme
+            theme_source
 
         Attributes updated:
-            opt_menu_theme_builtin
-            opt_menu_theme_custom
-            button_delete_custom_theme
-            radio_theme_custom
+            builtinlist
+            customlist
+            button_delete_custom
+            custom_theme_on
 
         Called from:
-            handler for radio_theme_builtin and radio_theme_custom
-            delete_custom_theme
-            create_new_theme
+            handler for builtin_theme_on and custom_theme_on
+            delete_custom
+            create_new
             load_theme_cfg
         """
-        if self.is_builtin_theme.get():
-            self.opt_menu_theme_builtin['state'] = NORMAL
-            self.opt_menu_theme_custom['state'] = DISABLED
-            self.button_delete_custom_theme['state'] = DISABLED
+        if self.theme_source.get():
+            self.builtinlist['state'] = NORMAL
+            self.customlist['state'] = DISABLED
+            self.button_delete_custom['state'] = DISABLED
         else:
-            self.opt_menu_theme_builtin['state'] = DISABLED
-            self.radio_theme_custom['state'] = NORMAL
-            self.opt_menu_theme_custom['state'] = NORMAL
-            self.button_delete_custom_theme['state'] = NORMAL
+            self.builtinlist['state'] = DISABLED
+            self.custom_theme_on['state'] = NORMAL
+            self.customlist['state'] = NORMAL
+            self.button_delete_custom['state'] = NORMAL
 
     def get_color(self):
         """Handle button to select a new color for the target tag.
@@ -540,14 +605,14 @@ def get_color(self):
         Attributes accessed:
             highlight_target
             frame_color_set
-            is_builtin_theme
+            theme_source
 
         Attributes updated:
             color
 
         Methods:
             get_new_theme_name
-            create_new_theme
+            create_new
         """
         target = self.highlight_target.get()
         prev_color = self.frame_color_set.cget('bg')
@@ -556,26 +621,26 @@ def get_color(self):
                 initialcolor=prev_color)
         if color_string and (color_string != prev_color):
             # User didn't cancel and they chose a new color.
-            if self.is_builtin_theme.get():  # Current theme is a built-in.
+            if self.theme_source.get():  # Current theme is a built-in.
                 message = ('Your changes will be saved as a new Custom Theme. '
                            'Enter a name for your new Custom Theme below.')
                 new_theme = self.get_new_theme_name(message)
                 if not new_theme:  # User cancelled custom theme creation.
                     return
                 else:  # Create new custom theme based on previously active theme.
-                    self.create_new_theme(new_theme)
+                    self.create_new(new_theme)
                     self.color.set(color_string)
             else:  # Current theme is user defined.
                 self.color.set(color_string)
 
     def on_new_color_set(self):
         "Display sample of new color selection on the dialog."
-        new_color=self.color.get()
-        self.frame_color_set.config(bg=new_color)  # Set sample.
-        plane ='foreground' if self.fg_bg_toggle.get() else 'background'
+        new_color = self.color.get()
+        self.frame_color_set['bg'] = new_color  # Set sample.
+        plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
         sample_element = self.theme_elements[self.highlight_target.get()][0]
-        self.highlight_sample.tag_config(sample_element, **{plane:new_color})
-        theme = self.custom_theme.get()
+        self.highlight_sample.tag_config(sample_element, **{plane: new_color})
+        theme = self.custom_name.get()
         theme_element = sample_element + '-' + plane
         changes.add_option('highlight', theme, theme_element, new_color)
 
@@ -592,13 +657,13 @@ def save_as_new_theme(self):
 
         Methods:
             get_new_theme_name
-            create_new_theme
+            create_new
         """
         new_theme_name = self.get_new_theme_name('New Theme Name:')
         if new_theme_name:
-            self.create_new_theme(new_theme_name)
+            self.create_new(new_theme_name)
 
-    def create_new_theme(self, new_theme_name):
+    def create_new(self, new_theme_name):
         """Create a new custom theme with the given name.
 
         Create the new theme based on the previously active theme
@@ -606,23 +671,23 @@ def create_new_theme(self, new_theme_name):
         activate the new theme.
 
         Attributes accessed:
-            builtin_theme
-            custom_theme
+            builtin_name
+            custom_name
 
         Attributes updated:
-            opt_menu_theme_custom
-            is_builtin_theme
+            customlist
+            theme_source
 
         Method:
-            save_new_theme
+            save_new
             set_theme_type
         """
-        if self.is_builtin_theme.get():
+        if self.theme_source.get():
             theme_type = 'default'
-            theme_name = self.builtin_theme.get()
+            theme_name = self.builtin_name.get()
         else:
             theme_type = 'user'
-            theme_name = self.custom_theme.get()
+            theme_name = self.custom_name.get()
         new_theme = idleConf.GetThemeDict(theme_type, theme_name)
         # Apply any of the old theme's unsaved changes to the new theme.
         if theme_name in changes['highlight']:
@@ -630,12 +695,12 @@ def create_new_theme(self, new_theme_name):
             for element in theme_changes:
                 new_theme[element] = theme_changes[element]
         # Save the new theme.
-        self.save_new_theme(new_theme_name, new_theme)
+        self.save_new(new_theme_name, new_theme)
         # Change GUI over to the new theme.
         custom_theme_list = idleConf.GetSectionList('user', 'highlight')
         custom_theme_list.sort()
-        self.opt_menu_theme_custom.SetMenu(custom_theme_list, new_theme_name)
-        self.is_builtin_theme.set(0)
+        self.customlist.SetMenu(custom_theme_list, new_theme_name)
+        self.theme_source.set(0)
         self.set_theme_type()
 
     def set_highlight_target(self):
@@ -645,8 +710,8 @@ def set_highlight_target(self):
             highlight_target
 
         Attributes updated:
-            radio_fg
-            radio_bg
+            fg_on
+            bg_on
             fg_bg_toggle
 
         Methods:
@@ -657,12 +722,12 @@ def set_highlight_target(self):
             load_theme_cfg
         """
         if self.highlight_target.get() == 'Cursor':  # bg not possible
-            self.radio_fg['state'] = DISABLED
-            self.radio_bg['state'] = DISABLED
+            self.fg_on['state'] = DISABLED
+            self.bg_on['state'] = DISABLED
             self.fg_bg_toggle.set(1)
         else:  # Both fg and bg can be set.
-            self.radio_fg['state'] = NORMAL
-            self.radio_bg['state'] = NORMAL
+            self.fg_on['state'] = NORMAL
+            self.bg_on['state'] = NORMAL
             self.fg_bg_toggle.set(1)
         self.set_color_sample()
 
@@ -690,16 +755,16 @@ def set_color_sample(self):
         tag = self.theme_elements[self.highlight_target.get()][0]
         plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
         color = self.highlight_sample.tag_cget(tag, plane)
-        self.frame_color_set.config(bg=color)
+        self.frame_color_set['bg'] = color
 
     def paint_theme_sample(self):
         """Apply the theme colors to each element tag in the sample text.
 
         Instance attributes accessed:
             theme_elements
-            is_builtin_theme
-            builtin_theme
-            custom_theme
+            theme_source
+            builtin_name
+            custom_name
 
         Attributes updated:
             highlight_sample: Set the tag elements to the theme.
@@ -708,14 +773,14 @@ def paint_theme_sample(self):
             set_color_sample
 
         Called from:
-            var_changed_builtin_theme
-            var_changed_custom_theme
+            var_changed_builtin_name
+            var_changed_custom_name
             load_theme_cfg
         """
-        if self.is_builtin_theme.get():  # Default theme
-            theme = self.builtin_theme.get()
+        if self.theme_source.get():  # Default theme
+            theme = self.builtin_name.get()
         else:  # User theme
-            theme = self.custom_theme.get()
+            theme = self.custom_name.get()
         for element_title in self.theme_elements:
             element = self.theme_elements[element_title][0]
             colors = idleConf.GetHighlight(theme, element)
@@ -732,7 +797,7 @@ def paint_theme_sample(self):
             self.highlight_sample.tag_config(element, **colors)
         self.set_color_sample()
 
-    def save_new_theme(self, theme_name, theme):
+    def save_new(self, theme_name, theme):
         """Save a newly created theme to idleConf.
 
         theme_name - string, the name of the new theme
@@ -744,7 +809,7 @@ def save_new_theme(self, theme_name, theme):
             value = theme[element]
             idleConf.userCfg['highlight'].SetOption(theme_name, element, value)
 
-    def delete_custom_theme(self):
+    def delete_custom(self):
         """Handle event to delete custom theme.
 
         The current theme is deactivated and the default theme is
@@ -752,13 +817,13 @@ def delete_custom_theme(self):
         the config file.
 
         Attributes accessed:
-            custom_theme
+            custom_name
 
         Attributes updated:
-            radio_theme_custom
-            opt_menu_theme_custom
-            is_builtin_theme
-            builtin_theme
+            custom_theme_on
+            customlist
+            theme_source
+            builtin_name
 
         Methods:
             deactivate_current_config
@@ -766,7 +831,7 @@ def delete_custom_theme(self):
             activate_config_changes
             set_theme_type
         """
-        theme_name = self.custom_theme.get()
+        theme_name = self.custom_name.get()
         delmsg = 'Are you sure you wish to delete the theme %r ?'
         if not tkMessageBox.askyesno(
                 'Delete Theme',  delmsg % theme_name, parent=self):
@@ -778,13 +843,13 @@ def delete_custom_theme(self):
         item_list = idleConf.GetSectionList('user', 'highlight')
         item_list.sort()
         if not item_list:
-            self.radio_theme_custom['state'] = DISABLED
-            self.opt_menu_theme_custom.SetMenu(item_list, '- no custom themes -')
+            self.custom_theme_on['state'] = DISABLED
+            self.customlist.SetMenu(item_list, '- no custom themes -')
         else:
-            self.opt_menu_theme_custom.SetMenu(item_list, item_list[0])
+            self.customlist.SetMenu(item_list, item_list[0])
         # Revert to default theme.
-        self.is_builtin_theme.set(idleConf.defaultCfg['main'].Get('Theme', 'default'))
-        self.builtin_theme.set(idleConf.defaultCfg['main'].Get('Theme', 'name'))
+        self.theme_source.set(idleConf.defaultCfg['main'].Get('Theme', 'default'))
+        self.builtin_name.set(idleConf.defaultCfg['main'].Get('Theme', 'name'))
         # User can't back out of these changes, they must be applied now.
         changes.save_all()
         self.save_all_changed_extensions()
@@ -1270,7 +1335,7 @@ def create_page_keys(self):
         get_new_keys().  Function get_new_keys() gets the key mappings from the
         current keyset for the binding event item that was selected.  The
         function then displays another dialog, GetKeysDialog, with the
-        selected binding event and current keys and always new key sequences
+        selected binding event and current keys and allows new key sequences
         to be entered for that binding event.  If the keys aren't
         changed, nothing happens.  If the keys are changed and the keyset
         is a builtin, function get_new_keys_name() will be called
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index 964784508f8..966a72b50a9 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -139,7 +139,7 @@ def test_fontlist_mouse(self):
         self.assertIn(d.font_name.get(), font1.lower())
 
     def test_sizelist(self):
-        # Click on number shouod select that number
+        # Click on number should select that number
         d = self.page
         d.sizelist.variable.set(40)
         self.assertEqual(d.font_size.get(), '40')
@@ -227,9 +227,457 @@ def test_indent_scale(self):
 
 
 class HighlightTest(unittest.TestCase):
+    """Test that highlight tab widgets enable users to make changes.
+
+    Test that widget actions set vars, that var changes add
+    options to changes and that themes work correctly.
+    """
+
+    @classmethod
+    def setUpClass(cls):
+        d = dialog
+        dialog.note.select(d.highpage)
+        d.set_theme_type = Func()
+        d.paint_theme_sample = Func()
+        d.set_highlight_target = Func()
+        d.set_color_sample = Func()
+
+    @classmethod
+    def tearDownClass(cls):
+        d = dialog
+        del d.set_theme_type, d.paint_theme_sample
+        del d.set_highlight_target, d.set_color_sample
 
     def setUp(self):
+        d = dialog
+        # The following is needed for test_load_key_cfg, _delete_custom_keys.
+        # This may indicate a defect in some test or function.
+        for section in idleConf.GetSectionList('user', 'highlight'):
+            idleConf.userCfg['highlight'].remove_section(section)
         changes.clear()
+        d.set_theme_type.called = 0
+        d.paint_theme_sample.called = 0
+        d.set_highlight_target.called = 0
+        d.set_color_sample.called = 0
+
+    def test_load_theme_cfg(self):
+        tracers.detach()
+        d = dialog
+        eq = self.assertEqual
+
+        # Use builtin theme with no user themes created.
+        idleConf.CurrentTheme = mock.Mock(return_value='IDLE Classic')
+        d.load_theme_cfg()
+        self.assertTrue(d.theme_source.get())
+        # builtinlist sets variable builtin_name to the CurrentTheme default.
+        eq(d.builtin_name.get(), 'IDLE Classic')
+        eq(d.custom_name.get(), '- no custom themes -')
+        eq(d.custom_theme_on['state'], DISABLED)
+        eq(d.set_theme_type.called, 1)
+        eq(d.paint_theme_sample.called, 1)
+        eq(d.set_highlight_target.called, 1)
+
+        # Builtin theme with non-empty user theme list.
+        idleConf.SetOption('highlight', 'test1', 'option', 'value')
+        idleConf.SetOption('highlight', 'test2', 'option2', 'value2')
+        d.load_theme_cfg()
+        eq(d.builtin_name.get(), 'IDLE Classic')
+        eq(d.custom_name.get(), 'test1')
+        eq(d.set_theme_type.called, 2)
+        eq(d.paint_theme_sample.called, 2)
+        eq(d.set_highlight_target.called, 2)
+
+        # Use custom theme.
+        idleConf.CurrentTheme = mock.Mock(return_value='test2')
+        idleConf.SetOption('main', 'Theme', 'default', '0')
+        d.load_theme_cfg()
+        self.assertFalse(d.theme_source.get())
+        eq(d.builtin_name.get(), 'IDLE Classic')
+        eq(d.custom_name.get(), 'test2')
+        eq(d.set_theme_type.called, 3)
+        eq(d.paint_theme_sample.called, 3)
+        eq(d.set_highlight_target.called, 3)
+
+        del idleConf.CurrentTheme
+        tracers.attach()
+
+    def test_theme_source(self):
+        eq = self.assertEqual
+        d = dialog
+        # Test these separately.
+        d.var_changed_builtin_name = Func()
+        d.var_changed_custom_name = Func()
+        # Builtin selected.
+        d.builtin_theme_on.invoke()
+        eq(mainpage, {'Theme': {'default': 'True'}})
+        eq(d.var_changed_builtin_name.called, 1)
+        eq(d.var_changed_custom_name.called, 0)
+        changes.clear()
+
+        # Custom selected.
+        d.custom_theme_on['state'] = NORMAL
+        d.custom_theme_on.invoke()
+        self.assertEqual(mainpage, {'Theme': {'default': 'False'}})
+        eq(d.var_changed_builtin_name.called, 1)
+        eq(d.var_changed_custom_name.called, 1)
+        del d.var_changed_builtin_name, d.var_changed_custom_name
+
+    def test_builtin_name(self):
+        eq = self.assertEqual
+        d = dialog
+        item_list = ['IDLE Classic', 'IDLE Dark', 'IDLE New']
+
+        # Not in old_themes, defaults name to first item.
+        idleConf.SetOption('main', 'Theme', 'name', 'spam')
+        d.builtinlist.SetMenu(item_list, 'IDLE Dark')
+        eq(mainpage, {'Theme': {'name': 'IDLE Classic',
+                                'name2': 'IDLE Dark'}})
+        eq(d.theme_message['text'], 'New theme, see Help')
+        eq(d.paint_theme_sample.called, 1)
+
+        # Not in old themes - uses name2.
+        changes.clear()
+        idleConf.SetOption('main', 'Theme', 'name', 'IDLE New')
+        d.builtinlist.SetMenu(item_list, 'IDLE Dark')
+        eq(mainpage, {'Theme': {'name2': 'IDLE Dark'}})
+        eq(d.theme_message['text'], 'New theme, see Help')
+        eq(d.paint_theme_sample.called, 2)
+
+        # Builtin name in old_themes.
+        changes.clear()
+        d.builtinlist.SetMenu(item_list, 'IDLE Classic')
+        eq(mainpage, {'Theme': {'name': 'IDLE Classic', 'name2': ''}})
+        eq(d.theme_message['text'], '')
+        eq(d.paint_theme_sample.called, 3)
+
+    def test_custom_name(self):
+        d = dialog
+
+        # If no selections, doesn't get added.
+        d.customlist.SetMenu([], '- no custom themes -')
+        self.assertNotIn('Theme', mainpage)
+        self.assertEqual(d.paint_theme_sample.called, 0)
+
+        # Custom name selected.
+        changes.clear()
+        d.customlist.SetMenu(['a', 'b', 'c'], 'c')
+        self.assertEqual(mainpage, {'Theme': {'name': 'c'}})
+        self.assertEqual(d.paint_theme_sample.called, 1)
+
+    def test_color(self):
+        d = dialog
+        d.on_new_color_set = Func()
+        # self.color is only set in get_color through ColorChooser.
+        d.color.set('green')
+        self.assertEqual(d.on_new_color_set.called, 1)
+        del d.on_new_color_set
+
+    def test_highlight_target_list_mouse(self):
+        # Set highlight_target through targetlist.
+        eq = self.assertEqual
+        d = dialog
+
+        d.targetlist.SetMenu(['a', 'b', 'c'], 'c')
+        eq(d.highlight_target.get(), 'c')
+        eq(d.set_highlight_target.called, 1)
+
+    def test_highlight_target_text_mouse(self):
+        # Set highlight_target through clicking highlight_sample.
+        eq = self.assertEqual
+        d = dialog
+
+        elem = {}
+        count = 0
+        hs = d.highlight_sample
+        hs.focus_force()
+        hs.see(1.0)
+        hs.update_idletasks()
+
+        def tag_to_element(elem):
+            for element, tag in d.theme_elements.items():
+                elem[tag[0]] = element
+
+        def click_it(start):
+            x, y, dx, dy = hs.bbox(start)
+            x += dx // 2
+            y += dy // 2
+            hs.event_generate('<Enter>', x=0, y=0)
+            hs.event_generate('<Motion>', x=x, y=y)
+            hs.event_generate('<ButtonPress-1>', x=x, y=y)
+            hs.event_generate('<ButtonRelease-1>', x=x, y=y)
+
+        # Flip theme_elements to make the tag the key.
+        tag_to_element(elem)
+
+        # If highlight_sample has a tag that isn't in theme_elements, there
+        # will be a KeyError in the test run.
+        for tag in hs.tag_names():
+            for start_index in hs.tag_ranges(tag)[0::2]:
+                count += 1
+                click_it(start_index)
+                eq(d.highlight_target.get(), elem[tag])
+                eq(d.set_highlight_target.called, count)
+
+    def test_set_theme_type(self):
+        eq = self.assertEqual
+        d = dialog
+        del d.set_theme_type
+
+        # Builtin theme selected.
+        d.theme_source.set(True)
+        d.set_theme_type()
+        eq(d.builtinlist['state'], NORMAL)
+        eq(d.customlist['state'], DISABLED)
+        eq(d.button_delete_custom['state'], DISABLED)
+
+        # Custom theme selected.
+        d.theme_source.set(False)
+        d.set_theme_type()
+        eq(d.builtinlist['state'], DISABLED)
+        eq(d.custom_theme_on['state'], NORMAL)
+        eq(d.customlist['state'], NORMAL)
+        eq(d.button_delete_custom['state'], NORMAL)
+        d.set_theme_type = Func()
+
+    def test_get_color(self):
+        eq = self.assertEqual
+        d = dialog
+        orig_chooser = configdialog.tkColorChooser.askcolor
+        chooser = configdialog.tkColorChooser.askcolor = Func()
+        gntn = d.get_new_theme_name = Func()
+
+        d.highlight_target.set('Editor Breakpoint')
+        d.color.set('#ffffff')
+
+        # Nothing selected.
+        chooser.result = (None, None)
+        d.button_set_color.invoke()
+        eq(d.color.get(), '#ffffff')
+
+        # Selection same as previous color.
+        chooser.result = ('', d.frame_color_set.cget('bg'))
+        d.button_set_color.invoke()
+        eq(d.color.get(), '#ffffff')
+
+        # Select different color.
+        chooser.result = ((222.8671875, 0.0, 0.0), '#de0000')
+
+        # Default theme.
+        d.color.set('#ffffff')
+        d.theme_source.set(True)
+
+        # No theme name selected therefore color not saved.
+        gntn.result = ''
+        d.button_set_color.invoke()
+        eq(gntn.called, 1)
+        eq(d.color.get(), '#ffffff')
+        # Theme name selected.
+        gntn.result = 'My New Theme'
+        d.button_set_color.invoke()
+        eq(d.custom_name.get(), gntn.result)
+        eq(d.color.get(), '#de0000')
+
+        # Custom theme.
+        d.color.set('#ffffff')
+        d.theme_source.set(False)
+        d.button_set_color.invoke()
+        eq(d.color.get(), '#de0000')
+
+        del d.get_new_theme_name
+        configdialog.tkColorChooser.askcolor = orig_chooser
+
+    def test_on_new_color_set(self):
+        d = dialog
+        color = '#3f7cae'
+        d.custom_name.set('Python')
+        d.highlight_target.set('Selected Text')
+        d.fg_bg_toggle.set(True)
+
+        d.color.set(color)
+        self.assertEqual(d.frame_color_set.cget('bg'), color)
+        self.assertEqual(d.highlight_sample.tag_cget('hilite', 'foreground'), color)
+        self.assertEqual(highpage,
+                         {'Python': {'hilite-foreground': color}})
+
+    def test_get_new_theme_name(self):
+        orig_sectionname = configdialog.SectionName
+        sn = configdialog.SectionName = Func(return_self=True)
+        d = dialog
+
+        sn.result = 'New Theme'
+        self.assertEqual(d.get_new_theme_name(''), 'New Theme')
+
+        configdialog.SectionName = orig_sectionname
+
+    def test_save_as_new_theme(self):
+        d = dialog
+        gntn = d.get_new_theme_name = Func()
+        d.theme_source.set(True)
+
+        # No name entered.
+        gntn.result = ''
+        d.button_save_custom.invoke()
+        self.assertNotIn(gntn.result, idleConf.userCfg['highlight'])
+
+        # Name entered.
+        gntn.result = 'my new theme'
+        gntn.called = 0
+        self.assertNotIn(gntn.result, idleConf.userCfg['highlight'])
+        d.button_save_custom.invoke()
+        self.assertIn(gntn.result, idleConf.userCfg['highlight'])
+
+        del d.get_new_theme_name
+
+    def test_create_new_and_save_new(self):
+        eq = self.assertEqual
+        d = dialog
+
+        # Use default as previously active theme.
+        d.theme_source.set(True)
+        d.builtin_name.set('IDLE Classic')
+        first_new = 'my new custom theme'
+        second_new = 'my second custom theme'
+
+        # No changes, so themes are an exact copy.
+        self.assertNotIn(first_new, idleConf.userCfg)
+        d.create_new(first_new)
+        eq(idleConf.GetSectionList('user', 'highlight'), [first_new])
+        eq(idleConf.GetThemeDict('default', 'IDLE Classic'),
+           idleConf.GetThemeDict('user', first_new))
+        eq(d.custom_name.get(), first_new)
+        self.assertFalse(d.theme_source.get())  # Use custom set.
+        eq(d.set_theme_type.called, 1)
+
+        # Test that changed targets are in new theme.
+        changes.add_option('highlight', first_new, 'hit-background', 'yellow')
+        self.assertNotIn(second_new, idleConf.userCfg)
+        d.create_new(second_new)
+        eq(idleConf.GetSectionList('user', 'highlight'), [first_new, second_new])
+        self.assertNotEqual(idleConf.GetThemeDict('user', first_new),
+                            idleConf.GetThemeDict('user', second_new))
+        # Check that difference in themes was in `hit-background` from `changes`.
+        idleConf.SetOption('highlight', first_new, 'hit-background', 'yellow')
+        eq(idleConf.GetThemeDict('user', first_new),
+           idleConf.GetThemeDict('user', second_new))
+
+    def test_set_highlight_target(self):
+        eq = self.assertEqual
+        d = dialog
+        del d.set_highlight_target
+
+        # Target is cursor.
+        d.highlight_target.set('Cursor')
+        eq(d.fg_on['state'], DISABLED)
+        eq(d.bg_on['state'], DISABLED)
+        self.assertTrue(d.fg_bg_toggle)
+        eq(d.set_color_sample.called, 1)
+
+        # Target is not cursor.
+        d.highlight_target.set('Comment')
+        eq(d.fg_on['state'], NORMAL)
+        eq(d.bg_on['state'], NORMAL)
+        self.assertTrue(d.fg_bg_toggle)
+        eq(d.set_color_sample.called, 2)
+
+        d.set_highlight_target = Func()
+
+    def test_set_color_sample_binding(self):
+        d = dialog
+        scs = d.set_color_sample
+
+        d.fg_on.invoke()
+        self.assertEqual(scs.called, 1)
+
+        d.bg_on.invoke()
+        self.assertEqual(scs.called, 2)
+
+    def test_set_color_sample(self):
+        d = dialog
+        del d.set_color_sample
+        d.highlight_target.set('Selected Text')
+        d.fg_bg_toggle.set(True)
+        d.set_color_sample()
+        self.assertEqual(d.frame_color_set.cget('bg'),
+                         d.highlight_sample.tag_cget('hilite', 'foreground'))
+        d.set_color_sample = Func()
+
+    def test_paint_theme_sample(self):
+        eq = self.assertEqual
+        d = dialog
+        del d.paint_theme_sample
+        hs_tag = d.highlight_sample.tag_cget
+        gh = idleConf.GetHighlight
+        fg = 'foreground'
+        bg = 'background'
+
+        # Create custom theme based on IDLE Dark.
+        d.theme_source.set(True)
+        d.builtin_name.set('IDLE Dark')
+        theme = 'IDLE Test'
+        d.create_new(theme)
+        d.set_color_sample.called = 0
+
+        # Base theme with nothing in `changes`.
+        d.paint_theme_sample()
+        eq(hs_tag('break', fg), gh(theme, 'break', fgBg='fg'))
+        eq(hs_tag('cursor', bg), gh(theme, 'normal', fgBg='bg'))
+        self.assertNotEqual(hs_tag('console', fg), 'blue')
+        self.assertNotEqual(hs_tag('console', bg), 'yellow')
+        eq(d.set_color_sample.called, 1)
+
+        # Apply changes.
+        changes.add_option('highlight', theme, 'console-foreground', 'blue')
+        changes.add_option('highlight', theme, 'console-background', 'yellow')
+        d.paint_theme_sample()
+
+        eq(hs_tag('break', fg), gh(theme, 'break', fgBg='fg'))
+        eq(hs_tag('cursor', bg), gh(theme, 'normal', fgBg='bg'))
+        eq(hs_tag('console', fg), 'blue')
+        eq(hs_tag('console', bg), 'yellow')
+        eq(d.set_color_sample.called, 2)
+
+        d.paint_theme_sample = Func()
+
+    def test_delete_custom(self):
+        eq = self.assertEqual
+        d = dialog
+        d.button_delete_custom['state'] = NORMAL
+        yesno = configdialog.tkMessageBox.askyesno = Func()
+        dialog.deactivate_current_config = Func()
+        dialog.activate_config_changes = Func()
+
+        theme_name = 'spam theme'
+        idleConf.userCfg['highlight'].SetOption(theme_name, 'name', 'value')
+        highpage[theme_name] = {'option': 'True'}
+
+        # Force custom theme.
+        d.theme_source.set(False)
+        d.custom_name.set(theme_name)
+
+        # Cancel deletion.
+        yesno.result = False
+        d.button_delete_custom.invoke()
+        eq(yesno.called, 1)
+        eq(highpage[theme_name], {'option': 'True'})
+        eq(idleConf.GetSectionList('user', 'highlight'), ['spam theme'])
+        eq(dialog.deactivate_current_config.called, 0)
+        eq(dialog.activate_config_changes.called, 0)
+        eq(d.set_theme_type.called, 0)
+
+        # Confirm deletion.
+        yesno.result = True
+        d.button_delete_custom.invoke()
+        eq(yesno.called, 2)
+        self.assertNotIn(theme_name, highpage)
+        eq(idleConf.GetSectionList('user', 'highlight'), [])
+        eq(d.custom_theme_on['state'], DISABLED)
+        eq(d.custom_name.get(), '- no custom themes -')
+        eq(dialog.deactivate_current_config.called, 1)
+        eq(dialog.activate_config_changes.called, 1)
+        eq(d.set_theme_type.called, 1)
+
+        del dialog.activate_config_changes, dialog.deactivate_current_config
+        del configdialog.tkMessageBox.askyesno
 
 
 class KeysPageTest(unittest.TestCase):
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-17-15-00-20.bpo-31001.KLxYHC.rst b/Misc/NEWS.d/next/IDLE/2017-08-17-15-00-20.bpo-31001.KLxYHC.rst
new file mode 100644
index 00000000000..5e1eeee0419
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-17-15-00-20.bpo-31001.KLxYHC.rst
@@ -0,0 +1 @@
+Add tests for configdialog highlight tab.  Patch by Cheryl Sabella.


From webhook-mailer at python.org  Thu Aug 17 22:29:23 2017
From: webhook-mailer at python.org (Nick Coghlan)
Date: Fri, 18 Aug 2017 02:29:23 -0000
Subject: [Python-checkins] bpo-31183: `dis` now handles coroutines & async
 generators (GH-3077)
Message-ID: <mailman.39.1503023366.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/fe2b56ab9212c1cf19c48b848fa60f7f201c366f
commit: fe2b56ab9212c1cf19c48b848fa60f7f201c366f
branch: master
author: syncosmic <gc at syncosmic.io>
committer: Nick Coghlan <ncoghlan at gmail.com>
date: 2017-08-18T12:29:21+10:00
summary:

bpo-31183: `dis` now handles coroutines & async generators (GH-3077)

Coroutines and async generators use a distinct attribute name for their
code objects, so this updates the `dis` module to correctly disassemble
objects with those attributes.

Due to the increase in the test module length, it also fixes some latent
defects in the tests related to how the displayed source line numbers
are extracted.

https://bugs.python.org/issue31230 is a follow-up issue suggesting we
may want to solve this a different way, by instead giving all these object
types a common `__code__` attribute, avoiding the need for special
casing in the `dis` module.

files:
A Misc/NEWS.d/next/Library/2017-08-13-09-17-01.bpo-31183.-2_YGj.rst
M Doc/library/dis.rst
M Lib/dis.py
M Lib/test/test_dis.py

diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index bc32380e976..7b7c84df776 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -53,8 +53,9 @@ code.
 .. class:: Bytecode(x, *, first_line=None, current_offset=None)
 
 
-   Analyse the bytecode corresponding to a function, generator, method, string
-   of source code, or a code object (as returned by :func:`compile`).
+   Analyse the bytecode corresponding to a function, generator, asynchronous
+   generator, coroutine, method, string of source code, or a code object (as
+   returned by :func:`compile`).
 
    This is a convenience wrapper around many of the functions listed below, most
    notably :func:`get_instructions`, as iterating over a :class:`Bytecode`
@@ -92,6 +93,9 @@ code.
       Return a formatted multi-line string with detailed information about the
       code object, like :func:`code_info`.
 
+   .. versionchanged:: 3.7
+      This can now handle coroutine and asynchronous generator objects.
+
 Example::
 
     >>> bytecode = dis.Bytecode(myfunc)
@@ -114,7 +118,8 @@ operation is being performed, so the intermediate analysis object isn't useful:
 .. function:: code_info(x)
 
    Return a formatted multi-line string with detailed code object information
-   for the supplied function, generator, method, source code string or code object.
+   for the supplied function, generator, asynchronous generator, coroutine,
+   method, source code string or code object.
 
    Note that the exact contents of code info strings are highly implementation
    dependent and they may change arbitrarily across Python VMs or Python
@@ -122,6 +127,9 @@ operation is being performed, so the intermediate analysis object isn't useful:
 
    .. versionadded:: 3.2
 
+   .. versionchanged:: 3.7
+      This can now handle coroutine and asynchronous generator objects.
+
 
 .. function:: show_code(x, *, file=None)
 
@@ -141,12 +149,13 @@ operation is being performed, so the intermediate analysis object isn't useful:
 .. function:: dis(x=None, *, file=None, depth=None)
 
    Disassemble the *x* object.  *x* can denote either a module, a class, a
-   method, a function, a generator, a code object, a string of source code or
-   a byte sequence of raw bytecode.  For a module, it disassembles all functions.
-   For a class, it disassembles all methods (including class and static methods).
-   For a code object or sequence of raw bytecode, it prints one line per bytecode
-   instruction.  It also recursively disassembles nested code objects (the code
-   of comprehensions, generator expressions and nested functions, and the code
+   method, a function, a generator, an asynchronous generator, a couroutine,
+   a code object, a string of source code or a byte sequence of raw bytecode.
+   For a module, it disassembles all functions. For a class, it disassembles
+   all methods (including class and static methods). For a code object or
+   sequence of raw bytecode, it prints one line per bytecode instruction.
+   It also recursively disassembles nested code objects (the code of
+   comprehensions, generator expressions and nested functions, and the code
    used for building nested classes).
    Strings are first compiled to code objects with the :func:`compile`
    built-in function before being disassembled.  If no object is provided, this
@@ -164,6 +173,9 @@ operation is being performed, so the intermediate analysis object isn't useful:
    .. versionchanged:: 3.7
       Implemented recursive disassembling and added *depth* parameter.
 
+   .. versionchanged:: 3.7
+      This can now handle coroutine and asynchronous generator objects.
+
 
 .. function:: distb(tb=None, *, file=None)
 
diff --git a/Lib/dis.py b/Lib/dis.py
index b990839bcbf..90ddf4f3360 100644
--- a/Lib/dis.py
+++ b/Lib/dis.py
@@ -32,20 +32,30 @@ def _try_compile(source, name):
     return c
 
 def dis(x=None, *, file=None, depth=None):
-    """Disassemble classes, methods, functions, generators, or code.
+    """Disassemble classes, methods, functions, and other compiled objects.
 
     With no argument, disassemble the last traceback.
 
+    Compiled objects currently include generator objects, async generator
+    objects, and coroutine objects, all of which store their code object
+    in a special attribute.
     """
     if x is None:
         distb(file=file)
         return
-    if hasattr(x, '__func__'):  # Method
+    # Extract functions from methods.
+    if hasattr(x, '__func__'):
         x = x.__func__
-    if hasattr(x, '__code__'):  # Function
+    # Extract compiled code objects from...
+    if hasattr(x, '__code__'):  # ...a function, or
         x = x.__code__
-    if hasattr(x, 'gi_code'):  # Generator
+    elif hasattr(x, 'gi_code'):  #...a generator object, or
         x = x.gi_code
+    elif hasattr(x, 'ag_code'):  #...an asynchronous generator object, or
+        x = x.ag_code
+    elif hasattr(x, 'cr_code'):  #...a coroutine.
+        x = x.cr_code
+    # Perform the disassembly.
     if hasattr(x, '__dict__'):  # Class or module
         items = sorted(x.__dict__.items())
         for name, x1 in items:
@@ -107,16 +117,24 @@ def pretty_flags(flags):
     return ", ".join(names)
 
 def _get_code_object(x):
-    """Helper to handle methods, functions, generators, strings and raw code objects"""
-    if hasattr(x, '__func__'): # Method
+    """Helper to handle methods, compiled or raw code objects, and strings."""
+    # Extract functions from methods.
+    if hasattr(x, '__func__'):
         x = x.__func__
-    if hasattr(x, '__code__'): # Function
+    # Extract compiled code objects from...
+    if hasattr(x, '__code__'):  # ...a function, or
         x = x.__code__
-    if hasattr(x, 'gi_code'):  # Generator
+    elif hasattr(x, 'gi_code'):  #...a generator object, or
         x = x.gi_code
-    if isinstance(x, str):     # Source code
+    elif hasattr(x, 'ag_code'):  #...an asynchronous generator object, or
+        x = x.ag_code
+    elif hasattr(x, 'cr_code'):  #...a coroutine.
+        x = x.cr_code
+    # Handle source code.
+    if isinstance(x, str):
         x = _try_compile(x, "<disassembly>")
-    if hasattr(x, 'co_code'):  # Code object
+    # By now, if we don't have a code object, we can't disassemble x.
+    if hasattr(x, 'co_code'):
         return x
     raise TypeError("don't know how to disassemble %s objects" %
                     type(x).__name__)
@@ -443,8 +461,8 @@ def findlinestarts(code):
 class Bytecode:
     """The bytecode operations of a piece of code
 
-    Instantiate this with a function, method, string of code, or a code object
-    (as returned by compile()).
+    Instantiate this with a function, method, other compiled object, string of
+    code, or a code object (as returned by compile()).
 
     Iterating over this yields the bytecode operations as Instruction instances.
     """
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 254b317e498..bfbbee2794a 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -331,6 +331,13 @@ def _fstring(a, b, c, d):
 def _g(x):
     yield x
 
+async def _ag(x):
+    yield x
+
+async def _co(x):
+    async for item in _ag(x):
+        pass
+
 def _h(y):
     def foo(x):
         '''funcdoc'''
@@ -390,6 +397,7 @@ def foo(x):
        _h.__code__.co_firstlineno + 3,
 )
 
+
 class DisTests(unittest.TestCase):
 
     maxDiff = None
@@ -531,10 +539,22 @@ def test_disassemble_class_method(self):
         self.do_disassembly_test(_C.cm, dis_c_class_method)
 
     def test_disassemble_generator(self):
-        gen_func_disas = self.get_disassembly(_g)  # Disassemble generator function
-        gen_disas = self.get_disassembly(_g(1))  # Disassemble generator itself
+        gen_func_disas = self.get_disassembly(_g)  # Generator function
+        gen_disas = self.get_disassembly(_g(1))  # Generator iterator
         self.assertEqual(gen_disas, gen_func_disas)
 
+    def test_disassemble_async_generator(self):
+        agen_func_disas = self.get_disassembly(_ag)  # Async generator function
+        agen_disas = self.get_disassembly(_ag(1))  # Async generator iterator
+        self.assertEqual(agen_disas, agen_func_disas)
+
+    def test_disassemble_coroutine(self):
+        coro_func_disas = self.get_disassembly(_co)  # Coroutine function
+        coro = _co(1)  # Coroutine object
+        coro.close()  # Avoid a RuntimeWarning (never awaited)
+        coro_disas = self.get_disassembly(coro)
+        self.assertEqual(coro_disas, coro_func_disas)
+
     def test_disassemble_fstring(self):
         self.do_disassembly_test(_fstring, dis_fstring)
 
@@ -1051,11 +1071,13 @@ def test_explicit_first_line(self):
 
     def test_source_line_in_disassembly(self):
         # Use the line in the source code
-        actual = dis.Bytecode(simple).dis()[:3]
-        expected = "{:>3}".format(simple.__code__.co_firstlineno)
+        actual = dis.Bytecode(simple).dis()
+        actual = actual.strip().partition(" ")[0]  # extract the line no
+        expected = str(simple.__code__.co_firstlineno)
         self.assertEqual(actual, expected)
         # Use an explicit first line number
-        actual = dis.Bytecode(simple, first_line=350).dis()[:3]
+        actual = dis.Bytecode(simple, first_line=350).dis()
+        actual = actual.strip().partition(" ")[0]  # extract the line no
         self.assertEqual(actual, "350")
 
     def test_info(self):
diff --git a/Misc/NEWS.d/next/Library/2017-08-13-09-17-01.bpo-31183.-2_YGj.rst b/Misc/NEWS.d/next/Library/2017-08-13-09-17-01.bpo-31183.-2_YGj.rst
new file mode 100644
index 00000000000..ef7a31a8d01
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-13-09-17-01.bpo-31183.-2_YGj.rst
@@ -0,0 +1,2 @@
+`dis` now works with asynchronous generator and coroutine objects. Patch by
+George Collins based on diagnosis by Luciano Ramalho.


From webhook-mailer at python.org  Thu Aug 17 23:23:55 2017
From: webhook-mailer at python.org (Mariatta)
Date: Fri, 18 Aug 2017 03:23:55 -0000
Subject: [Python-checkins] Fix broken `Show Source` links on documentation
 pages (GH-3113)
Message-ID: <mailman.40.1503026636.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/b9ff498793611d1c6a9b99df464812931a1e2d69
commit: b9ff498793611d1c6a9b99df464812931a1e2d69
branch: master
author: Elmar Ritsch <35851+elritsch at users.noreply.github.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-08-17T20:23:51-07:00
summary:

Fix broken `Show Source` links on documentation pages (GH-3113)

The `Show Source` was broken because of a change made in sphinx 1.5.1
In Sphinx 1.4.9, the sourcename was "index.txt".
In Sphinx 1.5.1+, it is now "index.rst.txt"

files:
M Doc/tools/templates/customsourcelink.html

diff --git a/Doc/tools/templates/customsourcelink.html b/Doc/tools/templates/customsourcelink.html
index 42172909cae..fca44e9163c 100644
--- a/Doc/tools/templates/customsourcelink.html
+++ b/Doc/tools/templates/customsourcelink.html
@@ -4,7 +4,7 @@
     <ul class="this-page-menu">
       <li><a href="{{ pathto('bugs') }}">{% trans %}Report a Bug{% endtrans %}</a></li>
       <li>
-        <a href="https://github.com/python/cpython/blob/master/Doc/{{ sourcename|replace('txt', 'rst') }}"
+        <a href="https://github.com/python/cpython/blob/master/Doc/{{ sourcename|replace('.rst.txt', '.rst') }}"
             rel="nofollow">{{ _('Show Source') }}
         </a>
       </li>


From solipsis at pitrou.net  Fri Aug 18 05:06:37 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 18 Aug 2017 09:06:37 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=9
Message-ID: <20170818090636.82306.0FB4870922B1AF67@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_asyncio leaked [0, 3, 0] memory blocks, sum=3
test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_forkserver leaked [-2, 2, 0] memory blocks, sum=0
test_multiprocessing_spawn leaked [2, -1, 1] memory blocks, sum=2


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogGB5ngd', '--timeout', '7200']

From webhook-mailer at python.org  Fri Aug 18 05:31:58 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 18 Aug 2017 09:31:58 -0000
Subject: [Python-checkins] bpo-30871: Add "make pythoninfo" (#3120)
Message-ID: <mailman.41.1503048722.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/a3a01a2fceab2188b282ab9911f79c99a4c32273
commit: a3a01a2fceab2188b282ab9911f79c99a4c32273
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-18T11:31:52+02:00
summary:

bpo-30871: Add "make pythoninfo" (#3120)

files:
M Makefile.pre.in

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 98934916578..57d2ab72ba9 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -999,6 +999,8 @@ TESTPYTHON=	$(RUNSHARED) ./$(BUILDPYTHON) $(TESTPYTHONOPTS)
 TESTRUNNER=	$(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py
 TESTTIMEOUT=	1200
 
+.PHONY: test testall testuniversal buildbottest pythoninfo
+
 # Run a basic set of regression tests.
 # This excludes some tests that are particularly resource-intensive.
 test:		@DEF_MAKE_RULE@ platform
@@ -1037,6 +1039,9 @@ buildbottest:	build_all platform
 		fi
 		$(TESTRUNNER) -j 1 -u all -W --slowest --fail-env-changed --timeout=$(TESTTIMEOUT) $(TESTOPTS)
 
+pythoninfo: build_all
+		$(RUNSHARED) ./$(BUILDPYTHON) -m test.pythoninfo
+
 QUICKTESTOPTS=	$(TESTOPTS) -x test_subprocess test_io test_lib2to3 \
 		test_multibytecodec test_urllib2_localnet test_itertools \
 		test_multiprocessing_fork test_multiprocessing_spawn \


From webhook-mailer at python.org  Fri Aug 18 06:08:50 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 18 Aug 2017 10:08:50 -0000
Subject: [Python-checkins] bpo-30871: pythoninfo: more sys, os,
 time data (#3130)
Message-ID: <mailman.42.1503050932.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/ad7eaed54382b346784e51a6f0122ce81e8842b5
commit: ad7eaed54382b346784e51a6f0122ce81e8842b5
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-18T12:08:47+02:00
summary:

bpo-30871: pythoninfo: more sys, os, time data (#3130)

* bpo-30871: pythoninfo: more sys, os, time data

PythonInfo now converts types other than intger to string by default.

* fix typo

files:
M Lib/test/pythoninfo.py

diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
index e0541135331..15cce34e822 100644
--- a/Lib/test/pythoninfo.py
+++ b/Lib/test/pythoninfo.py
@@ -23,14 +23,17 @@ def add(self, key, value):
         if key in self.info:
             raise ValueError("duplicate key: %r" % key)
 
-        if isinstance(value, str):
+        if value is None:
+            return
+
+        if not isinstance(value, int):
+            if not isinstance(value, str):
+                # convert other objects like sys.flags to string
+                value = str(value)
+
             value = value.strip()
             if not value:
                 return
-        elif value is None:
-            return
-        elif not isinstance(value, int):
-            raise TypeError("value type must be str, int or None")
 
         self.info[key] = value
 
@@ -52,25 +55,47 @@ def copy_attributes(info_add, obj, name_fmt, attributes, *, formatter=None):
         info_add(name, value)
 
 
-def collect_sys(info_add):
-    def format_attr(attr, value):
-        if attr == 'flags':
-            # convert sys.flags tuple to string
-            return str(value)
-        else:
-            return value
+def call_func(info_add, name, mod, func_name, *, formatter=None):
+    try:
+        func = getattr(mod, func_name)
+    except AttributeError:
+        return
+    value = func()
+    if formatter is not None:
+        value = formatter(value)
+    info_add(name, value)
 
+
+def collect_sys(info_add):
     attributes = (
         '_framework',
+        'abiflags',
+        'api_version',
+        'builtin_module_names',
         'byteorder',
+        'dont_write_bytecode',
         'executable',
         'flags',
+        'float_info',
+        'float_repr_style',
+        'hash_info',
+        'hexversion',
+        'implementation',
+        'int_info',
         'maxsize',
         'maxunicode',
+        'path',
+        'platform',
+        'prefix',
+        'thread_info',
         'version',
+        'version_info',
+        'winver',
     )
-    copy_attributes(info_add, sys, 'sys.%s', attributes,
-                    formatter=format_attr)
+    copy_attributes(info_add, sys, 'sys.%s', attributes)
+
+    call_func(info_add, 'sys.androidapilevel', sys, 'getandroidapilevel')
+    call_func(info_add, 'sys.windowsversion', sys, 'getwindowsversion')
 
     encoding = sys.getfilesystemencoding()
     if hasattr(sys, 'getfilesystemencodeerrors'):
@@ -89,15 +114,6 @@ def format_attr(attr, value):
             encoding = '%s/%s' % (encoding, errors)
         info_add('sys.%s.encoding' % name, encoding)
 
-    if hasattr(sys, 'hash_info'):
-        alg = sys.hash_info.algorithm
-        bits = 64 if sys.maxsize > 2**32 else 32
-        alg = '%s (%s bits)' % (alg, bits)
-        info_add('sys.hash_info', alg)
-
-    if hasattr(sys, 'getandroidapilevel'):
-        info_add('sys.androidapilevel', sys.getandroidapilevel())
-
 
 def collect_platform(info_add):
     import platform
@@ -121,20 +137,27 @@ def collect_locale(info_add):
 def collect_os(info_add):
     import os
 
-    if hasattr(os, 'getrandom'):
-        # PEP 524: Check is system urandom is initialized
-        try:
-            os.getrandom(1, os.GRND_NONBLOCK)
-            state = 'ready (initialized)'
-        except BlockingIOError as exc:
-            state = 'not seeded yet (%s)' % exc
-        info_add('os.getrandom', state)
+    def format_attr(attr, value):
+        if attr in ('supports_follow_symlinks', 'supports_fd',
+                    'supports_effective_ids'):
+            return str(sorted(func.__name__ for func in value))
+        else:
+            return value
+
+    attributes = (
+        'name',
+        'supports_bytes_environ',
+        'supports_effective_ids',
+        'supports_fd',
+        'supports_follow_symlinks',
+    )
+    copy_attributes(info_add, os, 'os.%s', attributes, formatter=format_attr)
 
     info_add("os.cwd", os.getcwd())
 
-    if hasattr(os, 'getuid'):
-        info_add("os.uid", os.getuid())
-        info_add("os.gid", os.getgid())
+    call_func(info_add, 'os.uid', os, 'getuid')
+    call_func(info_add, 'os.gid', os, 'getgid')
+    call_func(info_add, 'os.uname', os, 'uname')
 
     if hasattr(os, 'getgroups'):
         groups = os.getgroups()
@@ -157,9 +180,7 @@ def collect_os(info_add):
         if cpu_count:
             info_add('os.cpu_count', cpu_count)
 
-    if hasattr(os, 'getloadavg'):
-        load = os.getloadavg()
-        info_add('os.loadavg', str(load))
+    call_func(info_add, 'os.loadavg', os, 'getloadavg')
 
     # Get environment variables: filter to list
     # to not leak sensitive information
@@ -194,6 +215,20 @@ def collect_os(info_add):
            or (uname.startswith("VS") and uname.endswith("COMNTOOLS"))):
             info_add('os.environ[%s]' % name, value)
 
+    if hasattr(os, 'umask'):
+        mask = os.umask(0)
+        os.umask(mask)
+        info_add("os.umask", '%03o' % mask)
+
+    if hasattr(os, 'getrandom'):
+        # PEP 524: Check if system urandom is initialized
+        try:
+            os.getrandom(1, os.GRND_NONBLOCK)
+            state = 'ready (initialized)'
+        except BlockingIOError as exc:
+            state = 'not seeded yet (%s)' % exc
+        info_add('os.getrandom', state)
+
 
 def collect_readline(info_add):
     try:
@@ -255,12 +290,20 @@ def collect_tkinter(info_add):
 def collect_time(info_add):
     import time
 
+    attributes = (
+        'altzone',
+        'daylight',
+        'timezone',
+        'tzname',
+    )
+    copy_attributes(info_add, time, 'time.%s', attributes)
+
     if not hasattr(time, 'get_clock_info'):
         return
 
     for clock in ('time', 'perf_counter'):
         tinfo = time.get_clock_info(clock)
-        info_add('time.%s' % clock, str(tinfo))
+        info_add('time.%s' % clock, tinfo)
 
 
 def collect_sysconfig(info_add):
@@ -305,8 +348,7 @@ def format_attr(attr, value):
         if attr.startswith('OP_'):
             return '%#8x' % value
         else:
-            # Convert OPENSSL_VERSION_INFO tuple to str
-            return str(value)
+            return value
 
     attributes = (
         'OPENSSL_VERSION',


From webhook-mailer at python.org  Fri Aug 18 06:37:39 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Fri, 18 Aug 2017 10:37:39 -0000
Subject: [Python-checkins] bpo-30721: Show correct syntax hint in Py3 when
 using Py2 redirection syntax (#2345)
Message-ID: <mailman.43.1503052661.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/5e2eb35bbed3e84079165e576cdb50ef36e13493
commit: 5e2eb35bbed3e84079165e576cdb50ef36e13493
branch: master
author: Sanyam Khurana <sanyam at sanyamkhurana.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-18T13:37:36+03:00
summary:

bpo-30721: Show correct syntax hint in Py3 when using Py2 redirection syntax (#2345)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-08-18-15-15-20.bpo-30721.Hmc56z.rst
M Lib/test/test_print.py
M Objects/abstract.c

diff --git a/Lib/test/test_print.py b/Lib/test/test_print.py
index 03f13b4edfc..80993279b8d 100644
--- a/Lib/test/test_print.py
+++ b/Lib/test/test_print.py
@@ -1,4 +1,5 @@
 import unittest
+import sys
 from io import StringIO
 
 from test import support
@@ -155,6 +156,38 @@ def test_string_with_excessive_whitespace(self):
 
         self.assertIn('print("Hello World", end=" ")', str(context.exception))
 
+    def test_stream_redirection_hint_for_py2_migration(self):
+        # Test correct hint produced for Py2 redirection syntax
+        with self.assertRaises(TypeError) as context:
+            print >> sys.stderr, "message"
+        self.assertIn('Did you mean "print(<message>, '
+                'file=<output_stream>)', str(context.exception))
+
+        # Test correct hint is produced in the case where RHS implements
+        # __rrshift__ but returns NotImplemented
+        with self.assertRaises(TypeError) as context:
+            print >> 42
+        self.assertIn('Did you mean "print(<message>, '
+                'file=<output_stream>)', str(context.exception))
+
+        # Test stream redirection hint is specific to print
+        with self.assertRaises(TypeError) as context:
+            max >> sys.stderr
+        self.assertNotIn('Did you mean ', str(context.exception))
+
+        # Test stream redirection hint is specific to rshift
+        with self.assertRaises(TypeError) as context:
+            print << sys.stderr
+        self.assertNotIn('Did you mean', str(context.exception))
+
+        # Ensure right operand implementing rrshift still works
+        class OverrideRRShift:
+            def __rrshift__(self, lhs):
+                return 42 # Force result independent of LHS
+
+        self.assertEqual(print >> OverrideRRShift(), 42)
+
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-18-15-15-20.bpo-30721.Hmc56z.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-18-15-15-20.bpo-30721.Hmc56z.rst
new file mode 100644
index 00000000000..da553d654ec
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-18-15-15-20.bpo-30721.Hmc56z.rst	
@@ -0,0 +1,2 @@
+``print`` now shows correct usage hint for using Python 2 redirection
+syntax.  Patch by Sanyam Khurana.
diff --git a/Objects/abstract.c b/Objects/abstract.c
index cb026c0df5d..abd97953bd9 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -819,6 +819,21 @@ binary_op(PyObject *v, PyObject *w, const int op_slot, const char *op_name)
     PyObject *result = binary_op1(v, w, op_slot);
     if (result == Py_NotImplemented) {
         Py_DECREF(result);
+
+        if (op_slot == NB_SLOT(nb_rshift) &&
+            PyCFunction_Check(v) &&
+            strcmp(((PyCFunctionObject *)v)->m_ml->ml_name, "print") == 0)
+        {
+            PyErr_Format(PyExc_TypeError,
+                "unsupported operand type(s) for %.100s: "
+                "'%.100s' and '%.100s'. Did you mean \"print(<message>, "
+                "file=<output_stream>)\"",
+                op_name,
+                v->ob_type->tp_name,
+                w->ob_type->tp_name);
+            return NULL;
+        }
+
         return binop_type_error(v, w, op_name);
     }
     return result;


From webhook-mailer at python.org  Fri Aug 18 07:55:48 2017
From: webhook-mailer at python.org (Stefan Krah)
Date: Fri, 18 Aug 2017 11:55:48 -0000
Subject: [Python-checkins] Issue #30923: Revert flag that is not recognized
 by an obsolete gcc version. (#3132)
Message-ID: <mailman.44.1503057349.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/f0202bb349986ff264d06b15058dcde4062b7b7a
commit: f0202bb349986ff264d06b15058dcde4062b7b7a
branch: master
author: Stefan Krah <skrah at bytereef.org>
committer: GitHub <noreply at github.com>
date: 2017-08-18T13:55:45+02:00
summary:

Issue #30923: Revert flag that is not recognized by an obsolete gcc version. (#3132)

files:
M setup.py

diff --git a/setup.py b/setup.py
index 4f0f522bf8f..41aad8210d8 100644
--- a/setup.py
+++ b/setup.py
@@ -2119,9 +2119,6 @@ def _decimal_ext(self):
         else:
             raise DistutilsError("_decimal: unsupported architecture")
 
-        if 'gcc' in cc: # Suppressing the warnings in the source is too verbose.
-            extra_compile_args.append('-Wno-implicit-fallthrough')
-
         # Workarounds for toolchain bugs:
         if sysconfig.get_config_var('HAVE_IPA_PURE_CONST_BUG'):
             # Some versions of gcc miscompile inline asm:


From webhook-mailer at python.org  Fri Aug 18 08:18:17 2017
From: webhook-mailer at python.org (Nick Coghlan)
Date: Fri, 18 Aug 2017 12:18:17 -0000
Subject: [Python-checkins] bpo-30721: Add missing '?' to new error message
 (GH-3131)
Message-ID: <mailman.45.1503058699.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/a7c449b8c08933deabcf329fb74ed1336f6db34f
commit: a7c449b8c08933deabcf329fb74ed1336f6db34f
branch: master
author: Sanyam Khurana <sanyam at sanyamkhurana.com>
committer: Nick Coghlan <ncoghlan at gmail.com>
date: 2017-08-18T22:18:14+10:00
summary:

bpo-30721: Add missing '?' to new error message (GH-3131)

files:
M Lib/test/test_print.py
M Objects/abstract.c

diff --git a/Lib/test/test_print.py b/Lib/test/test_print.py
index 80993279b8d..e6434feaf5e 100644
--- a/Lib/test/test_print.py
+++ b/Lib/test/test_print.py
@@ -161,14 +161,14 @@ def test_stream_redirection_hint_for_py2_migration(self):
         with self.assertRaises(TypeError) as context:
             print >> sys.stderr, "message"
         self.assertIn('Did you mean "print(<message>, '
-                'file=<output_stream>)', str(context.exception))
+                'file=<output_stream>)"?', str(context.exception))
 
         # Test correct hint is produced in the case where RHS implements
         # __rrshift__ but returns NotImplemented
         with self.assertRaises(TypeError) as context:
             print >> 42
         self.assertIn('Did you mean "print(<message>, '
-                'file=<output_stream>)', str(context.exception))
+                'file=<output_stream>)"?', str(context.exception))
 
         # Test stream redirection hint is specific to print
         with self.assertRaises(TypeError) as context:
diff --git a/Objects/abstract.c b/Objects/abstract.c
index abd97953bd9..66ac0e3ea73 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -827,7 +827,7 @@ binary_op(PyObject *v, PyObject *w, const int op_slot, const char *op_name)
             PyErr_Format(PyExc_TypeError,
                 "unsupported operand type(s) for %.100s: "
                 "'%.100s' and '%.100s'. Did you mean \"print(<message>, "
-                "file=<output_stream>)\"",
+                "file=<output_stream>)\"?",
                 op_name,
                 v->ob_type->tp_name,
                 w->ob_type->tp_name);


From webhook-mailer at python.org  Fri Aug 18 09:18:18 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 18 Aug 2017 13:18:18 -0000
Subject: [Python-checkins] bpo-30121: Fix debug assert in subprocess on
 Windows (#1224)
Message-ID: <mailman.46.1503062300.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/4d3851727fb82195e4995c6064b0b2d6cbc031c4
commit: 4d3851727fb82195e4995c6064b0b2d6cbc031c4
branch: master
author: Segev Finer <segev208 at gmail.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-08-18T15:18:13+02:00
summary:

bpo-30121: Fix debug assert in subprocess on Windows (#1224)

* bpo-30121: Fix debug assert in subprocess on Windows

This is caused by closing HANDLEs using os.close which is for CRT file
descriptors and not for HANDLEs.

* bpo-30121: Suppress debug assertion in test_subprocess when ran directly

files:
M Lib/subprocess.py
M Lib/test/test_subprocess.py

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 99bca477cec..2805ec3fa37 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -727,7 +727,10 @@ def __init__(self, args, bufsize=-1, executable=None,
                     to_close.append(self._devnull)
                 for fd in to_close:
                     try:
-                        os.close(fd)
+                        if _mswindows and isinstance(fd, Handle):
+                            fd.Close()
+                        else:
+                            os.close(fd)
                     except OSError:
                         pass
 
@@ -1007,6 +1010,9 @@ def _execute_child(self, args, executable, preexec_fn, close_fds,
                     errwrite.Close()
                 if hasattr(self, '_devnull'):
                     os.close(self._devnull)
+                # Prevent a double close of these handles/fds from __init__
+                # on error.
+                self._closed_child_pipe_fds = True
 
             # Retain the process handle, but close the thread handle
             self._child_created = True
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 1d2d15c7a24..8cda1e81c80 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1116,10 +1116,11 @@ def _test_bufsize_equal_one(self, line, expected, universal_newlines):
             p.stdin.write(line) # expect that it flushes the line in text mode
             os.close(p.stdin.fileno()) # close it without flushing the buffer
             read_line = p.stdout.readline()
-            try:
-                p.stdin.close()
-            except OSError:
-                pass
+            with support.SuppressCrashReport():
+                try:
+                    p.stdin.close()
+                except OSError:
+                    pass
             p.stdin = None
         self.assertEqual(p.returncode, 0)
         self.assertEqual(read_line, expected)


From webhook-mailer at python.org  Fri Aug 18 09:21:35 2017
From: webhook-mailer at python.org (Mariatta)
Date: Fri, 18 Aug 2017 13:21:35 -0000
Subject: [Python-checkins] Fix broken `Show Source` links on documentation
 pages (GH-3113) (GH-3125)
Message-ID: <mailman.47.1503062497.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/ff64a24c67fcd20bef9305db306b5026990d412b
commit: ff64a24c67fcd20bef9305db306b5026990d412b
branch: 3.6
author: Mariatta <Mariatta at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-08-18T06:21:33-07:00
summary:

Fix broken `Show Source` links on documentation pages (GH-3113) (GH-3125)

The `Show Source` was broken because of a change made in sphinx 1.5.1
In Sphinx 1.4.9, the sourcename was "index.txt".
In Sphinx 1.5.1+, it is now "index.rst.txt".
(cherry picked from commit b9ff498793611d1c6a9b99df464812931a1e2d69)

files:
M Doc/tools/templates/customsourcelink.html

diff --git a/Doc/tools/templates/customsourcelink.html b/Doc/tools/templates/customsourcelink.html
index 71d0bba6830..21af621efce 100644
--- a/Doc/tools/templates/customsourcelink.html
+++ b/Doc/tools/templates/customsourcelink.html
@@ -4,7 +4,7 @@
     <ul class="this-page-menu">
       <li><a href="{{ pathto('bugs') }}">{% trans %}Report a Bug{% endtrans %}</a></li>
       <li>
-        <a href="https://github.com/python/cpython/blob/{{ version }}/Doc/{{ sourcename|replace('txt', 'rst') }}"
+        <a href="https://github.com/python/cpython/blob/{{ version }}/Doc/{{ sourcename|replace('.rst.txt', '.rst') }}"
             rel="nofollow">{{ _('Show Source') }}
         </a>
       </li>


From webhook-mailer at python.org  Fri Aug 18 09:22:41 2017
From: webhook-mailer at python.org (Mariatta)
Date: Fri, 18 Aug 2017 13:22:41 -0000
Subject: [Python-checkins] Fix broken `Show Source` links on documentation
 pages (GH-3113) (GH-3128)
Message-ID: <mailman.48.1503062562.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/2281c041b24308811f781935a6c6848d55f24311
commit: 2281c041b24308811f781935a6c6848d55f24311
branch: 2.7
author: Mariatta <Mariatta at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-08-18T06:22:32-07:00
summary:

Fix broken `Show Source` links on documentation pages (GH-3113) (GH-3128)

The `Show Source` was broken because of a change made in sphinx 1.5.1
In Sphinx 1.4.9, the sourcename was "index.txt".
In Sphinx 1.5.1+, it is now "index.rst.txt".

(cherry picked from commit b9ff498793611d1c6a9b99df464812931a1e2d69)

files:
M Doc/tools/templates/layout.html

diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html
index cc16ae446ff..8d6d3e5bd11 100644
--- a/Doc/tools/templates/layout.html
+++ b/Doc/tools/templates/layout.html
@@ -46,7 +46,7 @@
 <h3>{{ _('This Page') }}</h3>
 <ul class="this-page-menu">
   <li><a href="{{ pathto('bugs') }}">{% trans %}Report a Bug{% endtrans %}</a></li>
-  <li><a href="https://github.com/python/cpython/blob/{{ version }}/Doc/{{ sourcename|replace('txt', 'rst') }}"
+  <li><a href="https://github.com/python/cpython/blob/{{ version }}/Doc/{{ sourcename|replace('.rst.txt', '.rst') }}"
          rel="nofollow">{% trans %}Show Source{% endtrans %}</a>
   </li>
 </ul>


From webhook-mailer at python.org  Fri Aug 18 11:30:55 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 18 Aug 2017 15:30:55 -0000
Subject: [Python-checkins] bpo-31231: Fix pythoninfo in Travis config (#3134)
Message-ID: <mailman.49.1503070259.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/92b1f90143286385c0ff5be98d3721b90580a912
commit: 92b1f90143286385c0ff5be98d3721b90580a912
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-18T17:30:51+02:00
summary:

bpo-31231: Fix pythoninfo in Travis config (#3134)

bpo-31231, bpo-30871: Replace "./python -m test.pythoninfo" with
"make pythoninfo", since macOS uses ./python.exe.

files:
M .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 4c431241680..f6e9057e28d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,7 +88,7 @@ before_script:
         echo "$changes"
         exit 1
       fi
-      ./python -m test.pythoninfo
+      make pythoninfo
 
 script:
   # Using the built Python as patchcheck.py is built around the idea of using


From webhook-mailer at python.org  Fri Aug 18 13:00:34 2017
From: webhook-mailer at python.org (Brett Cannon)
Date: Fri, 18 Aug 2017 17:00:34 -0000
Subject: [Python-checkins] Fix a minor grammar issue in the logging cookbook
 (GH-3136)
Message-ID: <mailman.50.1503075635.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/a3110a0133db6d2a5308700d68f57a7bbcfd4c30
commit: a3110a0133db6d2a5308700d68f57a7bbcfd4c30
branch: master
author: Brett Cannon <brettcannon at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-08-18T10:00:31-07:00
summary:

Fix a minor grammar issue in the logging cookbook (GH-3136)

files:
M Doc/howto/logging-cookbook.rst

diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index 6498ea56957..24cf76b8ba4 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -1055,7 +1055,7 @@ to indicate additional contextual information to be added to the log). So
 you cannot directly make logging calls using :meth:`str.format` or
 :class:`string.Template` syntax, because internally the logging package
 uses %-formatting to merge the format string and the variable arguments.
-There would no changing this while preserving backward compatibility, since
+There would be no changing this while preserving backward compatibility, since
 all logging calls which are out there in existing code will be using %-format
 strings.
 


From lp_benchmark_robot at intel.com  Fri Aug 18 14:16:02 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Fri, 18 Aug 2017 11:16:02 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-18
Message-ID: <d99fa205-555d-4685-a9b1-6e8ee9a8c804@orsmsx151.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-18 03:04:03-07:00.
  - commit:		a3a01a2
  - previous commit:	ee84a60
  - revision date:	2017-08-18 11:31:52+02:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.207% |  -0.059%   |  +4.061%   |  +8.219%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 2.232% |  +0.629%   |  +20.835%  |  +10.529%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 2.391% |  -0.224%   |  +23.649%  |  +7.481%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.498% |  +0.138%   |  +21.079%  |  +7.175%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.646% |  -0.390%   |  +1.928%   |  +15.335%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.323% |  +0.155%   |  +11.686%  |  +9.373%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 1.547% |  -0.483%   |  +5.768%   |  +11.791%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.530% |  -0.028%   |  +4.486%   |  +4.822%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.103% |  -0.101%   |  +5.922%   |  +19.353%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.419% |  +0.252%   |  +8.795%   |  +15.835%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.465% |  +0.071%   |  +4.776%   |  +6.114%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.496% |  -0.050%   |  +4.442%   |  +4.362%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.584% |  -0.038%   |  +3.150%   |  +6.909%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.627% |  +0.214%   |  +8.890%   |  +10.063%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.289% |  -0.523%   |  +7.519%   |  +8.801%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.784% |  +0.201%   |  +6.342%   |  +10.954%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 1.303% |  -0.377%   |  +8.802%   |  +11.731%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.417% |  +0.328%   |  +8.211%   |  +10.496%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 2.645% |  -0.118%   |  +4.154%   |  +9.960%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 1.331% |  +0.312%   |  +3.136%   |  +10.087%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.853% |  -0.969%   |  +8.063%   |  +11.832%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 3.155% |  -0.046%   |  +46.778%  |  +11.239%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.965% |  -0.716%   |  +9.038%   |  +12.497%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.595% |  -0.101%   |  +18.768%  |  +10.676%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 6.250% |  -1.086%   |  +5.154%   |  +14.305%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.278% |  +0.182%   |  +3.694%   |  +4.724%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.396% |  +0.109%   |  -1.994%   |  +2.189%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.964% |  -0.074%   |  +2.713%   |  +6.658%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.812% |  -0.096%   |  +4.895%   |  +8.628%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.042% |  +0.878%   |  +1.331%   |  +22.468%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.462% |  +0.024%   |  +2.564%   |  +15.808%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.829% |  -0.015%   |  +5.600%   |  +16.694%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.597% |  +2.002%   |  +12.192%  |  +9.234%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.066% |  +0.011%   |  +0.322%   |  +9.999%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.137% |  -0.091%   |  +8.937%   |  +4.755%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.095% |  +0.036%   |  +1.068%   |  +4.358%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.194% |  -0.371%   |  +8.992%   |  +13.462%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.699% |  +0.833%   |  -11.589%  |  +13.776%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.632% |  +0.052%   |  +1.542%   |  +9.376%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.006% |  -0.106%   |  +0.426%   |  +1.203%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 0.788% |  -0.170%   |  +11.621%  |  +3.634%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.293% |  +0.240%   |  +8.025%   |  +14.607%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 1.060% |  -0.628%   |  -0.027%   |  +2.182%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 2.018% |  +0.502%   |  +26.893%  |  +8.027%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.609% |  -0.396%   |  +2.552%   |  +8.189%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.946% |  -0.507%   |  +12.687%  |  +10.436%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 1.391% |  +0.820%   |  +0.470%   |  -3.308%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.343% |  +0.097%   |  +5.747%   |  +1.955%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.861% |  +1.090%   |  +6.520%   |  +7.745%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.641% |  +0.986%   |  +6.390%   |  +5.319%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.373% |  -2.146%   |  +2.257%   |  +9.919%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.083% |  +0.520%   |  +12.784%  |  +8.094%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.690% |  -0.025%   |  +10.286%  |  +6.802%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.325% |  -0.581%   |  +11.624%  |  +9.946%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.404% |  +0.790%   |  +14.083%  |  +9.931%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 3.036% |  +0.392%   |  +23.838%  |  +6.918%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.215% |  +0.091%   |  +6.144%   |  +6.371%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.365% |  +0.335%   |  +0.719%   |  +2.764%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle|10.062% |  -1.493%   |  +6.045%   |  +22.676%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 1.056% |  -0.162%   |  -2.939%   |  +18.891%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 1.191% |  +0.351%   |  +7.324%   |  +5.696%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.095% |  +0.355%   |  +6.036%   |  +7.572%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.324% |  -0.452%   |  +2.155%   |  +5.810%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 1.309% |  -0.115%   |  -5.283%   |  +11.921%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.387% |  -0.271%   |  +6.329%   |  +8.285%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-18

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Fri Aug 18 14:41:17 2017
From: webhook-mailer at python.org (Brett Cannon)
Date: Fri, 18 Aug 2017 18:41:17 -0000
Subject: [Python-checkins] bpo-31109: Convert zipimport to use Argument
 Clinic (GH-2990)
Message-ID: <mailman.51.1503081681.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/02f3b7d5ab2206d256879e5a8a34f560218ed397
commit: 02f3b7d5ab2206d256879e5a8a34f560218ed397
branch: master
author: Yaron de Leeuw <me at jarondl.net>
committer: Brett Cannon <brettcannon at users.noreply.github.com>
date: 2017-08-18T11:41:13-07:00
summary:

bpo-31109: Convert zipimport to use Argument Clinic (GH-2990)

files:
A Misc/NEWS.d/next/Library/2017-08-17-20-29-45.bpo-31109.7qtC64.rst
A Modules/clinic/zipimport.c.h
M Misc/ACKS
M Modules/zipimport.c

diff --git a/Misc/ACKS b/Misc/ACKS
index 6fc41b36b59..21fc6bbbd3a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -889,6 +889,7 @@ James Lee
 John J. Lee
 Thomas Lee
 Cooper Ry Lees
+Yaron de Leeuw
 Tennessee Leeuwenburg
 Luc Lefebvre
 Pierre Paul Lefebvre
diff --git a/Misc/NEWS.d/next/Library/2017-08-17-20-29-45.bpo-31109.7qtC64.rst b/Misc/NEWS.d/next/Library/2017-08-17-20-29-45.bpo-31109.7qtC64.rst
new file mode 100644
index 00000000000..f023cbc80eb
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-17-20-29-45.bpo-31109.7qtC64.rst
@@ -0,0 +1 @@
+Convert zipimport to use Argument Clinic.
diff --git a/Modules/clinic/zipimport.c.h b/Modules/clinic/zipimport.c.h
new file mode 100644
index 00000000000..b24838d73b7
--- /dev/null
+++ b/Modules/clinic/zipimport.c.h
@@ -0,0 +1,294 @@
+/*[clinic input]
+preserve
+[clinic start generated code]*/
+
+PyDoc_STRVAR(zipimport_zipimporter___init____doc__,
+"zipimporter(archivepath, /)\n"
+"--\n"
+"\n"
+"Create a new zipimporter instance.\n"
+"\n"
+"  archivepath\n"
+"    A path-like object to a zipfile, or to a specific path inside\n"
+"    a zipfile.\n"
+"\n"
+"\'archivepath\' must be a path-like object to a zipfile, or to a specific path\n"
+"inside a zipfile. For example, it can be \'/tmp/myimport.zip\', or\n"
+"\'/tmp/myimport.zip/mydirectory\', if mydirectory is a valid directory inside\n"
+"the archive.\n"
+"\n"
+"\'ZipImportError\' is raised if \'archivepath\' doesn\'t point to a valid Zip\n"
+"archive.\n"
+"\n"
+"The \'archive\' attribute of the zipimporter object contains the name of the\n"
+"zipfile targeted.");
+
+static int
+zipimport_zipimporter___init___impl(ZipImporter *self, PyObject *path);
+
+static int
+zipimport_zipimporter___init__(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+    int return_value = -1;
+    PyObject *path;
+
+    if ((Py_TYPE(self) == &ZipImporter_Type) &&
+        !_PyArg_NoKeywords("zipimporter", kwargs)) {
+        goto exit;
+    }
+    if (!PyArg_ParseTuple(args, "O&:zipimporter",
+        PyUnicode_FSDecoder, &path)) {
+        goto exit;
+    }
+    return_value = zipimport_zipimporter___init___impl((ZipImporter *)self, path);
+
+exit:
+    return return_value;
+}
+
+PyDoc_STRVAR(zipimport_zipimporter_find_module__doc__,
+"find_module($self, fullname, path=None, /)\n"
+"--\n"
+"\n"
+"Search for a module specified by \'fullname\'.\n"
+"\n"
+"\'fullname\' must be the fully qualified (dotted) module name. It returns the\n"
+"zipimporter instance itself if the module was found, or None if it wasn\'t.\n"
+"The optional \'path\' argument is ignored -- it\'s there for compatibility\n"
+"with the importer protocol.");
+
+#define ZIPIMPORT_ZIPIMPORTER_FIND_MODULE_METHODDEF    \
+    {"find_module", (PyCFunction)zipimport_zipimporter_find_module, METH_FASTCALL, zipimport_zipimporter_find_module__doc__},
+
+static PyObject *
+zipimport_zipimporter_find_module_impl(ZipImporter *self, PyObject *fullname,
+                                       PyObject *path);
+
+static PyObject *
+zipimport_zipimporter_find_module(ZipImporter *self, PyObject **args, Py_ssize_t nargs)
+{
+    PyObject *return_value = NULL;
+    PyObject *fullname;
+    PyObject *path = Py_None;
+
+    if (!_PyArg_ParseStack(args, nargs, "U|O:find_module",
+        &fullname, &path)) {
+        goto exit;
+    }
+    return_value = zipimport_zipimporter_find_module_impl(self, fullname, path);
+
+exit:
+    return return_value;
+}
+
+PyDoc_STRVAR(zipimport_zipimporter_find_loader__doc__,
+"find_loader($self, fullname, path=None, /)\n"
+"--\n"
+"\n"
+"Search for a module specified by \'fullname\'.\n"
+"\n"
+"\'fullname\' must be the fully qualified (dotted) module name. It returns the\n"
+"zipimporter instance itself if the module was found, a string containing the\n"
+"full path name if it\'s possibly a portion of a namespace package,\n"
+"or None otherwise. The optional \'path\' argument is ignored -- it\'s\n"
+"there for compatibility with the importer protocol.");
+
+#define ZIPIMPORT_ZIPIMPORTER_FIND_LOADER_METHODDEF    \
+    {"find_loader", (PyCFunction)zipimport_zipimporter_find_loader, METH_FASTCALL, zipimport_zipimporter_find_loader__doc__},
+
+static PyObject *
+zipimport_zipimporter_find_loader_impl(ZipImporter *self, PyObject *fullname,
+                                       PyObject *path);
+
+static PyObject *
+zipimport_zipimporter_find_loader(ZipImporter *self, PyObject **args, Py_ssize_t nargs)
+{
+    PyObject *return_value = NULL;
+    PyObject *fullname;
+    PyObject *path = Py_None;
+
+    if (!_PyArg_ParseStack(args, nargs, "U|O:find_loader",
+        &fullname, &path)) {
+        goto exit;
+    }
+    return_value = zipimport_zipimporter_find_loader_impl(self, fullname, path);
+
+exit:
+    return return_value;
+}
+
+PyDoc_STRVAR(zipimport_zipimporter_load_module__doc__,
+"load_module($self, fullname, /)\n"
+"--\n"
+"\n"
+"Load the module specified by \'fullname\'.\n"
+"\n"
+"\'fullname\' must be the fully qualified (dotted) module name. It returns the\n"
+"imported module, or raises ZipImportError if it wasn\'t found.");
+
+#define ZIPIMPORT_ZIPIMPORTER_LOAD_MODULE_METHODDEF    \
+    {"load_module", (PyCFunction)zipimport_zipimporter_load_module, METH_O, zipimport_zipimporter_load_module__doc__},
+
+static PyObject *
+zipimport_zipimporter_load_module_impl(ZipImporter *self, PyObject *fullname);
+
+static PyObject *
+zipimport_zipimporter_load_module(ZipImporter *self, PyObject *arg)
+{
+    PyObject *return_value = NULL;
+    PyObject *fullname;
+
+    if (!PyArg_Parse(arg, "U:load_module", &fullname)) {
+        goto exit;
+    }
+    return_value = zipimport_zipimporter_load_module_impl(self, fullname);
+
+exit:
+    return return_value;
+}
+
+PyDoc_STRVAR(zipimport_zipimporter_get_filename__doc__,
+"get_filename($self, fullname, /)\n"
+"--\n"
+"\n"
+"Return the filename for the specified module.");
+
+#define ZIPIMPORT_ZIPIMPORTER_GET_FILENAME_METHODDEF    \
+    {"get_filename", (PyCFunction)zipimport_zipimporter_get_filename, METH_O, zipimport_zipimporter_get_filename__doc__},
+
+static PyObject *
+zipimport_zipimporter_get_filename_impl(ZipImporter *self,
+                                        PyObject *fullname);
+
+static PyObject *
+zipimport_zipimporter_get_filename(ZipImporter *self, PyObject *arg)
+{
+    PyObject *return_value = NULL;
+    PyObject *fullname;
+
+    if (!PyArg_Parse(arg, "U:get_filename", &fullname)) {
+        goto exit;
+    }
+    return_value = zipimport_zipimporter_get_filename_impl(self, fullname);
+
+exit:
+    return return_value;
+}
+
+PyDoc_STRVAR(zipimport_zipimporter_is_package__doc__,
+"is_package($self, fullname, /)\n"
+"--\n"
+"\n"
+"Return True if the module specified by fullname is a package.\n"
+"\n"
+"Raise ZipImportError if the module couldn\'t be found.");
+
+#define ZIPIMPORT_ZIPIMPORTER_IS_PACKAGE_METHODDEF    \
+    {"is_package", (PyCFunction)zipimport_zipimporter_is_package, METH_O, zipimport_zipimporter_is_package__doc__},
+
+static PyObject *
+zipimport_zipimporter_is_package_impl(ZipImporter *self, PyObject *fullname);
+
+static PyObject *
+zipimport_zipimporter_is_package(ZipImporter *self, PyObject *arg)
+{
+    PyObject *return_value = NULL;
+    PyObject *fullname;
+
+    if (!PyArg_Parse(arg, "U:is_package", &fullname)) {
+        goto exit;
+    }
+    return_value = zipimport_zipimporter_is_package_impl(self, fullname);
+
+exit:
+    return return_value;
+}
+
+PyDoc_STRVAR(zipimport_zipimporter_get_data__doc__,
+"get_data($self, pathname, /)\n"
+"--\n"
+"\n"
+"Return the data associated with \'pathname\'.\n"
+"\n"
+"Raise OSError if the file was not found.");
+
+#define ZIPIMPORT_ZIPIMPORTER_GET_DATA_METHODDEF    \
+    {"get_data", (PyCFunction)zipimport_zipimporter_get_data, METH_O, zipimport_zipimporter_get_data__doc__},
+
+static PyObject *
+zipimport_zipimporter_get_data_impl(ZipImporter *self, PyObject *path);
+
+static PyObject *
+zipimport_zipimporter_get_data(ZipImporter *self, PyObject *arg)
+{
+    PyObject *return_value = NULL;
+    PyObject *path;
+
+    if (!PyArg_Parse(arg, "U:get_data", &path)) {
+        goto exit;
+    }
+    return_value = zipimport_zipimporter_get_data_impl(self, path);
+
+exit:
+    return return_value;
+}
+
+PyDoc_STRVAR(zipimport_zipimporter_get_code__doc__,
+"get_code($self, fullname, /)\n"
+"--\n"
+"\n"
+"Return the code object for the specified module.\n"
+"\n"
+"Raise ZipImportError if the module couldn\'t be found.");
+
+#define ZIPIMPORT_ZIPIMPORTER_GET_CODE_METHODDEF    \
+    {"get_code", (PyCFunction)zipimport_zipimporter_get_code, METH_O, zipimport_zipimporter_get_code__doc__},
+
+static PyObject *
+zipimport_zipimporter_get_code_impl(ZipImporter *self, PyObject *fullname);
+
+static PyObject *
+zipimport_zipimporter_get_code(ZipImporter *self, PyObject *arg)
+{
+    PyObject *return_value = NULL;
+    PyObject *fullname;
+
+    if (!PyArg_Parse(arg, "U:get_code", &fullname)) {
+        goto exit;
+    }
+    return_value = zipimport_zipimporter_get_code_impl(self, fullname);
+
+exit:
+    return return_value;
+}
+
+PyDoc_STRVAR(zipimport_zipimporter_get_source__doc__,
+"get_source($self, fullname, /)\n"
+"--\n"
+"\n"
+"Return the source code for the specified module.\n"
+"\n"
+"Raise ZipImportError if the module couldn\'t be found, return None if the\n"
+"archive does contain the module, but has no source for it.");
+
+#define ZIPIMPORT_ZIPIMPORTER_GET_SOURCE_METHODDEF    \
+    {"get_source", (PyCFunction)zipimport_zipimporter_get_source, METH_O, zipimport_zipimporter_get_source__doc__},
+
+static PyObject *
+zipimport_zipimporter_get_source_impl(ZipImporter *self, PyObject *fullname);
+
+static PyObject *
+zipimport_zipimporter_get_source(ZipImporter *self, PyObject *arg)
+{
+    PyObject *return_value = NULL;
+    PyObject *fullname;
+
+    if (!PyArg_Parse(arg, "U:get_source", &fullname)) {
+        goto exit;
+    }
+    return_value = zipimport_zipimporter_get_source_impl(self, fullname);
+
+exit:
+    return return_value;
+}
+/*[clinic end generated code: output=bac6c9144950eaec input=a9049054013a1b77]*/
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index fad1b1f5abb..c01ee55840b 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -54,28 +54,54 @@ static PyObject *get_data(PyObject *archive, PyObject *toc_entry);
 static PyObject *get_module_code(ZipImporter *self, PyObject *fullname,
                                  int *p_ispackage, PyObject **p_modpath);
 
+static PyTypeObject ZipImporter_Type;
 
 #define ZipImporter_Check(op) PyObject_TypeCheck(op, &ZipImporter_Type)
 
+/*[clinic input]
+module zipimport
+class zipimport.zipimporter "ZipImporter *" "&ZipImporter_Type"
+[clinic start generated code]*/
+/*[clinic end generated code: output=da39a3ee5e6b4b0d input=9db8b61557d911e7]*/
+#include "clinic/zipimport.c.h"
+
 
 /* zipimporter.__init__
    Split the "subdirectory" from the Zip archive path, lookup a matching
    entry in sys.path_importer_cache, fetch the file directory from there
    if found, or else read it from the archive. */
+
+/*[clinic input]
+zipimport.zipimporter.__init__
+
+    archivepath as path: object(converter="PyUnicode_FSDecoder")
+        A path-like object to a zipfile, or to a specific path inside
+        a zipfile.
+    /
+
+Create a new zipimporter instance.
+
+'archivepath' must be a path-like object to a zipfile, or to a specific path
+inside a zipfile. For example, it can be '/tmp/myimport.zip', or
+'/tmp/myimport.zip/mydirectory', if mydirectory is a valid directory inside
+the archive.
+
+'ZipImportError' is raised if 'archivepath' doesn't point to a valid Zip
+archive.
+
+The 'archive' attribute of the zipimporter object contains the name of the
+zipfile targeted.
+
+[clinic start generated code]*/
+
 static int
-zipimporter_init(ZipImporter *self, PyObject *args, PyObject *kwds)
+zipimport_zipimporter___init___impl(ZipImporter *self, PyObject *path)
+/*[clinic end generated code: output=141558fefdb46dc8 input=92b9ebeed1f6a704]*/
 {
-    PyObject *path, *files, *tmp;
+    PyObject *files, *tmp;
     PyObject *filename = NULL;
     Py_ssize_t len, flen;
 
-    if (!_PyArg_NoKeywords("zipimporter", kwds))
-        return -1;
-
-    if (!PyArg_ParseTuple(args, "O&:zipimporter",
-                          PyUnicode_FSDecoder, &path))
-        return -1;
-
     if (PyUnicode_READY(path) == -1)
         return -1;
 
@@ -379,21 +405,30 @@ find_loader(ZipImporter *self, PyObject *fullname, PyObject **namespace_portion)
     return FL_MODULE_FOUND;
 }
 
+/*[clinic input]
+zipimport.zipimporter.find_module
+
+    fullname: unicode
+    path: object = None
+    /
+
+Search for a module specified by 'fullname'.
+
+'fullname' must be the fully qualified (dotted) module name. It returns the
+zipimporter instance itself if the module was found, or None if it wasn't.
+The optional 'path' argument is ignored -- it's there for compatibility
+with the importer protocol.
+
+[clinic start generated code]*/
 
-/* Check whether we can satisfy the import of the module named by
-   'fullname'. Return self if we can, None if we can't. */
 static PyObject *
-zipimporter_find_module(PyObject *obj, PyObject *args)
+zipimport_zipimporter_find_module_impl(ZipImporter *self, PyObject *fullname,
+                                       PyObject *path)
+/*[clinic end generated code: output=506087f609466dc7 input=e3528520e075063f]*/
 {
-    ZipImporter *self = (ZipImporter *)obj;
-    PyObject *path = NULL;
-    PyObject *fullname;
     PyObject *namespace_portion = NULL;
     PyObject *result = NULL;
 
-    if (!PyArg_ParseTuple(args, "U|O:zipimporter.find_module", &fullname, &path))
-        return NULL;
-
     switch (find_loader(self, fullname, &namespace_portion)) {
     case FL_ERROR:
         return NULL;
@@ -416,23 +451,31 @@ zipimporter_find_module(PyObject *obj, PyObject *args)
 }
 
 
-/* Check whether we can satisfy the import of the module named by
-   'fullname', or whether it could be a portion of a namespace
-   package. Return self if we can load it, a string containing the
-   full path if it's a possible namespace portion, None if we
-   can't load it. */
+/*[clinic input]
+zipimport.zipimporter.find_loader
+
+    fullname: unicode
+    path: object = None
+    /
+
+Search for a module specified by 'fullname'.
+
+'fullname' must be the fully qualified (dotted) module name. It returns the
+zipimporter instance itself if the module was found, a string containing the
+full path name if it's possibly a portion of a namespace package,
+or None otherwise. The optional 'path' argument is ignored -- it's
+there for compatibility with the importer protocol.
+
+[clinic start generated code]*/
+
 static PyObject *
-zipimporter_find_loader(PyObject *obj, PyObject *args)
+zipimport_zipimporter_find_loader_impl(ZipImporter *self, PyObject *fullname,
+                                       PyObject *path)
+/*[clinic end generated code: output=601599a43bc0f49a input=dc73f275b0d5be23]*/
 {
-    ZipImporter *self = (ZipImporter *)obj;
-    PyObject *path = NULL;
-    PyObject *fullname;
     PyObject *result = NULL;
     PyObject *namespace_portion = NULL;
 
-    if (!PyArg_ParseTuple(args, "U|O:zipimporter.find_module", &fullname, &path))
-        return NULL;
-
     switch (find_loader(self, fullname, &namespace_portion)) {
     case FL_ERROR:
         return NULL;
@@ -453,19 +496,27 @@ zipimporter_find_loader(PyObject *obj, PyObject *args)
     return result;
 }
 
-/* Load and return the module named by 'fullname'. */
+/*[clinic input]
+zipimport.zipimporter.load_module
+
+    fullname: unicode
+    /
+
+Load the module specified by 'fullname'.
+
+'fullname' must be the fully qualified (dotted) module name. It returns the
+imported module, or raises ZipImportError if it wasn't found.
+
+[clinic start generated code]*/
+
 static PyObject *
-zipimporter_load_module(PyObject *obj, PyObject *args)
+zipimport_zipimporter_load_module_impl(ZipImporter *self, PyObject *fullname)
+/*[clinic end generated code: output=7303cebf88d47953 input=c236e2e8621f04ef]*/
 {
-    ZipImporter *self = (ZipImporter *)obj;
     PyObject *code = NULL, *mod, *dict;
-    PyObject *fullname;
     PyObject *modpath = NULL;
     int ispackage;
 
-    if (!PyArg_ParseTuple(args, "U:zipimporter.load_module",
-                          &fullname))
-        return NULL;
     if (PyUnicode_READY(fullname) == -1)
         return NULL;
 
@@ -523,18 +574,23 @@ zipimporter_load_module(PyObject *obj, PyObject *args)
     return NULL;
 }
 
-/* Return a string matching __file__ for the named module */
+/*[clinic input]
+zipimport.zipimporter.get_filename
+
+    fullname: unicode
+    /
+
+Return the filename for the specified module.
+[clinic start generated code]*/
+
 static PyObject *
-zipimporter_get_filename(PyObject *obj, PyObject *args)
+zipimport_zipimporter_get_filename_impl(ZipImporter *self,
+                                        PyObject *fullname)
+/*[clinic end generated code: output=c5b92b58bea86506 input=28d2eb57e4f25c8a]*/
 {
-    ZipImporter *self = (ZipImporter *)obj;
-    PyObject *fullname, *code, *modpath;
+    PyObject *code, *modpath;
     int ispackage;
 
-    if (!PyArg_ParseTuple(args, "U:zipimporter.get_filename",
-                          &fullname))
-        return NULL;
-
     /* Deciding the filename requires working out where the code
        would come from if the module was actually loaded */
     code = get_module_code(self, fullname, &ispackage, &modpath);
@@ -545,18 +601,24 @@ zipimporter_get_filename(PyObject *obj, PyObject *args)
     return modpath;
 }
 
-/* Return a bool signifying whether the module is a package or not. */
+/*[clinic input]
+zipimport.zipimporter.is_package
+
+    fullname: unicode
+    /
+
+Return True if the module specified by fullname is a package.
+
+Raise ZipImportError if the module couldn't be found.
+
+[clinic start generated code]*/
+
 static PyObject *
-zipimporter_is_package(PyObject *obj, PyObject *args)
+zipimport_zipimporter_is_package_impl(ZipImporter *self, PyObject *fullname)
+/*[clinic end generated code: output=c32958c2a5216ae6 input=a7ba752f64345062]*/
 {
-    ZipImporter *self = (ZipImporter *)obj;
-    PyObject *fullname;
     enum zi_module_info mi;
 
-    if (!PyArg_ParseTuple(args, "U:zipimporter.is_package",
-                          &fullname))
-        return NULL;
-
     mi = get_module_info(self, fullname);
     if (mi == MI_ERROR)
         return NULL;
@@ -568,17 +630,26 @@ zipimporter_is_package(PyObject *obj, PyObject *args)
 }
 
 
+/*[clinic input]
+zipimport.zipimporter.get_data
+
+    pathname as path: unicode
+    /
+
+Return the data associated with 'pathname'.
+
+Raise OSError if the file was not found.
+
+[clinic start generated code]*/
+
 static PyObject *
-zipimporter_get_data(PyObject *obj, PyObject *args)
+zipimport_zipimporter_get_data_impl(ZipImporter *self, PyObject *path)
+/*[clinic end generated code: output=65dc506aaa268436 input=fa6428b74843c4ae]*/
 {
-    ZipImporter *self = (ZipImporter *)obj;
-    PyObject *path, *key;
+    PyObject *key;
     PyObject *toc_entry;
     Py_ssize_t path_start, path_len, len;
 
-    if (!PyArg_ParseTuple(args, "U:zipimporter.get_data", &path))
-        return NULL;
-
 #ifdef ALTSEP
     path = _PyObject_CallMethodId(path, &PyId_replace, "CC", ALTSEP, SEP);
     if (!path)
@@ -615,29 +686,46 @@ zipimporter_get_data(PyObject *obj, PyObject *args)
     return NULL;
 }
 
-static PyObject *
-zipimporter_get_code(PyObject *obj, PyObject *args)
-{
-    ZipImporter *self = (ZipImporter *)obj;
-    PyObject *fullname;
+/*[clinic input]
+zipimport.zipimporter.get_code
 
-    if (!PyArg_ParseTuple(args, "U:zipimporter.get_code", &fullname))
-        return NULL;
+    fullname: unicode
+    /
+
+Return the code object for the specified module.
+
+Raise ZipImportError if the module couldn't be found.
+
+[clinic start generated code]*/
 
+static PyObject *
+zipimport_zipimporter_get_code_impl(ZipImporter *self, PyObject *fullname)
+/*[clinic end generated code: output=b923c37fa99cbac4 input=2761412bc37f3549]*/
+{
     return get_module_code(self, fullname, NULL, NULL);
 }
 
+/*[clinic input]
+zipimport.zipimporter.get_source
+
+    fullname: unicode
+    /
+
+Return the source code for the specified module.
+
+Raise ZipImportError if the module couldn't be found, return None if the
+archive does contain the module, but has no source for it.
+
+[clinic start generated code]*/
+
 static PyObject *
-zipimporter_get_source(PyObject *obj, PyObject *args)
+zipimport_zipimporter_get_source_impl(ZipImporter *self, PyObject *fullname)
+/*[clinic end generated code: output=bc059301b0c33729 input=4e4b186f2e690716]*/
 {
-    ZipImporter *self = (ZipImporter *)obj;
     PyObject *toc_entry;
-    PyObject *fullname, *subname, *path, *fullpath;
+    PyObject *subname, *path, *fullpath;
     enum zi_module_info mi;
 
-    if (!PyArg_ParseTuple(args, "U:zipimporter.get_source", &fullname))
-        return NULL;
-
     mi = get_module_info(self, fullname);
     if (mi == MI_ERROR)
         return NULL;
@@ -680,80 +768,16 @@ zipimporter_get_source(PyObject *obj, PyObject *args)
     Py_RETURN_NONE;
 }
 
-PyDoc_STRVAR(doc_find_module,
-"find_module(fullname, path=None) -> self or None.\n\
-\n\
-Search for a module specified by 'fullname'. 'fullname' must be the\n\
-fully qualified (dotted) module name. It returns the zipimporter\n\
-instance itself if the module was found, or None if it wasn't.\n\
-The optional 'path' argument is ignored -- it's there for compatibility\n\
-with the importer protocol.");
-
-PyDoc_STRVAR(doc_find_loader,
-"find_loader(fullname, path=None) -> self, str or None.\n\
-\n\
-Search for a module specified by 'fullname'. 'fullname' must be the\n\
-fully qualified (dotted) module name. It returns the zipimporter\n\
-instance itself if the module was found, a string containing the\n\
-full path name if it's possibly a portion of a namespace package,\n\
-or None otherwise. The optional 'path' argument is ignored -- it's\n\
- there for compatibility with the importer protocol.");
-
-PyDoc_STRVAR(doc_load_module,
-"load_module(fullname) -> module.\n\
-\n\
-Load the module specified by 'fullname'. 'fullname' must be the\n\
-fully qualified (dotted) module name. It returns the imported\n\
-module, or raises ZipImportError if it wasn't found.");
-
-PyDoc_STRVAR(doc_get_data,
-"get_data(pathname) -> string with file data.\n\
-\n\
-Return the data associated with 'pathname'. Raise OSError if\n\
-the file wasn't found.");
-
-PyDoc_STRVAR(doc_is_package,
-"is_package(fullname) -> bool.\n\
-\n\
-Return True if the module specified by fullname is a package.\n\
-Raise ZipImportError if the module couldn't be found.");
-
-PyDoc_STRVAR(doc_get_code,
-"get_code(fullname) -> code object.\n\
-\n\
-Return the code object for the specified module. Raise ZipImportError\n\
-if the module couldn't be found.");
-
-PyDoc_STRVAR(doc_get_source,
-"get_source(fullname) -> source string.\n\
-\n\
-Return the source code for the specified module. Raise ZipImportError\n\
-if the module couldn't be found, return None if the archive does\n\
-contain the module, but has no source for it.");
-
-
-PyDoc_STRVAR(doc_get_filename,
-"get_filename(fullname) -> filename string.\n\
-\n\
-Return the filename for the specified module.");
 
 static PyMethodDef zipimporter_methods[] = {
-    {"find_module", zipimporter_find_module, METH_VARARGS,
-     doc_find_module},
-    {"find_loader", zipimporter_find_loader, METH_VARARGS,
-     doc_find_loader},
-    {"load_module", zipimporter_load_module, METH_VARARGS,
-     doc_load_module},
-    {"get_data", zipimporter_get_data, METH_VARARGS,
-     doc_get_data},
-    {"get_code", zipimporter_get_code, METH_VARARGS,
-     doc_get_code},
-    {"get_source", zipimporter_get_source, METH_VARARGS,
-     doc_get_source},
-    {"get_filename", zipimporter_get_filename, METH_VARARGS,
-     doc_get_filename},
-    {"is_package", zipimporter_is_package, METH_VARARGS,
-     doc_is_package},
+    ZIPIMPORT_ZIPIMPORTER_FIND_MODULE_METHODDEF
+    ZIPIMPORT_ZIPIMPORTER_FIND_LOADER_METHODDEF
+    ZIPIMPORT_ZIPIMPORTER_LOAD_MODULE_METHODDEF
+    ZIPIMPORT_ZIPIMPORTER_GET_FILENAME_METHODDEF
+    ZIPIMPORT_ZIPIMPORTER_IS_PACKAGE_METHODDEF
+    ZIPIMPORT_ZIPIMPORTER_GET_DATA_METHODDEF
+    ZIPIMPORT_ZIPIMPORTER_GET_CODE_METHODDEF
+    ZIPIMPORT_ZIPIMPORTER_GET_SOURCE_METHODDEF
     {NULL,              NULL}   /* sentinel */
 };
 
@@ -764,20 +788,6 @@ static PyMemberDef zipimporter_members[] = {
     {NULL}
 };
 
-PyDoc_STRVAR(zipimporter_doc,
-"zipimporter(archivepath) -> zipimporter object\n\
-\n\
-Create a new zipimporter instance. 'archivepath' must be a path to\n\
-a zipfile, or to a specific path inside a zipfile. For example, it can be\n\
-'/tmp/myimport.zip', or '/tmp/myimport.zip/mydirectory', if mydirectory is a\n\
-valid directory inside the archive.\n\
-\n\
-'ZipImportError is raised if 'archivepath' doesn't point to a valid Zip\n\
-archive.\n\
-\n\
-The 'archive' attribute of zipimporter objects contains the name of the\n\
-zipfile targeted.");
-
 #define DEFERRED_ADDRESS(ADDR) 0
 
 static PyTypeObject ZipImporter_Type = {
@@ -802,7 +812,7 @@ static PyTypeObject ZipImporter_Type = {
     0,                                          /* tp_as_buffer */
     Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
         Py_TPFLAGS_HAVE_GC,                     /* tp_flags */
-    zipimporter_doc,                            /* tp_doc */
+    zipimport_zipimporter___init____doc__,      /* tp_doc */
     zipimporter_traverse,                       /* tp_traverse */
     0,                                          /* tp_clear */
     0,                                          /* tp_richcompare */
@@ -817,7 +827,7 @@ static PyTypeObject ZipImporter_Type = {
     0,                                          /* tp_descr_get */
     0,                                          /* tp_descr_set */
     0,                                          /* tp_dictoffset */
-    (initproc)zipimporter_init,                 /* tp_init */
+    (initproc)zipimport_zipimporter___init__,   /* tp_init */
     PyType_GenericAlloc,                        /* tp_alloc */
     PyType_GenericNew,                          /* tp_new */
     PyObject_GC_Del,                            /* tp_free */


From webhook-mailer at python.org  Fri Aug 18 15:39:35 2017
From: webhook-mailer at python.org (Stefan Krah)
Date: Fri, 18 Aug 2017 19:39:35 -0000
Subject: [Python-checkins] bpo-30923: Disable warning that has been part of
 -Wextra since gcc-7.0. (#3142)
Message-ID: <mailman.52.1503085178.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/d73a960c575207539c3f9765cff26d4fff400b45
commit: d73a960c575207539c3f9765cff26d4fff400b45
branch: master
author: Stefan Krah <skrah at bytereef.org>
committer: GitHub <noreply at github.com>
date: 2017-08-18T21:39:32+02:00
summary:

bpo-30923: Disable warning that has been part of -Wextra since gcc-7.0. (#3142)

files:
M Modules/_decimal/libmpdec/io.c

diff --git a/Modules/_decimal/libmpdec/io.c b/Modules/_decimal/libmpdec/io.c
index 3aadfb04379..f45e558f1a9 100644
--- a/Modules/_decimal/libmpdec/io.c
+++ b/Modules/_decimal/libmpdec/io.c
@@ -45,6 +45,12 @@
    PEP-3101 formatting for numeric types. */
 
 
+/* Disable warning that is part of -Wextra since gcc 7.0. */
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 7
+  #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
+
+
 /*
  * Work around the behavior of tolower() and strcasecmp() in certain
  * locales. For example, in tr_TR.utf8:


From webhook-mailer at python.org  Fri Aug 18 17:12:32 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 18 Aug 2017 21:12:32 -0000
Subject: [Python-checkins] bpo-31234: fork_wait tests now join threads
 (#3139)
Message-ID: <mailman.53.1503090754.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/c99d41f9c0304fcf06550515c3db55f93a629e9e
commit: c99d41f9c0304fcf06550515c3db55f93a629e9e
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-18T23:12:26+02:00
summary:

bpo-31234: fork_wait tests now join threads (#3139)

fork_wait.py tests now joins threads, to not leak running threads in
the background.

files:
M Lib/test/fork_wait.py

diff --git a/Lib/test/fork_wait.py b/Lib/test/fork_wait.py
index 713039dd826..6af79ad5d4d 100644
--- a/Lib/test/fork_wait.py
+++ b/Lib/test/fork_wait.py
@@ -11,7 +11,8 @@
 
 import os, sys, time, unittest
 import test.support as support
-_thread = support.import_module('_thread')
+
+threading = support.import_module('threading')
 
 LONGSLEEP = 2
 SHORTSLEEP = 0.5
@@ -20,8 +21,19 @@
 class ForkWait(unittest.TestCase):
 
     def setUp(self):
+        self._threading_key = support.threading_setup()
         self.alive = {}
         self.stop = 0
+        self.threads = []
+
+    def tearDown(self):
+        # Stop threads
+        self.stop = 1
+        for thread in self.threads:
+            thread.join()
+        thread = None
+        self.threads.clear()
+        support.threading_cleanup(*self._threading_key)
 
     def f(self, id):
         while not self.stop:
@@ -43,10 +55,11 @@ def wait_impl(self, cpid):
         self.assertEqual(spid, cpid)
         self.assertEqual(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8))
 
-    @support.reap_threads
     def test_wait(self):
         for i in range(NUM_THREADS):
-            _thread.start_new(self.f, (i,))
+            thread = threading.Thread(target=self.f, args=(i,))
+            thread.start()
+            self.threads.append(thread)
 
         # busy-loop to wait for threads
         deadline = time.monotonic() + 10.0
@@ -75,8 +88,4 @@ def test_wait(self):
             os._exit(n)
         else:
             # Parent
-            try:
-                self.wait_impl(cpid)
-            finally:
-                # Tell threads to die
-                self.stop = 1
+            self.wait_impl(cpid)


From webhook-mailer at python.org  Fri Aug 18 17:43:57 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 18 Aug 2017 21:43:57 -0000
Subject: [Python-checkins] bpo-30947: Update libexpat from 2.2.1 to 2.2.3
 (#3106)
Message-ID: <mailman.54.1503092639.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/93d0cb58b4da2a88c56f472c6c19491cc7a390df
commit: 93d0cb58b4da2a88c56f472c6c19491cc7a390df
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-18T23:43:54+02:00
summary:

bpo-30947: Update libexpat from 2.2.1 to 2.2.3 (#3106)

* bpo-30947: Update libexpat from 2.2.1 to 2.2.3

* Add NEWS entry

* Add new loadlibrary.c

* expat_external.h: restore include "pyexpatns.h"

* PCbuild: add expat/loadlibrary.c

* Define XML_POOR_ENTROPY to compile expat

files:
A Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst
A Modules/expat/loadlibrary.c
M Modules/expat/expat.h
M Modules/expat/siphash.h
M Modules/expat/xmlparse.c
M Modules/expat/xmlrole.c
M Modules/expat/xmltok.c
M Modules/expat/xmltok_impl.c
M PCbuild/_elementtree.vcxproj
M PCbuild/_elementtree.vcxproj.filters
M PCbuild/pyexpat.vcxproj
M PCbuild/pyexpat.vcxproj.filters
M setup.py

diff --git a/Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst b/Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst
new file mode 100644
index 00000000000..3caca9a79b4
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst
@@ -0,0 +1,2 @@
+Upgrade libexpat embedded copy from version 2.2.1 to 2.2.3 to get security
+fixes.
diff --git a/Modules/expat/expat.h b/Modules/expat/expat.h
index 28b0f954d41..7e5bbb7e393 100644
--- a/Modules/expat/expat.h
+++ b/Modules/expat/expat.h
@@ -24,7 +24,6 @@ extern "C" {
 struct XML_ParserStruct;
 typedef struct XML_ParserStruct *XML_Parser;
 
-/* Should this be defined using stdbool.h when C99 is available? */
 typedef unsigned char XML_Bool;
 #define XML_TRUE   ((XML_Bool) 1)
 #define XML_FALSE  ((XML_Bool) 0)
@@ -1049,7 +1048,7 @@ XML_GetFeatureList(void);
 */
 #define XML_MAJOR_VERSION 2
 #define XML_MINOR_VERSION 2
-#define XML_MICRO_VERSION 1
+#define XML_MICRO_VERSION 3
 
 #ifdef __cplusplus
 }
diff --git a/Modules/expat/loadlibrary.c b/Modules/expat/loadlibrary.c
new file mode 100644
index 00000000000..ffce868399b
--- /dev/null
+++ b/Modules/expat/loadlibrary.c
@@ -0,0 +1,141 @@
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 2016 - 2017, Steve Holme, <steve_holme at hotmail.com>.
+ *
+ * All rights reserved.
+ *
+ * Permission to  use, copy,  modify, and distribute  this software  for any
+ * purpose with  or without fee is  hereby granted, provided that  the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+ * EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+ * MERCHANTABILITY, FITNESS FOR A  PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR  OTHERWISE, ARISING FROM, OUT OF OR  IN CONNECTION WITH
+ * THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice,  the name of a copyright holder shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings  in this  Software without  prior written  authorization of  the
+ * copyright holder.
+ *
+ ***************************************************************************/
+
+#if defined(_WIN32)
+
+#include <windows.h>
+#include <tchar.h>
+
+
+HMODULE _Expat_LoadLibrary(LPCTSTR filename);
+
+
+#if !defined(LOAD_WITH_ALTERED_SEARCH_PATH)
+#define LOAD_WITH_ALTERED_SEARCH_PATH  0x00000008
+#endif
+
+#if !defined(LOAD_LIBRARY_SEARCH_SYSTEM32)
+#define LOAD_LIBRARY_SEARCH_SYSTEM32   0x00000800
+#endif
+
+/* We use our own typedef here since some headers might lack these */
+typedef HMODULE (APIENTRY *LOADLIBRARYEX_FN)(LPCTSTR, HANDLE, DWORD);
+
+/* See function definitions in winbase.h */
+#ifdef UNICODE
+#  ifdef _WIN32_WCE
+#    define LOADLIBARYEX  L"LoadLibraryExW"
+#  else
+#    define LOADLIBARYEX  "LoadLibraryExW"
+#  endif
+#else
+#  define LOADLIBARYEX    "LoadLibraryExA"
+#endif
+
+
+/*
+ * _Expat_LoadLibrary()
+ *
+ * This is used to dynamically load DLLs using the most secure method available
+ * for the version of Windows that we are running on.
+ *
+ * Parameters:
+ *
+ * filename  [in] - The filename or full path of the DLL to load. If only the
+ *                  filename is passed then the DLL will be loaded from the
+ *                  Windows system directory.
+ *
+ * Returns the handle of the module on success; otherwise NULL.
+ */
+HMODULE _Expat_LoadLibrary(LPCTSTR filename)
+{
+  HMODULE hModule = NULL;
+  LOADLIBRARYEX_FN pLoadLibraryEx = NULL;
+
+  /* Get a handle to kernel32 so we can access it's functions at runtime */
+  HMODULE hKernel32 = GetModuleHandle(TEXT("kernel32"));
+  if(!hKernel32)
+    return NULL;
+
+  /* Attempt to find LoadLibraryEx() which is only available on Windows 2000
+     and above */
+  pLoadLibraryEx = (LOADLIBRARYEX_FN) GetProcAddress(hKernel32, LOADLIBARYEX);
+
+  /* Detect if there's already a path in the filename and load the library if
+     there is. Note: Both back slashes and forward slashes have been supported
+     since the earlier days of DOS at an API level although they are not
+     supported by command prompt */
+  if(_tcspbrk(filename, TEXT("\\/"))) {
+    /** !checksrc! disable BANNEDFUNC 1 **/
+    hModule = pLoadLibraryEx ?
+      pLoadLibraryEx(filename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH) :
+      LoadLibrary(filename);
+  }
+  /* Detect if KB2533623 is installed, as LOAD_LIBARY_SEARCH_SYSTEM32 is only
+     supported on Windows Vista, Windows Server 2008, Windows 7 and Windows
+     Server 2008 R2 with this patch or natively on Windows 8 and above */
+  else if(pLoadLibraryEx && GetProcAddress(hKernel32, "AddDllDirectory")) {
+    /* Load the DLL from the Windows system directory */
+    hModule = pLoadLibraryEx(filename, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
+  }
+  else {
+    /* Attempt to get the Windows system path */
+    UINT systemdirlen = GetSystemDirectory(NULL, 0);
+    if(systemdirlen) {
+      /* Allocate space for the full DLL path (Room for the null terminator
+         is included in systemdirlen) */
+      size_t filenamelen = _tcslen(filename);
+      TCHAR *path = malloc(sizeof(TCHAR) * (systemdirlen + 1 + filenamelen));
+      if(path && GetSystemDirectory(path, systemdirlen)) {
+        /* Calculate the full DLL path */
+        _tcscpy(path + _tcslen(path), TEXT("\\"));
+        _tcscpy(path + _tcslen(path), filename);
+
+        /* Load the DLL from the Windows system directory */
+        /** !checksrc! disable BANNEDFUNC 1 **/
+        hModule = pLoadLibraryEx ?
+          pLoadLibraryEx(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH) :
+          LoadLibrary(path);
+
+      }
+      free(path);
+    }
+  }
+
+  return hModule;
+}
+
+#else /* defined(_WIN32) */
+
+/* ISO C requires a translation unit to contain at least one declaration
+   [-Wempty-translation-unit] */
+typedef int _TRANSLATION_UNIT_LOAD_LIBRARY_C_NOT_EMTPY;
+
+#endif /* defined(_WIN32) */
diff --git a/Modules/expat/siphash.h b/Modules/expat/siphash.h
index 453dd42f27e..581872df7b4 100644
--- a/Modules/expat/siphash.h
+++ b/Modules/expat/siphash.h
@@ -2,9 +2,8 @@
  * siphash.h - SipHash-2-4 in a single header file
  * --------------------------------------------------------------------------
  * Derived by William Ahern from the reference implementation[1] published[2]
- * by Jean-Philippe Aumasson and Daniel J. Berstein. Licensed in kind.
  * by Jean-Philippe Aumasson and Daniel J. Berstein.
- * Minimal changes by Sebastian Pipping on top, details below.
+ * Minimal changes by Sebastian Pipping and Victor Stinner on top, see below.
  * Licensed under the CC0 Public Domain Dedication license.
  *
  * 1. https://www.131002.net/siphash/siphash24.c
@@ -12,14 +11,25 @@
  * --------------------------------------------------------------------------
  * HISTORY:
  *
- * 2017-06-10  (Sebastian Pipping)
+ * 2017-07-25  (Vadim Zeitlin)
+ *   - Fix use of SIPHASH_MAIN macro
+ *
+ * 2017-07-05  (Sebastian Pipping)
+ *   - Use _SIP_ULL macro to not require a C++11 compiler if compiled as C++
+ *   - Add const qualifiers at two places
+ *   - Ensure <=80 characters line length (assuming tab width 4)
+ *
+ * 2017-06-23  (Victor Stinner)
+ *   - Address Win64 compile warnings
+ *
+ * 2017-06-18  (Sebastian Pipping)
  *   - Clarify license note in the header
  *   - Address C89 issues:
  *     - Stop using inline keyword (and let compiler decide)
- *     - Turn integer suffix ULL to UL
  *     - Replace _Bool by int
  *     - Turn macro siphash24 into a function
  *     - Address invalid conversion (void pointer) by explicit cast
+ *   - Address lack of stdint.h for Visual Studio 2003 to 2008
  *   - Always expose sip24_valid (for self-tests)
  *
  * 2012-11-04 - Born.  (William Ahern)
@@ -76,7 +86,23 @@
 #define SIPHASH_H
 
 #include <stddef.h> /* size_t */
-#include <stdint.h> /* uint64_t uint32_t uint8_t */
+
+#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1600)
+  /* For vs2003/7.1 up to vs2008/9.0; _MSC_VER 1600 is vs2010/10.0 */
+  typedef unsigned __int8   uint8_t;
+  typedef unsigned __int32 uint32_t;
+  typedef unsigned __int64 uint64_t;
+#else
+ #include <stdint.h> /* uint64_t uint32_t uint8_t */
+#endif
+
+
+/*
+ * Workaround to not require a C++11 compiler for using ULL suffix
+ * if this code is included and compiled as C++; related GCC warning is:
+ * warning: use of C++11 long long integer constant [-Wlong-long]
+ */
+#define _SIP_ULL(high, low)  (((uint64_t)high << 32) | low)
 
 
 #define SIP_ROTL(x, b) (uint64_t)(((x) << (b)) | ( (x) >> (64 - (b))))
@@ -158,11 +184,12 @@ static void sip_round(struct siphash *H, const int rounds) {
 } /* sip_round() */
 
 
-static struct siphash *sip24_init(struct siphash *H, const struct sipkey *key) {
-	H->v0 = 0x736f6d6570736575UL ^ key->k[0];
-	H->v1 = 0x646f72616e646f6dUL ^ key->k[1];
-	H->v2 = 0x6c7967656e657261UL ^ key->k[0];
-	H->v3 = 0x7465646279746573UL ^ key->k[1];
+static struct siphash *sip24_init(struct siphash *H,
+		const struct sipkey *key) {
+	H->v0 = _SIP_ULL(0x736f6d65U, 0x70736575U) ^ key->k[0];
+	H->v1 = _SIP_ULL(0x646f7261U, 0x6e646f6dU) ^ key->k[1];
+	H->v2 = _SIP_ULL(0x6c796765U, 0x6e657261U) ^ key->k[0];
+	H->v3 = _SIP_ULL(0x74656462U, 0x79746573U) ^ key->k[1];
 
 	H->p = H->buf;
 	H->c = 0;
@@ -173,7 +200,8 @@ static struct siphash *sip24_init(struct siphash *H, const struct sipkey *key) {
 
 #define sip_endof(a) (&(a)[sizeof (a) / sizeof *(a)])
 
-static struct siphash *sip24_update(struct siphash *H, const void *src, size_t len) {
+static struct siphash *sip24_update(struct siphash *H, const void *src,
+		size_t len) {
 	const unsigned char *p = (const unsigned char *)src, *pe = p + len;
 	uint64_t m;
 
@@ -198,7 +226,7 @@ static struct siphash *sip24_update(struct siphash *H, const void *src, size_t l
 
 
 static uint64_t sip24_final(struct siphash *H) {
-	char left = (char)(H->p - H->buf);
+	const char left = (char)(H->p - H->buf);
 	uint64_t b = (H->c + left) << 56;
 
 	switch (left) {
@@ -222,7 +250,8 @@ static uint64_t sip24_final(struct siphash *H) {
 } /* sip24_final() */
 
 
-static uint64_t siphash24(const void *src, size_t len, const struct sipkey *key) {
+static uint64_t siphash24(const void *src, size_t len,
+		const struct sipkey *key) {
 	struct siphash state = SIPHASH_INITIALIZER;
 	return sip24_final(sip24_update(sip24_init(&state, key), src, len));
 } /* siphash24() */
@@ -310,7 +339,8 @@ static int sip24_valid(void) {
 	struct sipkey k;
 	size_t i;
 
-	sip_tokey(&k, "\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017");
+	sip_tokey(&k, "\000\001\002\003\004\005\006\007\010\011"
+			"\012\013\014\015\016\017");
 
 	for (i = 0; i < sizeof in; ++i) {
 		in[i] = (unsigned char)i;
@@ -323,12 +353,12 @@ static int sip24_valid(void) {
 } /* sip24_valid() */
 
 
-#if SIPHASH_MAIN
+#ifdef SIPHASH_MAIN
 
 #include <stdio.h>
 
 int main(void) {
-	int ok = sip24_valid();
+	const int ok = sip24_valid();
 
 	if (ok)
 		puts("OK");
diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c
index daec151e232..b703e61a040 100644
--- a/Modules/expat/xmlparse.c
+++ b/Modules/expat/xmlparse.c
@@ -1,10 +1,12 @@
 /* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
    See the file COPYING for copying permission.
 
-   77fea421d361dca90041d0040ecf1dca651167fadf2af79e990e35168d70d933 (2.2.1+)
+   101bfd65d1ff3d1511cf6671e6aae65f82cd97df6f4da137d46d510731830ad9 (2.2.3+)
 */
 
-#define _GNU_SOURCE 1                   /* syscall prototype */
+#if !defined(_GNU_SOURCE)
+# define _GNU_SOURCE 1                  /* syscall prototype */
+#endif
 
 #include <stddef.h>
 #include <string.h>                     /* memset(), memcpy() */
@@ -19,6 +21,8 @@
 #include <sys/time.h>                   /* gettimeofday() */
 #include <sys/types.h>                  /* getpid() */
 #include <unistd.h>                     /* getpid() */
+#include <fcntl.h>                      /* O_RDONLY */
+#include <errno.h>
 #endif
 
 #define XML_BUILDING_EXPAT 1
@@ -33,6 +37,57 @@
 #include "expat.h"
 #include "siphash.h"
 
+#if defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM)
+# if defined(HAVE_GETRANDOM)
+#  include <sys/random.h>    /* getrandom */
+# else
+#  include <unistd.h>        /* syscall */
+#  include <sys/syscall.h>   /* SYS_getrandom */
+# endif
+# if ! defined(GRND_NONBLOCK)
+#  define GRND_NONBLOCK  0x0001
+# endif  /* defined(GRND_NONBLOCK) */
+#endif  /* defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM) */
+
+#if defined(HAVE_LIBBSD) \
+    && (defined(HAVE_ARC4RANDOM_BUF) || defined(HAVE_ARC4RANDOM))
+# include <bsd/stdlib.h>
+#endif
+
+#if defined(_WIN32) && !defined(LOAD_LIBRARY_SEARCH_SYSTEM32)
+# define LOAD_LIBRARY_SEARCH_SYSTEM32  0x00000800
+#endif
+
+#if !defined(HAVE_GETRANDOM) && !defined(HAVE_SYSCALL_GETRANDOM) \
+    && !defined(HAVE_ARC4RANDOM_BUF) && !defined(HAVE_ARC4RANDOM) \
+    && !defined(XML_DEV_URANDOM) \
+    && !defined(_WIN32) \
+    && !defined(XML_POOR_ENTROPY)
+# error  \
+    You do not have support for any sources of high quality entropy \
+    enabled.  For end user security, that is probably not what you want. \
+    \
+    Your options include: \
+      * Linux + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
+      * Linux + glibc <2.25 (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
+      * BSD / macOS >=10.7 (arc4random_buf): HAVE_ARC4RANDOM_BUF, \
+      * BSD / macOS <10.7 (arc4random): HAVE_ARC4RANDOM, \
+      * libbsd (arc4random_buf): HAVE_ARC4RANDOM_BUF + HAVE_LIBBSD, \
+      * libbsd (arc4random): HAVE_ARC4RANDOM + HAVE_LIBBSD, \
+      * Linux / BSD / macOS (/dev/urandom): XML_DEV_URANDOM \
+      * Windows (RtlGenRandom): _WIN32. \
+    \
+    If insist on not using any of these, bypass this error by defining \
+    XML_POOR_ENTROPY; you have been warned. \
+    \
+    For CMake, one way to pass the define is: \
+        cmake -DCMAKE_C_FLAGS="-pipe -O2 -DHAVE_SYSCALL_GETRANDOM" . \
+    \
+    If you have reasons to patch this detection code away or need changes \
+    to the build system, please open a bug.  Thank you!
+#endif
+
+
 #ifdef XML_UNICODE
 #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX
 #define XmlConvert XmlUtf16Convert
@@ -436,6 +491,9 @@ static ELEMENT_TYPE *
 getElementType(XML_Parser parser, const ENCODING *enc,
                const char *ptr, const char *end);
 
+static XML_Char *copyString(const XML_Char *s,
+                            const XML_Memory_Handling_Suite *memsuite);
+
 static unsigned long generate_hash_secret_salt(XML_Parser parser);
 static XML_Bool startParsing(XML_Parser parser);
 
@@ -696,21 +754,13 @@ static const XML_Char implicitContext[] = {
 
 
 #if defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM)
-# include <errno.h>
-
-# if defined(HAVE_GETRANDOM)
-#  include <sys/random.h>    /* getrandom */
-# else
-#  include <unistd.h>        /* syscall */
-#  include <sys/syscall.h>   /* SYS_getrandom */
-# endif
 
 /* Obtain entropy on Linux 3.17+ */
 static int
-writeRandomBytes_getrandom(void * target, size_t count) {
+writeRandomBytes_getrandom_nonblock(void * target, size_t count) {
   int success = 0;  /* full count bytes written? */
   size_t bytesWrittenTotal = 0;
-  const unsigned int getrandomFlags = 0;
+  const unsigned int getrandomFlags = GRND_NONBLOCK;
 
   do {
     void * const currentTarget = (void*)((char*)target + bytesWrittenTotal);
@@ -728,7 +778,7 @@ writeRandomBytes_getrandom(void * target, size_t count) {
       if (bytesWrittenTotal >= count)
         success = 1;
     }
-  } while (! success && (errno == EINTR || errno == EAGAIN));
+  } while (! success && (errno == EINTR));
 
   return success;
 }
@@ -736,12 +786,67 @@ writeRandomBytes_getrandom(void * target, size_t count) {
 #endif  /* defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM) */
 
 
+#if ! defined(_WIN32) && defined(XML_DEV_URANDOM)
+
+/* Extract entropy from /dev/urandom */
+static int
+writeRandomBytes_dev_urandom(void * target, size_t count) {
+  int success = 0;  /* full count bytes written? */
+  size_t bytesWrittenTotal = 0;
+
+  const int fd = open("/dev/urandom", O_RDONLY);
+  if (fd < 0) {
+    return 0;
+  }
+
+  do {
+    void * const currentTarget = (void*)((char*)target + bytesWrittenTotal);
+    const size_t bytesToWrite = count - bytesWrittenTotal;
+
+    const ssize_t bytesWrittenMore = read(fd, currentTarget, bytesToWrite);
+
+    if (bytesWrittenMore > 0) {
+      bytesWrittenTotal += bytesWrittenMore;
+      if (bytesWrittenTotal >= count)
+        success = 1;
+    }
+  } while (! success && (errno == EINTR));
+
+  close(fd);
+  return success;
+}
+
+#endif  /* ! defined(_WIN32) && defined(XML_DEV_URANDOM) */
+
+
+#if defined(HAVE_ARC4RANDOM)
+
+static void
+writeRandomBytes_arc4random(void * target, size_t count) {
+  size_t bytesWrittenTotal = 0;
+
+  while (bytesWrittenTotal < count) {
+    const uint32_t random32 = arc4random();
+    size_t i = 0;
+
+    for (; (i < sizeof(random32)) && (bytesWrittenTotal < count);
+        i++, bytesWrittenTotal++) {
+      const uint8_t random8 = (uint8_t)(random32 >> (i * 8));
+      ((uint8_t *)target)[bytesWrittenTotal] = random8;
+    }
+  }
+}
+
+#endif  /* defined(HAVE_ARC4RANDOM) */
+
+
 #ifdef _WIN32
 
 typedef BOOLEAN (APIENTRY *RTLGENRANDOM_FUNC)(PVOID, ULONG);
+HMODULE _Expat_LoadLibrary(LPCTSTR filename);  /* see loadlibrary.c */
 
 /* Obtain entropy on Windows XP / Windows Server 2003 and later.
- * Hint on RtlGenRandom and the following article from libsodioum.
+ * Hint on RtlGenRandom and the following article from libsodium.
  *
  * Michael Howard: Cryptographically Secure Random number on Windows without using CryptoAPI
  * https://blogs.msdn.microsoft.com/michael_howard/2005/01/14/cryptographically-secure-random-number-on-windows-without-using-cryptoapi/
@@ -749,7 +854,7 @@ typedef BOOLEAN (APIENTRY *RTLGENRANDOM_FUNC)(PVOID, ULONG);
 static int
 writeRandomBytes_RtlGenRandom(void * target, size_t count) {
   int success = 0;  /* full count bytes written? */
-  const HMODULE advapi32 = LoadLibrary("ADVAPI32.DLL");
+  const HMODULE advapi32 = _Expat_LoadLibrary(TEXT("ADVAPI32.DLL"));
 
   if (advapi32) {
     const RTLGENRANDOM_FUNC RtlGenRandom
@@ -768,6 +873,8 @@ writeRandomBytes_RtlGenRandom(void * target, size_t count) {
 #endif /* _WIN32 */
 
 
+#if ! defined(HAVE_ARC4RANDOM_BUF) && ! defined(HAVE_ARC4RANDOM)
+
 static unsigned long
 gather_time_entropy(void)
 {
@@ -780,16 +887,20 @@ gather_time_entropy(void)
   int gettimeofday_res;
 
   gettimeofday_res = gettimeofday(&tv, NULL);
+
+#if defined(NDEBUG)
+  (void)gettimeofday_res;
+#else
   assert (gettimeofday_res == 0);
+#endif  /* defined(NDEBUG) */
 
   /* Microseconds time is <20 bits entropy */
   return tv.tv_usec;
 #endif
 }
 
-#if defined(HAVE_ARC4RANDOM_BUF) && defined(HAVE_LIBBSD)
-# include <bsd/stdlib.h>
-#endif
+#endif  /* ! defined(HAVE_ARC4RANDOM_BUF) && ! defined(HAVE_ARC4RANDOM) */
+
 
 static unsigned long
 ENTROPY_DEBUG(const char * label, unsigned long entropy) {
@@ -808,10 +919,12 @@ generate_hash_secret_salt(XML_Parser parser)
 {
   unsigned long entropy;
   (void)parser;
-#if defined(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__)
-  (void)gather_time_entropy;
+#if defined(HAVE_ARC4RANDOM_BUF)
   arc4random_buf(&entropy, sizeof(entropy));
   return ENTROPY_DEBUG("arc4random_buf", entropy);
+#elif defined(HAVE_ARC4RANDOM)
+  writeRandomBytes_arc4random((void *)&entropy, sizeof(entropy));
+  return ENTROPY_DEBUG("arc4random", entropy);
 #else
   /* Try high quality providers first .. */
 #ifdef _WIN32
@@ -819,10 +932,15 @@ generate_hash_secret_salt(XML_Parser parser)
     return ENTROPY_DEBUG("RtlGenRandom", entropy);
   }
 #elif defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM)
-  if (writeRandomBytes_getrandom((void *)&entropy, sizeof(entropy))) {
+  if (writeRandomBytes_getrandom_nonblock((void *)&entropy, sizeof(entropy))) {
     return ENTROPY_DEBUG("getrandom", entropy);
   }
 #endif
+#if ! defined(_WIN32) && defined(XML_DEV_URANDOM)
+  if (writeRandomBytes_dev_urandom((void *)&entropy, sizeof(entropy))) {
+    return ENTROPY_DEBUG("/dev/urandom", entropy);
+  }
+#endif  /* ! defined(_WIN32) && defined(XML_DEV_URANDOM) */
   /* .. and self-made low quality for backup: */
 
   /* Process ID is 0 bits entropy if attacker has local access */
@@ -833,7 +951,7 @@ generate_hash_secret_salt(XML_Parser parser)
     return ENTROPY_DEBUG("fallback(4)", entropy * 2147483647);
   } else {
     return ENTROPY_DEBUG("fallback(8)",
-        entropy * (unsigned long)2305843009213693951);
+        entropy * (unsigned long)2305843009213693951ULL);
   }
 #endif
 }
@@ -962,6 +1080,8 @@ parserCreate(const XML_Char *encodingName,
   nsAttsVersion = 0;
   nsAttsPower = 0;
 
+  protocolEncodingName = NULL;
+
   poolInit(&tempPool, &(parser->m_mem));
   poolInit(&temp2Pool, &(parser->m_mem));
   parserInit(parser, encodingName);
@@ -988,9 +1108,9 @@ parserInit(XML_Parser parser, const XML_Char *encodingName)
 {
   processor = prologInitProcessor;
   XmlPrologStateInit(&prologState);
-  protocolEncodingName = (encodingName != NULL
-                          ? poolCopyString(&tempPool, encodingName)
-                          : NULL);
+  if (encodingName != NULL) {
+    protocolEncodingName = copyString(encodingName, &(parser->m_mem));
+  }
   curBase = NULL;
   XmlInitEncoding(&initEncoding, &encoding, 0);
   userData = NULL;
@@ -1103,6 +1223,8 @@ XML_ParserReset(XML_Parser parser, const XML_Char *encodingName)
     unknownEncodingRelease(unknownEncodingData);
   poolClear(&tempPool);
   poolClear(&temp2Pool);
+  FREE((void *)protocolEncodingName);
+  protocolEncodingName = NULL;
   parserInit(parser, encodingName);
   dtdReset(_dtd, &parser->m_mem);
   return XML_TRUE;
@@ -1119,10 +1241,16 @@ XML_SetEncoding(XML_Parser parser, const XML_Char *encodingName)
   */
   if (ps_parsing == XML_PARSING || ps_parsing == XML_SUSPENDED)
     return XML_STATUS_ERROR;
+
+  /* Get rid of any previous encoding name */
+  FREE((void *)protocolEncodingName);
+
   if (encodingName == NULL)
+    /* No new encoding name */
     protocolEncodingName = NULL;
   else {
-    protocolEncodingName = poolCopyString(&tempPool, encodingName);
+    /* Copy the new encoding name into allocated memory */
+    protocolEncodingName = copyString(encodingName, &(parser->m_mem));
     if (!protocolEncodingName)
       return XML_STATUS_ERROR;
   }
@@ -1357,6 +1485,7 @@ XML_ParserFree(XML_Parser parser)
   destroyBindings(inheritedBindings, parser);
   poolDestroy(&tempPool);
   poolDestroy(&temp2Pool);
+  FREE((void *)protocolEncodingName);
 #ifdef XML_DTD
   /* external parameter entity parsers share the DTD structure
      parser->m_dtd with the root parser, so we must not destroy it
@@ -1748,7 +1877,8 @@ enum XML_Status XMLCALL
 XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
 {
   if ((parser == NULL) || (len < 0) || ((s == NULL) && (len != 0))) {
-    errorCode = XML_ERROR_INVALID_ARGUMENT;
+    if (parser != NULL)
+      parser->m_errorCode = XML_ERROR_INVALID_ARGUMENT;
     return XML_STATUS_ERROR;
   }
   switch (ps_parsing) {
@@ -1783,9 +1913,22 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
     if (errorCode == XML_ERROR_NONE) {
       switch (ps_parsing) {
       case XML_SUSPENDED:
+        /* It is hard to be certain, but it seems that this case
+         * cannot occur.  This code is cleaning up a previous parse
+         * with no new data (since len == 0).  Changing the parsing
+         * state requires getting to execute a handler function, and
+         * there doesn't seem to be an opportunity for that while in
+         * this circumstance.
+         *
+         * Given the uncertainty, we retain the code but exclude it
+         * from coverage tests.
+         *
+         * LCOV_EXCL_START
+         */
         XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position);
         positionPtr = bufferPtr;
         return XML_STATUS_SUSPENDED;
+        /* LCOV_EXCL_STOP */
       case XML_INITIALIZED:
       case XML_PARSING:
         ps_parsing = XML_FINISHED;
@@ -2974,9 +3117,17 @@ doContent(XML_Parser parser,
         return XML_ERROR_NO_MEMORY;
       break;
     default:
+      /* All of the tokens produced by XmlContentTok() have their own
+       * explicit cases, so this default is not strictly necessary.
+       * However it is a useful safety net, so we retain the code and
+       * simply exclude it from the coverage tests.
+       *
+       * LCOV_EXCL_START
+       */
       if (defaultHandler)
         reportDefault(parser, enc, s, next);
       break;
+      /* LCOV_EXCL_STOP */
     }
     *eventPP = s = next;
     switch (ps_parsing) {
@@ -3067,13 +3218,17 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
 #endif
     attsSize = n + nDefaultAtts + INIT_ATTS_SIZE;
     temp = (ATTRIBUTE *)REALLOC((void *)atts, attsSize * sizeof(ATTRIBUTE));
-    if (temp == NULL)
+    if (temp == NULL) {
+      attsSize = oldAttsSize;
       return XML_ERROR_NO_MEMORY;
+    }
     atts = temp;
 #ifdef XML_ATTR_INFO
     temp2 = (XML_AttrInfo *)REALLOC((void *)attInfo, attsSize * sizeof(XML_AttrInfo));
-    if (temp2 == NULL)
+    if (temp2 == NULL) {
+      attsSize = oldAttsSize;
       return XML_ERROR_NO_MEMORY;
+    }
     attInfo = temp2;
 #endif
     if (n > oldAttsSize)
@@ -3210,6 +3365,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
     int j;  /* hash table index */
     unsigned long version = nsAttsVersion;
     int nsAttsSize = (int)1 << nsAttsPower;
+    unsigned char oldNsAttsPower = nsAttsPower;
     /* size of hash table must be at least 2 * (# of prefixed attributes) */
     if ((nPrefixes << 1) >> nsAttsPower) {  /* true for nsAttsPower = 0 */
       NS_ATT *temp;
@@ -3219,8 +3375,11 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
         nsAttsPower = 3;
       nsAttsSize = (int)1 << nsAttsPower;
       temp = (NS_ATT *)REALLOC(nsAtts, nsAttsSize * sizeof(NS_ATT));
-      if (!temp)
+      if (!temp) {
+        /* Restore actual size of memory in nsAtts */
+        nsAttsPower = oldNsAttsPower;
         return XML_ERROR_NO_MEMORY;
+      }
       nsAtts = temp;
       version = 0;  /* force re-initialization of nsAtts hash table */
     }
@@ -3247,8 +3406,23 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
 
         ((XML_Char *)s)[-1] = 0;  /* clear flag */
         id = (ATTRIBUTE_ID *)lookup(parser, &dtd->attributeIds, s, 0);
-        if (!id || !id->prefix)
-          return XML_ERROR_NO_MEMORY;
+        if (!id || !id->prefix) {
+          /* This code is walking through the appAtts array, dealing
+           * with (in this case) a prefixed attribute name.  To be in
+           * the array, the attribute must have already been bound, so
+           * has to have passed through the hash table lookup once
+           * already.  That implies that an entry for it already
+           * exists, so the lookup above will return a pointer to
+           * already allocated memory.  There is no opportunaity for
+           * the allocator to fail, so the condition above cannot be
+           * fulfilled.
+           *
+           * Since it is difficult to be certain that the above
+           * analysis is complete, we retain the test and merely
+           * remove the code from coverage tests.
+           */
+          return XML_ERROR_NO_MEMORY; /* LCOV_EXCL_LINE */
+        }
         b = id->prefix->binding;
         if (!b)
           return XML_ERROR_UNBOUND_PREFIX;
@@ -3625,8 +3799,16 @@ doCdataSection(XML_Parser parser,
       }
       return XML_ERROR_UNCLOSED_CDATA_SECTION;
     default:
+      /* Every token returned by XmlCdataSectionTok() has its own
+       * explicit case, so this default case will never be executed.
+       * We retain it as a safety net and exclude it from the coverage
+       * statistics.
+       *
+       * LCOV_EXCL_START
+      */
       *eventPP = next;
       return XML_ERROR_UNEXPECTED_STATE;
+      /* LCOV_EXCL_STOP */
     }
 
     *eventPP = s = next;
@@ -3686,8 +3868,20 @@ doIgnoreSection(XML_Parser parser,
     eventEndPP = &eventEndPtr;
   }
   else {
+    /* It's not entirely clear, but it seems the following two lines
+     * of code cannot be executed.  The only occasions on which 'enc'
+     * is not 'parser->m_encoding' are when this function is called
+     * from the internal entity processing, and IGNORE sections are an
+     * error in internal entities.
+     *
+     * Since it really isn't clear that this is true, we keep the code
+     * and just remove it from our coverage tests.
+     *
+     * LCOV_EXCL_START
+     */
     eventPP = &(openInternalEntities->internalEventPtr);
     eventEndPP = &(openInternalEntities->internalEventEndPtr);
+    /* LCOV_EXCL_STOP */
   }
   *eventPP = s;
   *startPtr = NULL;
@@ -3720,8 +3914,16 @@ doIgnoreSection(XML_Parser parser,
     }
     return XML_ERROR_SYNTAX; /* XML_ERROR_UNCLOSED_IGNORE_SECTION */
   default:
+    /* All of the tokens that XmlIgnoreSectionTok() returns have
+     * explicit cases to handle them, so this default case is never
+     * executed.  We keep it as a safety net anyway, and remove it
+     * from our test coverage statistics.
+     *
+     * LCOV_EXCL_START
+     */
     *eventPP = next;
     return XML_ERROR_UNEXPECTED_STATE;
+    /* LCOV_EXCL_STOP */
   }
   /* not reached */
 }
@@ -3734,6 +3936,7 @@ initializeEncoding(XML_Parser parser)
   const char *s;
 #ifdef XML_UNICODE
   char encodingBuf[128];
+  /* See comments abount `protoclEncodingName` in parserInit() */
   if (!protocolEncodingName)
     s = NULL;
   else {
@@ -3817,7 +4020,14 @@ processXmlDecl(XML_Parser parser, int isGeneralTextEntity,
     reportDefault(parser, encoding, s, next);
   if (protocolEncodingName == NULL) {
     if (newEncoding) {
-      if (newEncoding->minBytesPerChar != encoding->minBytesPerChar) {
+      /* Check that the specified encoding does not conflict with what
+       * the parser has already deduced.  Do we have the same number
+       * of bytes in the smallest representation of a character?  If
+       * this is UTF-16, is it the same endianness?
+       */
+      if (newEncoding->minBytesPerChar != encoding->minBytesPerChar
+          || (newEncoding->minBytesPerChar == 2 &&
+              newEncoding != encoding)) {
         eventPtr = encodingName;
         return XML_ERROR_INCORRECT_ENCODING;
       }
@@ -3962,15 +4172,14 @@ entityValueInitProcessor(XML_Parser parser,
       result = processXmlDecl(parser, 0, start, next);
       if (result != XML_ERROR_NONE)
         return result;
-      switch (ps_parsing) {
-      case XML_SUSPENDED:
-        *nextPtr = next;
-        return XML_ERROR_NONE;
-      case XML_FINISHED:
+      /* At this point, ps_parsing cannot be XML_SUSPENDED.  For that
+       * to happen, a parameter entity parsing handler must have
+       * attempted to suspend the parser, which fails and raises an
+       * error.  The parser can be aborted, but can't be suspended.
+       */
+      if (ps_parsing == XML_FINISHED)
         return XML_ERROR_ABORTED;
-      default:
-        *nextPtr = next;
-      }
+      *nextPtr = next;
       /* stop scanning for text declaration - we found one */
       processor = entityValueProcessor;
       return entityValueProcessor(parser, next, end, nextPtr);
@@ -4293,8 +4502,14 @@ doProlog(XML_Parser parser,
                                             &dtd->paramEntities,
                                             externalSubsetName,
                                             sizeof(ENTITY));
-          if (!entity)
-            return XML_ERROR_NO_MEMORY;
+          if (!entity) {
+            /* The external subset name "#" will have already been
+             * inserted into the hash table at the start of the
+             * external entity parsing, so no allocation will happen
+             * and lookup() cannot fail.
+             */
+            return XML_ERROR_NO_MEMORY; /* LCOV_EXCL_LINE */
+          }
           if (useForeignDTD)
             entity->base = curBase;
           dtd->paramEntityRead = XML_FALSE;
@@ -4773,8 +4988,10 @@ doProlog(XML_Parser parser,
       if (prologState.level >= groupSize) {
         if (groupSize) {
           char *temp = (char *)REALLOC(groupConnector, groupSize *= 2);
-          if (temp == NULL)
+          if (temp == NULL) {
+            groupSize /= 2;
             return XML_ERROR_NO_MEMORY;
+          }
           groupConnector = temp;
           if (dtd->scaffIndex) {
             int *temp = (int *)REALLOC(dtd->scaffIndex,
@@ -4786,8 +5003,10 @@ doProlog(XML_Parser parser,
         }
         else {
           groupConnector = (char *)MALLOC(groupSize = 32);
-          if (!groupConnector)
+          if (!groupConnector) {
+            groupSize = 0;
             return XML_ERROR_NO_MEMORY;
+          }
         }
       }
       groupConnector[prologState.level] = 0;
@@ -4850,8 +5069,29 @@ doProlog(XML_Parser parser,
              : !dtd->hasParamEntityRefs)) {
           if (!entity)
             return XML_ERROR_UNDEFINED_ENTITY;
-          else if (!entity->is_internal)
-            return XML_ERROR_ENTITY_DECLARED_IN_PE;
+          else if (!entity->is_internal) {
+            /* It's hard to exhaustively search the code to be sure,
+             * but there doesn't seem to be a way of executing the
+             * following line.  There are two cases:
+             *
+             * If 'standalone' is false, the DTD must have no
+             * parameter entities or we wouldn't have passed the outer
+             * 'if' statement.  That measn the only entity in the hash
+             * table is the external subset name "#" which cannot be
+             * given as a parameter entity name in XML syntax, so the
+             * lookup must have returned NULL and we don't even reach
+             * the test for an internal entity.
+             *
+             * If 'standalone' is true, it does not seem to be
+             * possible to create entities taking this code path that
+             * are not internal entities, so fail the test above.
+             *
+             * Because this analysis is very uncertain, the code is
+             * being left in place and merely removed from the
+             * coverage test statistics.
+             */
+            return XML_ERROR_ENTITY_DECLARED_IN_PE; /* LCOV_EXCL_LINE */
+          }
         }
         else if (!entity) {
           dtd->keepProcessing = dtd->standalone;
@@ -5323,11 +5563,15 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
             && (poolLength(pool) == 0 || poolLastChar(pool) == 0x20))
           break;
         n = XmlEncode(n, (ICHAR *)buf);
-        if (!n) {
-          if (enc == encoding)
-            eventPtr = ptr;
-          return XML_ERROR_BAD_CHAR_REF;
-        }
+        /* The XmlEncode() functions can never return 0 here.  That
+         * error return happens if the code point passed in is either
+         * negative or greater than or equal to 0x110000.  The
+         * XmlCharRefNumber() functions will all return a number
+         * strictly less than 0x110000 or a negative value if an error
+         * occurred.  The negative value is intercepted above, so
+         * XmlEncode() is never passed a value it might return an
+         * error for.
+         */
         for (i = 0; i < n; i++) {
           if (!poolAppendChar(pool, buf[i]))
             return XML_ERROR_NO_MEMORY;
@@ -5401,8 +5645,26 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
           break;
         }
         if (entity->open) {
-          if (enc == encoding)
-            eventPtr = ptr;
+          if (enc == encoding) {
+            /* It does not appear that this line can be executed.
+             *
+             * The "if (entity->open)" check catches recursive entity
+             * definitions.  In order to be called with an open
+             * entity, it must have gone through this code before and
+             * been through the recursive call to
+             * appendAttributeValue() some lines below.  That call
+             * sets the local encoding ("enc") to the parser's
+             * internal encoding (internal_utf8 or internal_utf16),
+             * which can never be the same as the principle encoding.
+             * It doesn't appear there is another code path that gets
+             * here with entity->open being TRUE.
+             *
+             * Since it is not certain that this logic is watertight,
+             * we keep the line and merely exclude it from coverage
+             * tests.
+             */
+            eventPtr = ptr; /* LCOV_EXCL_LINE */
+          }
           return XML_ERROR_RECURSIVE_ENTITY_REF;
         }
         if (entity->notation) {
@@ -5429,9 +5691,21 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
       }
       break;
     default:
+      /* The only token returned by XmlAttributeValueTok() that does
+       * not have an explicit case here is XML_TOK_PARTIAL_CHAR.
+       * Getting that would require an entity name to contain an
+       * incomplete XML character (e.g. \xE2\x82); however previous
+       * tokenisers will have already recognised and rejected such
+       * names before XmlAttributeValueTok() gets a look-in.  This
+       * default case should be retained as a safety net, but the code
+       * excluded from coverage tests.
+       *
+       * LCOV_EXCL_START
+       */
       if (enc == encoding)
         eventPtr = ptr;
       return XML_ERROR_UNEXPECTED_STATE;
+      /* LCOV_EXCL_STOP */
     }
     ptr = next;
   }
@@ -5564,12 +5838,15 @@ storeEntityValue(XML_Parser parser,
           goto endEntityValue;
         }
         n = XmlEncode(n, (ICHAR *)buf);
-        if (!n) {
-          if (enc == encoding)
-            eventPtr = entityTextPtr;
-          result = XML_ERROR_BAD_CHAR_REF;
-          goto endEntityValue;
-        }
+        /* The XmlEncode() functions can never return 0 here.  That
+         * error return happens if the code point passed in is either
+         * negative or greater than or equal to 0x110000.  The
+         * XmlCharRefNumber() functions will all return a number
+         * strictly less than 0x110000 or a negative value if an error
+         * occurred.  The negative value is intercepted above, so
+         * XmlEncode() is never passed a value it might return an
+         * error for.
+         */
         for (i = 0; i < n; i++) {
           if (pool->end == pool->ptr && !poolGrow(pool)) {
             result = XML_ERROR_NO_MEMORY;
@@ -5590,10 +5867,18 @@ storeEntityValue(XML_Parser parser,
       result = XML_ERROR_INVALID_TOKEN;
       goto endEntityValue;
     default:
+      /* This default case should be unnecessary -- all the tokens
+       * that XmlEntityValueTok() can return have their own explicit
+       * cases -- but should be retained for safety.  We do however
+       * exclude it from the coverage statistics.
+       *
+       * LCOV_EXCL_START
+       */
       if (enc == encoding)
         eventPtr = entityTextPtr;
       result = XML_ERROR_UNEXPECTED_STATE;
       goto endEntityValue;
+      /* LCOV_EXCL_STOP */
     }
     entityTextPtr = next;
   }
@@ -5691,8 +5976,25 @@ reportDefault(XML_Parser parser, const ENCODING *enc,
       eventEndPP = &eventEndPtr;
     }
     else {
+      /* To get here, two things must be true; the parser must be
+       * using a character encoding that is not the same as the
+       * encoding passed in, and the encoding passed in must need
+       * conversion to the internal format (UTF-8 unless XML_UNICODE
+       * is defined).  The only occasions on which the encoding passed
+       * in is not the same as the parser's encoding are when it is
+       * the internal encoding (e.g. a previously defined parameter
+       * entity, already converted to internal format).  This by
+       * definition doesn't need conversion, so the whole branch never
+       * gets executed.
+       *
+       * For safety's sake we don't delete these lines and merely
+       * exclude them from coverage statistics.
+       *
+       * LCOV_EXCL_START
+       */
       eventPP = &(openInternalEntities->internalEventPtr);
       eventEndPP = &(openInternalEntities->internalEventEndPtr);
+      /* LCOV_EXCL_STOP */
     }
     do {
       ICHAR *dataPtr = (ICHAR *)dataBuf;
@@ -5861,9 +6163,30 @@ getContext(XML_Parser parser)
     len = dtd->defaultPrefix.binding->uriLen;
     if (namespaceSeparator)
       len--;
-    for (i = 0; i < len; i++)
-      if (!poolAppendChar(&tempPool, dtd->defaultPrefix.binding->uri[i]))
-        return NULL;
+    for (i = 0; i < len; i++) {
+      if (!poolAppendChar(&tempPool, dtd->defaultPrefix.binding->uri[i])) {
+        /* Because of memory caching, I don't believe this line can be
+         * executed.
+         *
+         * This is part of a loop copying the default prefix binding
+         * URI into the parser's temporary string pool.  Previously,
+         * that URI was copied into the same string pool, with a
+         * terminating NUL character, as part of setContext().  When
+         * the pool was cleared, that leaves a block definitely big
+         * enough to hold the URI on the free block list of the pool.
+         * The URI copy in getContext() therefore cannot run out of
+         * memory.
+         *
+         * If the pool is used between the setContext() and
+         * getContext() calls, the worst it can do is leave a bigger
+         * block on the front of the free list.  Given that this is
+         * all somewhat inobvious and program logic can be changed, we
+         * don't delete the line but we do exclude it from the test
+         * coverage statistics.
+         */
+        return NULL; /* LCOV_EXCL_LINE */
+      }
+    }
     needSep = XML_TRUE;
   }
 
@@ -5875,8 +6198,15 @@ getContext(XML_Parser parser)
     PREFIX *prefix = (PREFIX *)hashTableIterNext(&iter);
     if (!prefix)
       break;
-    if (!prefix->binding)
-      continue;
+    if (!prefix->binding) {
+      /* This test appears to be (justifiable) paranoia.  There does
+       * not seem to be a way of injecting a prefix without a binding
+       * that doesn't get errored long before this function is called.
+       * The test should remain for safety's sake, so we instead
+       * exclude the following line from the coverage statistics.
+       */
+      continue; /* LCOV_EXCL_LINE */
+    }
     if (needSep && !poolAppendChar(&tempPool, CONTEXT_SEP))
       return NULL;
     for (s = prefix->name; *s; s++)
@@ -6547,8 +6877,20 @@ poolCopyString(STRING_POOL *pool, const XML_Char *s)
 static const XML_Char *
 poolCopyStringN(STRING_POOL *pool, const XML_Char *s, int n)
 {
-  if (!pool->ptr && !poolGrow(pool))
-    return NULL;
+  if (!pool->ptr && !poolGrow(pool)) {
+    /* The following line is unreachable given the current usage of
+     * poolCopyStringN().  Currently it is called from exactly one
+     * place to copy the text of a simple general entity.  By that
+     * point, the name of the entity is already stored in the pool, so
+     * pool->ptr cannot be NULL.
+     *
+     * If poolCopyStringN() is used elsewhere as it well might be,
+     * this line may well become executable again.  Regardless, this
+     * sort of check shouldn't be removed lightly, so we just exclude
+     * it from the coverage statistics.
+     */
+    return NULL; /* LCOV_EXCL_LINE */
+  }
   for (; n > 0; --n, s++) {
     if (!poolAppendChar(pool, *s))
       return NULL;
@@ -6641,8 +6983,19 @@ poolGrow(STRING_POOL *pool)
     int blockSize = (int)((unsigned)(pool->end - pool->start)*2U);
     size_t bytesToAllocate;
 
-    if (blockSize < 0)
-      return XML_FALSE;
+    // NOTE: Needs to be calculated prior to calling `realloc`
+    //       to avoid dangling pointers:
+    const ptrdiff_t offsetInsideBlock = pool->ptr - pool->start;
+
+    if (blockSize < 0) {
+      /* This condition traps a situation where either more than
+       * INT_MAX/2 bytes have already been allocated.  This isn't
+       * readily testable, since it is unlikely that an average
+       * machine will have that much memory, so we exclude it from the
+       * coverage statistics.
+       */
+      return XML_FALSE; /* LCOV_EXCL_LINE */
+    }
 
     bytesToAllocate = poolBytesToAllocateFor(blockSize);
     if (bytesToAllocate == 0)
@@ -6654,7 +7007,7 @@ poolGrow(STRING_POOL *pool)
       return XML_FALSE;
     pool->blocks = temp;
     pool->blocks->size = blockSize;
-    pool->ptr = pool->blocks->s + (pool->ptr - pool->start);
+    pool->ptr = pool->blocks->s + offsetInsideBlock;
     pool->start = pool->blocks->s;
     pool->end = pool->start + blockSize;
   }
@@ -6663,8 +7016,18 @@ poolGrow(STRING_POOL *pool)
     int blockSize = (int)(pool->end - pool->start);
     size_t bytesToAllocate;
 
-    if (blockSize < 0)
-      return XML_FALSE;
+    if (blockSize < 0) {
+      /* This condition traps a situation where either more than
+       * INT_MAX bytes have already been allocated (which is prevented
+       * by various pieces of program logic, not least this one, never
+       * mind the unlikelihood of actually having that much memory) or
+       * the pool control fields have been corrupted (which could
+       * conceivably happen in an extremely buggy user handler
+       * function).  Either way it isn't readily testable, so we
+       * exclude it from the coverage statistics.
+       */
+      return XML_FALSE;  /* LCOV_EXCL_LINE */
+    }
 
     if (blockSize < INIT_BLOCK_SIZE)
       blockSize = INIT_BLOCK_SIZE;
@@ -6827,3 +7190,26 @@ getElementType(XML_Parser parser,
   }
   return ret;
 }
+
+static XML_Char *
+copyString(const XML_Char *s,
+           const XML_Memory_Handling_Suite *memsuite)
+{
+    int charsRequired = 0;
+    XML_Char *result;
+
+    /* First determine how long the string is */
+    while (s[charsRequired] != 0) {
+      charsRequired++;
+    }
+    /* Include the terminator */
+    charsRequired++;
+
+    /* Now allocate space for the copy */
+    result = memsuite->malloc_fcn(charsRequired * sizeof(XML_Char));
+    if (result == NULL)
+        return NULL;
+    /* Copy the original into place */
+    memcpy(result, s, charsRequired * sizeof(XML_Char));
+    return result;
+}
diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c
index a7c56302796..c809ee51482 100644
--- a/Modules/expat/xmlrole.c
+++ b/Modules/expat/xmlrole.c
@@ -170,7 +170,14 @@ prolog1(PROLOG_STATE *state,
   case XML_TOK_COMMENT:
     return XML_ROLE_COMMENT;
   case XML_TOK_BOM:
-    return XML_ROLE_NONE;
+    /* This case can never arise.  To reach this role function, the
+     * parse must have passed through prolog0 and therefore have had
+     * some form of input, even if only a space.  At that point, a
+     * byte order mark is no longer a valid character (though
+     * technically it should be interpreted as a non-breaking space),
+     * so will be rejected by the tokenizing stages.
+     */
+    return XML_ROLE_NONE; /* LCOV_EXCL_LINE */
   case XML_TOK_DECL_OPEN:
     if (!XmlNameMatchesAscii(enc,
                              ptr + 2 * MIN_BYTES_PER_CHAR(enc),
@@ -1285,6 +1292,26 @@ declClose(PROLOG_STATE *state,
   return common(state, tok);
 }
 
+/* This function will only be invoked if the internal logic of the
+ * parser has broken down.  It is used in two cases:
+ *
+ * 1: When the XML prolog has been finished.  At this point the
+ * processor (the parser level above these role handlers) should
+ * switch from prologProcessor to contentProcessor and reinitialise
+ * the handler function.
+ *
+ * 2: When an error has been detected (via common() below).  At this
+ * point again the processor should be switched to errorProcessor,
+ * which will never call a handler.
+ *
+ * The result of this is that error() can only be called if the
+ * processor switch failed to happen, which is an internal error and
+ * therefore we shouldn't be able to provoke it simply by using the
+ * library.  It is a necessary backstop, however, so we merely exclude
+ * it from the coverage statistics.
+ *
+ * LCOV_EXCL_START
+ */
 static int PTRCALL
 error(PROLOG_STATE *UNUSED_P(state),
       int UNUSED_P(tok),
@@ -1294,6 +1321,7 @@ error(PROLOG_STATE *UNUSED_P(state),
 {
   return XML_ROLE_NONE;
 }
+/* LCOV_EXCL_STOP */
 
 static int FASTCALL
 common(PROLOG_STATE *state, int tok)
diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c
index cdf0720dd89..db4a5c8ca3e 100644
--- a/Modules/expat/xmltok.c
+++ b/Modules/expat/xmltok.c
@@ -1019,7 +1019,11 @@ streqci(const char *s1, const char *s2)
     if (ASCII_a <= c1 && c1 <= ASCII_z)
       c1 += ASCII_A - ASCII_a;
     if (ASCII_a <= c2 && c2 <= ASCII_z)
-      c2 += ASCII_A - ASCII_a;
+      /* The following line will never get executed.  streqci() is
+       * only called from two places, both of which guarantee to put
+       * upper-case strings into s2.
+       */
+      c2 += ASCII_A - ASCII_a; /* LCOV_EXCL_LINE */
     if (c1 != c2)
       return 0;
     if (!c1)
@@ -1291,7 +1295,7 @@ XmlUtf8Encode(int c, char *buf)
   };
 
   if (c < 0)
-    return 0;
+    return 0; /* LCOV_EXCL_LINE: this case is always eliminated beforehand */
   if (c < min2) {
     buf[0] = (char)(c | UTF8_cval1);
     return 1;
@@ -1314,7 +1318,7 @@ XmlUtf8Encode(int c, char *buf)
     buf[3] = (char)((c & 0x3f) | 0x80);
     return 4;
   }
-  return 0;
+  return 0; /* LCOV_EXCL_LINE: this case too is eliminated before calling */
 }
 
 int FASTCALL
@@ -1465,6 +1469,9 @@ XmlInitUnknownEncoding(void *mem,
     else if (c < 0) {
       if (c < -4)
         return 0;
+      /* Multi-byte sequences need a converter function */
+      if (!convert)
+        return 0;
       e->normal.type[i] = (unsigned char)(BT_LEAD2 - (c + 2));
       e->utf8[i][0] = 0;
       e->utf16[i] = 0;
diff --git a/Modules/expat/xmltok_impl.c b/Modules/expat/xmltok_impl.c
index 5f779c0571b..4fa1ff679ce 100644
--- a/Modules/expat/xmltok_impl.c
+++ b/Modules/expat/xmltok_impl.c
@@ -1198,8 +1198,14 @@ PREFIX(attributeValueTok)(const ENCODING *enc, const char *ptr,
   const char *start;
   if (ptr >= end)
     return XML_TOK_NONE;
-  else if (! HAS_CHAR(enc, ptr, end))
-    return XML_TOK_PARTIAL;
+  else if (! HAS_CHAR(enc, ptr, end)) {
+    /* This line cannot be executed.  The incoming data has already
+     * been tokenized once, so incomplete characters like this have
+     * already been eliminated from the input.  Retaining the paranoia
+     * check is still valuable, however.
+     */
+    return XML_TOK_PARTIAL; /* LCOV_EXCL_LINE */
+  }
   start = ptr;
   while (HAS_CHAR(enc, ptr, end)) {
     switch (BYTE_TYPE(enc, ptr)) {
@@ -1258,8 +1264,14 @@ PREFIX(entityValueTok)(const ENCODING *enc, const char *ptr,
   const char *start;
   if (ptr >= end)
     return XML_TOK_NONE;
-  else if (! HAS_CHAR(enc, ptr, end))
-    return XML_TOK_PARTIAL;
+  else if (! HAS_CHAR(enc, ptr, end)) {
+    /* This line cannot be executed.  The incoming data has already
+     * been tokenized once, so incomplete characters like this have
+     * already been eliminated from the input.  Retaining the paranoia
+     * check is still valuable, however.
+     */
+    return XML_TOK_PARTIAL; /* LCOV_EXCL_LINE */
+  }
   start = ptr;
   while (HAS_CHAR(enc, ptr, end)) {
     switch (BYTE_TYPE(enc, ptr)) {
@@ -1614,6 +1626,14 @@ PREFIX(predefinedEntityName)(const ENCODING *UNUSED_P(enc), const char *ptr,
   return 0;
 }
 
+/* This function does not appear to be called from anywhere within the
+ * library code.  It is used via the macro XmlSameName(), which is
+ * defined but never used.  Since it appears in the encoding function
+ * table, removing it is not a thing to be undertaken lightly.  For
+ * the moment, we simply exclude it from coverage tests.
+ *
+ * LCOV_EXCL_START
+ */
 static int PTRCALL
 PREFIX(sameName)(const ENCODING *enc, const char *ptr1, const char *ptr2)
 {
@@ -1677,14 +1697,21 @@ PREFIX(sameName)(const ENCODING *enc, const char *ptr1, const char *ptr2)
   }
   /* not reached */
 }
+/* LCOV_EXCL_STOP */
 
 static int PTRCALL
 PREFIX(nameMatchesAscii)(const ENCODING *UNUSED_P(enc), const char *ptr1,
                          const char *end1, const char *ptr2)
 {
   for (; *ptr2; ptr1 += MINBPC(enc), ptr2++) {
-    if (end1 - ptr1 < MINBPC(enc))
-      return 0;
+    if (end1 - ptr1 < MINBPC(enc)) {
+      /* This line cannot be executed.  THe incoming data has already
+       * been tokenized once, so imcomplete characters like this have
+       * already been eliminated from the input.  Retaining the
+       * paranoia check is still valuable, however.
+       */
+      return 0; /* LCOV_EXCL_LINE */
+    }
     if (!CHAR_MATCHES(enc, ptr1, *ptr2))
       return 0;
   }
diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
index 639ba479db5..0db61f20818 100644
--- a/PCbuild/_elementtree.vcxproj
+++ b/PCbuild/_elementtree.vcxproj
@@ -87,6 +87,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Modules\_elementtree.c" />
+    <ClCompile Include="..\Modules\expat\loadlibrary.c" />
     <ClCompile Include="..\Modules\expat\xmlparse.c" />
     <ClCompile Include="..\Modules\expat\xmlrole.c" />
     <ClCompile Include="..\Modules\expat\xmltok.c" />
diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters
index ee78295fa94..4597ee521b3 100644
--- a/PCbuild/_elementtree.vcxproj.filters
+++ b/PCbuild/_elementtree.vcxproj.filters
@@ -33,6 +33,9 @@
     <ClInclude Include="..\Modules\expat\latin1tab.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\Modules\expat\loadlibrary.c">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\Modules\expat\macconfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -69,4 +72,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
index a2763f02063..51ca69e95d7 100644
--- a/PCbuild/pyexpat.vcxproj
+++ b/PCbuild/pyexpat.vcxproj
@@ -68,6 +68,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Modules\pyexpat.c" />
+    <ClCompile Include="..\Modules\expat\loadlibrary.c" />
     <ClCompile Include="..\Modules\expat\xmlparse.c" />
     <ClCompile Include="..\Modules\expat\xmlrole.c" />
     <ClCompile Include="..\Modules\expat\xmltok.c" />
@@ -84,4 +85,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters
index abf362fb0bf..cb02847980c 100644
--- a/PCbuild/pyexpat.vcxproj.filters
+++ b/PCbuild/pyexpat.vcxproj.filters
@@ -20,6 +20,9 @@
     <ClCompile Include="..\Modules\pyexpat.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\Modules\expat\loadlibrary.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\Modules\expat\xmlparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -30,4 +33,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/setup.py b/setup.py
index 41aad8210d8..f3c2538345e 100644
--- a/setup.py
+++ b/setup.py
@@ -1525,6 +1525,9 @@ class db_found(Exception): pass
             expat_inc = [os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')]
             define_macros = [
                 ('HAVE_EXPAT_CONFIG_H', '1'),
+                # bpo-30947: Python uses best available entropy sources to
+                # call XML_SetHashSalt(), expat entropy sources are not needed
+                ('XML_POOR_ENTROPY', '1'),
             ]
             expat_lib = []
             expat_sources = ['expat/xmlparse.c',


From webhook-mailer at python.org  Fri Aug 18 17:47:57 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 18 Aug 2017 21:47:57 -0000
Subject: [Python-checkins] bpo-30830: test_logging uses
 threading_setup/cleanup (#3137)
Message-ID: <mailman.55.1503092881.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/6966960468327c958b03391f71f24986bd697307
commit: 6966960468327c958b03391f71f24986bd697307
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-18T23:47:54+02:00
summary:

bpo-30830: test_logging uses threading_setup/cleanup (#3137)

* bpo-30830: test_logging uses threading_setup/cleanup

Replace @support.reap_threads on some methods with
support.threading_setup() in setUp() and support.threading_cleanup()
in tearDown() in BaseTest.

* bpo-30830: test_logging disables threaded socketserver tests

Disable tests because of socketserver.ThreadingMixIn leaks threads,
whereas leaking threads now makes a test to fail on buildbots.

Disable tests until socketserver is fixed: bpo-31233.

* Skip also setup_via_listener()

files:
M Lib/test/test_logging.py

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index a91cfd4ccd3..226532a9792 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -79,6 +79,8 @@ class BaseTest(unittest.TestCase):
     def setUp(self):
         """Setup the default logging stream to an internal StringIO instance,
         so that we can examine log output as we want."""
+        self._threading_key = support.threading_setup()
+
         logger_dict = logging.getLogger().manager.loggerDict
         logging._acquireLock()
         try:
@@ -147,6 +149,9 @@ def tearDown(self):
         finally:
             logging._releaseLock()
 
+        self.doCleanups()
+        support.threading_cleanup(*self._threading_key)
+
     def assert_log_lines(self, expected_values, stream=None, pat=None):
         """Match the collected log lines against the regular expression
         self.expected_log_pat, and compare the extracted group values to
@@ -621,7 +626,6 @@ def test_path_objects(self):
 
     @unittest.skipIf(os.name == 'nt', 'WatchedFileHandler not appropriate for Windows.')
     @unittest.skipUnless(threading, 'Threading required for this test.')
-    @support.reap_threads
     def test_race(self):
         # Issue #14632 refers.
         def remove_loop(fname, tries):
@@ -986,7 +990,6 @@ class TestUnixDatagramServer(TestUDPServer):
 class SMTPHandlerTest(BaseTest):
     TIMEOUT = 8.0
 
-    @support.reap_threads
     def test_basic(self):
         sockmap = {}
         server = TestSMTPServer((support.HOST, 0), self.process_message, 0.001,
@@ -1466,6 +1469,7 @@ def test_logger_disabling(self):
         self.assertFalse(logger.disabled)
 
 
+ at unittest.skipIf(True, "FIXME: bpo-30830")
 @unittest.skipUnless(threading, 'Threading required for this test.')
 class SocketHandlerTest(BaseTest):
 
@@ -1565,6 +1569,7 @@ def _get_temp_domain_socket():
     os.remove(fn)
     return fn
 
+ at unittest.skipIf(True, "FIXME: bpo-30830")
 @unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")
 @unittest.skipUnless(threading, 'Threading required for this test.')
 class UnixSocketHandlerTest(SocketHandlerTest):
@@ -1583,6 +1588,7 @@ def tearDown(self):
         SocketHandlerTest.tearDown(self)
         support.unlink(self.address)
 
+ at unittest.skipIf(True, "FIXME: bpo-30830")
 @unittest.skipUnless(threading, 'Threading required for this test.')
 class DatagramHandlerTest(BaseTest):
 
@@ -1649,6 +1655,7 @@ def test_output(self):
         self.handled.wait()
         self.assertEqual(self.log_output, "spam\neggs\n")
 
+ at unittest.skipIf(True, "FIXME: bpo-30830")
 @unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")
 @unittest.skipUnless(threading, 'Threading required for this test.')
 class UnixDatagramHandlerTest(DatagramHandlerTest):
@@ -1736,6 +1743,7 @@ def test_output(self):
         self.handled.wait()
         self.assertEqual(self.log_output, b'<11>h\xc3\xa4m-sp\xc3\xa4m')
 
+ at unittest.skipIf(True, "FIXME: bpo-30830")
 @unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")
 @unittest.skipUnless(threading, 'Threading required for this test.')
 class UnixSysLogHandlerTest(SysLogHandlerTest):
@@ -1754,6 +1762,7 @@ def tearDown(self):
         SysLogHandlerTest.tearDown(self)
         support.unlink(self.address)
 
+ at unittest.skipIf(True, "FIXME: bpo-30830")
 @unittest.skipUnless(support.IPV6_ENABLED,
                      'IPv6 support required for this test.')
 @unittest.skipUnless(threading, 'Threading required for this test.')
@@ -1795,7 +1804,6 @@ def handle_request(self, request):
         request.end_headers()
         self.handled.set()
 
-    @support.reap_threads
     def test_output(self):
         # The log message sent to the HTTPHandler is properly received.
         logger = logging.getLogger("http")
@@ -2879,6 +2887,9 @@ def test_config14_ok(self):
             logging.warning('Exclamation')
             self.assertTrue(output.getvalue().endswith('Exclamation!\n'))
 
+    # listen() uses ConfigSocketReceiver which is based
+    # on socketserver.ThreadingTCPServer
+    @unittest.skipIf(True, "FIXME: bpo-30830")
     @unittest.skipUnless(threading, 'listen() needs threading to work')
     def setup_via_listener(self, text, verify=None):
         text = text.encode("utf-8")
@@ -2911,7 +2922,6 @@ def setup_via_listener(self, text, verify=None):
                 self.fail("join() timed out")
 
     @unittest.skipUnless(threading, 'Threading required for this test.')
-    @support.reap_threads
     def test_listen_config_10_ok(self):
         with support.captured_stdout() as output:
             self.setup_via_listener(json.dumps(self.config10))
@@ -2932,7 +2942,6 @@ def test_listen_config_10_ok(self):
             ], stream=output)
 
     @unittest.skipUnless(threading, 'Threading required for this test.')
-    @support.reap_threads
     def test_listen_config_1_ok(self):
         with support.captured_stdout() as output:
             self.setup_via_listener(textwrap.dedent(ConfigFileTest.config1))
@@ -2948,7 +2957,6 @@ def test_listen_config_1_ok(self):
             self.assert_log_lines([])
 
     @unittest.skipUnless(threading, 'Threading required for this test.')
-    @support.reap_threads
     def test_listen_verify(self):
 
         def verify_fail(stuff):
@@ -3232,7 +3240,6 @@ def setup_and_log(log_queue, ident):
             handler.close()
 
         @patch.object(logging.handlers.QueueListener, 'handle')
-        @support.reap_threads
         def test_handle_called_with_queue_queue(self, mock_handle):
             for i in range(self.repeat):
                 log_queue = queue.Queue()
@@ -3242,7 +3249,6 @@ def test_handle_called_with_queue_queue(self, mock_handle):
 
         @support.requires_multiprocessing_queue
         @patch.object(logging.handlers.QueueListener, 'handle')
-        @support.reap_threads
         def test_handle_called_with_mp_queue(self, mock_handle):
             for i in range(self.repeat):
                 log_queue = multiprocessing.Queue()
@@ -3261,7 +3267,6 @@ def get_all_from_queue(log_queue):
                 return []
 
         @support.requires_multiprocessing_queue
-        @support.reap_threads
         def test_no_messages_in_queue_after_stop(self):
             """
             Five messages are logged then the QueueListener is stopped. This


From webhook-mailer at python.org  Fri Aug 18 18:34:03 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 18 Aug 2017 22:34:03 -0000
Subject: [Python-checkins] bpo-31235: Fix ResourceWarning in test_logging
 (#3147)
Message-ID: <mailman.56.1503095646.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/a7719e27b3cad0f2b86cb932a76cbe55c541b02e
commit: a7719e27b3cad0f2b86cb932a76cbe55c541b02e
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-19T00:34:00+02:00
summary:

bpo-31235: Fix ResourceWarning in test_logging (#3147)

files:
M Lib/test/test_logging.py

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 226532a9792..f4aef9f8962 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -797,6 +797,8 @@ def stop(self, timeout=None):
             """
             self.close()
             self._thread.join(timeout)
+            asyncore.close_all(map=self._map, ignore_all=True)
+
             alive = self._thread.is_alive()
             self._thread = None
             if alive:


From webhook-mailer at python.org  Fri Aug 18 18:34:58 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Fri, 18 Aug 2017 22:34:58 -0000
Subject: [Python-checkins] bpo-31206: IDLE: Factor HighPage class from
 ConfigDialog (#3141)
Message-ID: <mailman.57.1503095703.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/a32e40561a24de373d1c5a437a8aa329758ba8e4
commit: a32e40561a24de373d1c5a437a8aa329758ba8e4
branch: master
author: Cheryl Sabella <cheryl.sabella at gmail.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-08-18T18:34:55-04:00
summary:

bpo-31206: IDLE: Factor HighPage class from ConfigDialog (#3141)

This is the first half of a patch similar to the one for for bpo-31205.  It is being split into 2 PRs to avoid what happened with PR-3096 -- an incomprehensible diff that could not be cleanly backported to 3.6.  This half copies several methods of ConfigDialog and turns them into a new class.

files:
A Misc/NEWS.d/next/IDLE/2017-08-18-14-13-42.bpo-31206.F1-tKK.rst
M Lib/idlelib/configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index a36bf83ad0f..587f16ec9df 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -1290,6 +1290,649 @@ def var_changed_space_num(self, *params):
         changes.add_option('main', 'Indent', 'num-spaces', value)
 
 
+class HighPage(Frame):
+
+    def __init__(self, master):
+        super().__init__(master)
+        self.cd = master.master
+        self.create_page_highlight()
+        self.load_theme_cfg()
+
+    def create_page_highlight(self):
+        """Return frame of widgets for Highlighting tab.
+
+        Enable users to provisionally change foreground and background
+        colors applied to textual tags.  Color mappings are stored in
+        complete listings called themes.  Built-in themes in
+        idlelib/config-highlight.def are fixed as far as the dialog is
+        concerned. Any theme can be used as the base for a new custom
+        theme, stored in .idlerc/config-highlight.cfg.
+
+        Function load_theme_cfg() initializes tk variables and theme
+        lists and calls paint_theme_sample() and set_highlight_target()
+        for the current theme.  Radiobuttons builtin_theme_on and
+        custom_theme_on toggle var theme_source, which controls if the
+        current set of colors are from a builtin or custom theme.
+        DynOptionMenus builtinlist and customlist contain lists of the
+        builtin and custom themes, respectively, and the current item
+        from each list is stored in vars builtin_name and custom_name.
+
+        Function paint_theme_sample() applies the colors from the theme
+        to the tags in text widget highlight_sample and then invokes
+        set_color_sample().  Function set_highlight_target() sets the state
+        of the radiobuttons fg_on and bg_on based on the tag and it also
+        invokes set_color_sample().
+
+        Function set_color_sample() sets the background color for the frame
+        holding the color selector.  This provides a larger visual of the
+        color for the current tag and plane (foreground/background).
+
+        Note: set_color_sample() is called from many places and is often
+        called more than once when a change is made.  It is invoked when
+        foreground or background is selected (radiobuttons), from
+        paint_theme_sample() (theme is changed or load_cfg is called), and
+        from set_highlight_target() (target tag is changed or load_cfg called).
+
+        Button delete_custom invokes delete_custom() to delete
+        a custom theme from idleConf.userCfg['highlight'] and changes.
+        Button save_custom invokes save_as_new_theme() which calls
+        get_new_theme_name() and create_new() to save a custom theme
+        and its colors to idleConf.userCfg['highlight'].
+
+        Radiobuttons fg_on and bg_on toggle var fg_bg_toggle to control
+        if the current selected color for a tag is for the foreground or
+        background.
+
+        DynOptionMenu targetlist contains a readable description of the
+        tags applied to Python source within IDLE.  Selecting one of the
+        tags from this list populates highlight_target, which has a callback
+        function set_highlight_target().
+
+        Text widget highlight_sample displays a block of text (which is
+        mock Python code) in which is embedded the defined tags and reflects
+        the color attributes of the current theme and changes for those tags.
+        Mouse button 1 allows for selection of a tag and updates
+        highlight_target with that tag value.
+
+        Note: The font in highlight_sample is set through the config in
+        the fonts tab.
+
+        In other words, a tag can be selected either from targetlist or
+        by clicking on the sample text within highlight_sample.  The
+        plane (foreground/background) is selected via the radiobutton.
+        Together, these two (tag and plane) control what color is
+        shown in set_color_sample() for the current theme.  Button set_color
+        invokes get_color() which displays a ColorChooser to change the
+        color for the selected tag/plane.  If a new color is picked,
+        it will be saved to changes and the highlight_sample and
+        frame background will be updated.
+
+        Tk Variables:
+            color: Color of selected target.
+            builtin_name: Menu variable for built-in theme.
+            custom_name: Menu variable for custom theme.
+            fg_bg_toggle: Toggle for foreground/background color.
+                Note: this has no callback.
+            theme_source: Selector for built-in or custom theme.
+            highlight_target: Menu variable for the highlight tag target.
+
+        Instance Data Attributes:
+            theme_elements: Dictionary of tags for text highlighting.
+                The key is the display name and the value is a tuple of
+                (tag name, display sort order).
+
+        Methods [attachment]:
+            load_theme_cfg: Load current highlight colors.
+            get_color: Invoke colorchooser [button_set_color].
+            set_color_sample_binding: Call set_color_sample [fg_bg_toggle].
+            set_highlight_target: set fg_bg_toggle, set_color_sample().
+            set_color_sample: Set frame background to target.
+            on_new_color_set: Set new color and add option.
+            paint_theme_sample: Recolor sample.
+            get_new_theme_name: Get from popup.
+            create_new: Combine theme with changes and save.
+            save_as_new_theme: Save [button_save_custom].
+            set_theme_type: Command for [theme_source].
+            delete_custom: Activate default [button_delete_custom].
+            save_new: Save to userCfg['theme'] (is function).
+
+        Widgets of highlights page frame:  (*) widgets bound to self
+            frame_custom: LabelFrame
+                (*)highlight_sample: Text
+                (*)frame_color_set: Frame
+                    (*)button_set_color: Button
+                    (*)targetlist: DynOptionMenu - highlight_target
+                frame_fg_bg_toggle: Frame
+                    (*)fg_on: Radiobutton - fg_bg_toggle
+                    (*)bg_on: Radiobutton - fg_bg_toggle
+                (*)button_save_custom: Button
+            frame_theme: LabelFrame
+                theme_type_title: Label
+                (*)builtin_theme_on: Radiobutton - theme_source
+                (*)custom_theme_on: Radiobutton - theme_source
+                (*)builtinlist: DynOptionMenu - builtin_name
+                (*)customlist: DynOptionMenu - custom_name
+                (*)button_delete_custom: Button
+                (*)theme_message: Label
+        """
+        self.theme_elements = {
+            'Normal Text': ('normal', '00'),
+            'Python Keywords': ('keyword', '01'),
+            'Python Definitions': ('definition', '02'),
+            'Python Builtins': ('builtin', '03'),
+            'Python Comments': ('comment', '04'),
+            'Python Strings': ('string', '05'),
+            'Selected Text': ('hilite', '06'),
+            'Found Text': ('hit', '07'),
+            'Cursor': ('cursor', '08'),
+            'Editor Breakpoint': ('break', '09'),
+            'Shell Normal Text': ('console', '10'),
+            'Shell Error Text': ('error', '11'),
+            'Shell Stdout Text': ('stdout', '12'),
+            'Shell Stderr Text': ('stderr', '13'),
+            }
+        self.builtin_name = tracers.add(
+                StringVar(self), self.var_changed_builtin_name)
+        self.custom_name = tracers.add(
+                StringVar(self), self.var_changed_custom_name)
+        self.fg_bg_toggle = BooleanVar(self)
+        self.color = tracers.add(
+                StringVar(self), self.var_changed_color)
+        self.theme_source = tracers.add(
+                BooleanVar(self), self.var_changed_theme_source)
+        self.highlight_target = tracers.add(
+                StringVar(self), self.var_changed_highlight_target)
+
+        # Create widgets:
+        # body frame and section frames.
+        frame_custom = LabelFrame(self, borderwidth=2, relief=GROOVE,
+                                  text=' Custom Highlighting ')
+        frame_theme = LabelFrame(self, borderwidth=2, relief=GROOVE,
+                                 text=' Highlighting Theme ')
+        # frame_custom.
+        text = self.highlight_sample = Text(
+                frame_custom, relief=SOLID, borderwidth=1,
+                font=('courier', 12, ''), cursor='hand2', width=21, height=13,
+                takefocus=FALSE, highlightthickness=0, wrap=NONE)
+        text.bind('<Double-Button-1>', lambda e: 'break')
+        text.bind('<B1-Motion>', lambda e: 'break')
+        text_and_tags=(('\n', 'normal'),
+            ('#you can click here', 'comment'), ('\n', 'normal'),
+            ('#to choose items', 'comment'), ('\n', 'normal'),
+            ('def', 'keyword'), (' ', 'normal'),
+            ('func', 'definition'), ('(param):\n  ', 'normal'),
+            ('"""string"""', 'string'), ('\n  var0 = ', 'normal'),
+            ("'string'", 'string'), ('\n  var1 = ', 'normal'),
+            ("'selected'", 'hilite'), ('\n  var2 = ', 'normal'),
+            ("'found'", 'hit'), ('\n  var3 = ', 'normal'),
+            ('list', 'builtin'), ('(', 'normal'),
+            ('None', 'keyword'), (')\n', 'normal'),
+            ('  breakpoint("line")', 'break'), ('\n\n', 'normal'),
+            (' error ', 'error'), (' ', 'normal'),
+            ('cursor |', 'cursor'), ('\n ', 'normal'),
+            ('shell', 'console'), (' ', 'normal'),
+            ('stdout', 'stdout'), (' ', 'normal'),
+            ('stderr', 'stderr'), ('\n\n', 'normal'))
+        for texttag in text_and_tags:
+            text.insert(END, texttag[0], texttag[1])
+        for element in self.theme_elements:
+            def tem(event, elem=element):
+                event.widget.winfo_toplevel().highlight_target.set(elem)
+            text.tag_bind(
+                    self.theme_elements[element][0], '<ButtonPress-1>', tem)
+        text['state'] = DISABLED
+        self.frame_color_set = Frame(frame_custom, relief=SOLID, borderwidth=1)
+        frame_fg_bg_toggle = Frame(frame_custom)
+        self.button_set_color = Button(
+                self.frame_color_set, text='Choose Color for :',
+                command=self.get_color, highlightthickness=0)
+        self.targetlist = DynOptionMenu(
+                self.frame_color_set, self.highlight_target, None,
+                highlightthickness=0) #, command=self.set_highlight_targetBinding
+        self.fg_on = Radiobutton(
+                frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=1,
+                text='Foreground', command=self.set_color_sample_binding)
+        self.bg_on = Radiobutton(
+                frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=0,
+                text='Background', command=self.set_color_sample_binding)
+        self.fg_bg_toggle.set(1)
+        self.button_save_custom = Button(
+                frame_custom, text='Save as New Custom Theme',
+                command=self.save_as_new_theme)
+        # frame_theme.
+        theme_type_title = Label(frame_theme, text='Select : ')
+        self.builtin_theme_on = Radiobutton(
+                frame_theme, variable=self.theme_source, value=1,
+                command=self.set_theme_type, text='a Built-in Theme')
+        self.custom_theme_on = Radiobutton(
+                frame_theme, variable=self.theme_source, value=0,
+                command=self.set_theme_type, text='a Custom Theme')
+        self.builtinlist = DynOptionMenu(
+                frame_theme, self.builtin_name, None, command=None)
+        self.customlist = DynOptionMenu(
+                frame_theme, self.custom_name, None, command=None)
+        self.button_delete_custom = Button(
+                frame_theme, text='Delete Custom Theme',
+                command=self.delete_custom)
+        self.theme_message = Label(frame_theme, bd=2)
+
+        # Pack widgets:
+        # body.
+        frame_custom.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
+        frame_theme.pack(side=LEFT, padx=5, pady=5, fill=Y)
+        # frame_custom.
+        self.frame_color_set.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=X)
+        frame_fg_bg_toggle.pack(side=TOP, padx=5, pady=0)
+        self.highlight_sample.pack(
+                side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
+        self.button_set_color.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=4)
+        self.targetlist.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=3)
+        self.fg_on.pack(side=LEFT, anchor=E)
+        self.bg_on.pack(side=RIGHT, anchor=W)
+        self.button_save_custom.pack(side=BOTTOM, fill=X, padx=5, pady=5)
+        # frame_theme.
+        theme_type_title.pack(side=TOP, anchor=W, padx=5, pady=5)
+        self.builtin_theme_on.pack(side=TOP, anchor=W, padx=5)
+        self.custom_theme_on.pack(side=TOP, anchor=W, padx=5, pady=2)
+        self.builtinlist.pack(side=TOP, fill=X, padx=5, pady=5)
+        self.customlist.pack(side=TOP, fill=X, anchor=W, padx=5, pady=5)
+        self.button_delete_custom.pack(side=TOP, fill=X, padx=5, pady=5)
+        self.theme_message.pack(side=TOP, fill=X, pady=5)
+
+    def load_theme_cfg(self):
+        """Load current configuration settings for the theme options.
+
+        Based on the theme_source toggle, the theme is set as
+        either builtin or custom and the initial widget values
+        reflect the current settings from idleConf.
+
+        Attributes updated:
+            theme_source: Set from idleConf.
+            builtinlist: List of default themes from idleConf.
+            customlist: List of custom themes from idleConf.
+            custom_theme_on: Disabled if there are no custom themes.
+            custom_theme: Message with additional information.
+            targetlist: Create menu from self.theme_elements.
+
+        Methods:
+            set_theme_type
+            paint_theme_sample
+            set_highlight_target
+        """
+        # Set current theme type radiobutton.
+        self.theme_source.set(idleConf.GetOption(
+                'main', 'Theme', 'default', type='bool', default=1))
+        # Set current theme.
+        current_option = idleConf.CurrentTheme()
+        # Load available theme option menus.
+        if self.theme_source.get():  # Default theme selected.
+            item_list = idleConf.GetSectionList('default', 'highlight')
+            item_list.sort()
+            self.builtinlist.SetMenu(item_list, current_option)
+            item_list = idleConf.GetSectionList('user', 'highlight')
+            item_list.sort()
+            if not item_list:
+                self.custom_theme_on['state'] = DISABLED
+                self.custom_name.set('- no custom themes -')
+            else:
+                self.customlist.SetMenu(item_list, item_list[0])
+        else:  # User theme selected.
+            item_list = idleConf.GetSectionList('user', 'highlight')
+            item_list.sort()
+            self.customlist.SetMenu(item_list, current_option)
+            item_list = idleConf.GetSectionList('default', 'highlight')
+            item_list.sort()
+            self.builtinlist.SetMenu(item_list, item_list[0])
+        self.set_theme_type()
+        # Load theme element option menu.
+        theme_names = list(self.theme_elements.keys())
+        theme_names.sort(key=lambda x: self.theme_elements[x][1])
+        self.targetlist.SetMenu(theme_names, theme_names[0])
+        self.paint_theme_sample()
+        self.set_highlight_target()
+
+    def var_changed_builtin_name(self, *params):
+        """Process new builtin theme selection.
+
+        Add the changed theme's name to the changed_items and recreate
+        the sample with the values from the selected theme.
+        """
+        old_themes = ('IDLE Classic', 'IDLE New')
+        value = self.builtin_name.get()
+        if value not in old_themes:
+            if idleConf.GetOption('main', 'Theme', 'name') not in old_themes:
+                changes.add_option('main', 'Theme', 'name', old_themes[0])
+            changes.add_option('main', 'Theme', 'name2', value)
+            self.theme_message['text'] = 'New theme, see Help'
+            self.theme_message['fg'] = '#500000'
+        else:
+            changes.add_option('main', 'Theme', 'name', value)
+            changes.add_option('main', 'Theme', 'name2', '')
+            self.theme_message['text'] = ''
+            self.theme_message['fg'] = 'black'
+        self.paint_theme_sample()
+
+    def var_changed_custom_name(self, *params):
+        """Process new custom theme selection.
+
+        If a new custom theme is selected, add the name to the
+        changed_items and apply the theme to the sample.
+        """
+        value = self.custom_name.get()
+        if value != '- no custom themes -':
+            changes.add_option('main', 'Theme', 'name', value)
+            self.paint_theme_sample()
+
+    def var_changed_theme_source(self, *params):
+        """Process toggle between builtin and custom theme.
+
+        Update the default toggle value and apply the newly
+        selected theme type.
+        """
+        value = self.theme_source.get()
+        changes.add_option('main', 'Theme', 'default', value)
+        if value:
+            self.var_changed_builtin_name()
+        else:
+            self.var_changed_custom_name()
+
+    def var_changed_color(self, *params):
+        "Process change to color choice."
+        self.on_new_color_set()
+
+    def var_changed_highlight_target(self, *params):
+        "Process selection of new target tag for highlighting."
+        self.set_highlight_target()
+
+    def set_theme_type(self):
+        """Set available screen options based on builtin or custom theme.
+
+        Attributes accessed:
+            theme_source
+
+        Attributes updated:
+            builtinlist
+            customlist
+            button_delete_custom
+            custom_theme_on
+
+        Called from:
+            handler for builtin_theme_on and custom_theme_on
+            delete_custom
+            create_new
+            load_theme_cfg
+        """
+        if self.theme_source.get():
+            self.builtinlist['state'] = NORMAL
+            self.customlist['state'] = DISABLED
+            self.button_delete_custom['state'] = DISABLED
+        else:
+            self.builtinlist['state'] = DISABLED
+            self.custom_theme_on['state'] = NORMAL
+            self.customlist['state'] = NORMAL
+            self.button_delete_custom['state'] = NORMAL
+
+    def get_color(self):
+        """Handle button to select a new color for the target tag.
+
+        If a new color is selected while using a builtin theme, a
+        name must be supplied to create a custom theme.
+
+        Attributes accessed:
+            highlight_target
+            frame_color_set
+            theme_source
+
+        Attributes updated:
+            color
+
+        Methods:
+            get_new_theme_name
+            create_new
+        """
+        target = self.highlight_target.get()
+        prev_color = self.frame_color_set.cget('bg')
+        rgbTuplet, color_string = tkColorChooser.askcolor(
+                parent=self, title='Pick new color for : '+target,
+                initialcolor=prev_color)
+        if color_string and (color_string != prev_color):
+            # User didn't cancel and they chose a new color.
+            if self.theme_source.get():  # Current theme is a built-in.
+                message = ('Your changes will be saved as a new Custom Theme. '
+                           'Enter a name for your new Custom Theme below.')
+                new_theme = self.get_new_theme_name(message)
+                if not new_theme:  # User cancelled custom theme creation.
+                    return
+                else:  # Create new custom theme based on previously active theme.
+                    self.create_new(new_theme)
+                    self.color.set(color_string)
+            else:  # Current theme is user defined.
+                self.color.set(color_string)
+
+    def on_new_color_set(self):
+        "Display sample of new color selection on the dialog."
+        new_color = self.color.get()
+        self.frame_color_set['bg'] = new_color  # Set sample.
+        plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
+        sample_element = self.theme_elements[self.highlight_target.get()][0]
+        self.highlight_sample.tag_config(sample_element, **{plane: new_color})
+        theme = self.custom_name.get()
+        theme_element = sample_element + '-' + plane
+        changes.add_option('highlight', theme, theme_element, new_color)
+
+    def get_new_theme_name(self, message):
+        "Return name of new theme from query popup."
+        used_names = (idleConf.GetSectionList('user', 'highlight') +
+                idleConf.GetSectionList('default', 'highlight'))
+        new_theme = SectionName(
+                self, 'New Custom Theme', message, used_names).result
+        return new_theme
+
+    def save_as_new_theme(self):
+        """Prompt for new theme name and create the theme.
+
+        Methods:
+            get_new_theme_name
+            create_new
+        """
+        new_theme_name = self.get_new_theme_name('New Theme Name:')
+        if new_theme_name:
+            self.create_new(new_theme_name)
+
+    def create_new(self, new_theme_name):
+        """Create a new custom theme with the given name.
+
+        Create the new theme based on the previously active theme
+        with the current changes applied.  Once it is saved, then
+        activate the new theme.
+
+        Attributes accessed:
+            builtin_name
+            custom_name
+
+        Attributes updated:
+            customlist
+            theme_source
+
+        Method:
+            save_new
+            set_theme_type
+        """
+        if self.theme_source.get():
+            theme_type = 'default'
+            theme_name = self.builtin_name.get()
+        else:
+            theme_type = 'user'
+            theme_name = self.custom_name.get()
+        new_theme = idleConf.GetThemeDict(theme_type, theme_name)
+        # Apply any of the old theme's unsaved changes to the new theme.
+        if theme_name in changes['highlight']:
+            theme_changes = changes['highlight'][theme_name]
+            for element in theme_changes:
+                new_theme[element] = theme_changes[element]
+        # Save the new theme.
+        self.save_new(new_theme_name, new_theme)
+        # Change GUI over to the new theme.
+        custom_theme_list = idleConf.GetSectionList('user', 'highlight')
+        custom_theme_list.sort()
+        self.customlist.SetMenu(custom_theme_list, new_theme_name)
+        self.theme_source.set(0)
+        self.set_theme_type()
+
+    def set_highlight_target(self):
+        """Set fg/bg toggle and color based on highlight tag target.
+
+        Instance variables accessed:
+            highlight_target
+
+        Attributes updated:
+            fg_on
+            bg_on
+            fg_bg_toggle
+
+        Methods:
+            set_color_sample
+
+        Called from:
+            var_changed_highlight_target
+            load_theme_cfg
+        """
+        if self.highlight_target.get() == 'Cursor':  # bg not possible
+            self.fg_on['state'] = DISABLED
+            self.bg_on['state'] = DISABLED
+            self.fg_bg_toggle.set(1)
+        else:  # Both fg and bg can be set.
+            self.fg_on['state'] = NORMAL
+            self.bg_on['state'] = NORMAL
+            self.fg_bg_toggle.set(1)
+        self.set_color_sample()
+
+    def set_color_sample_binding(self, *args):
+        """Change color sample based on foreground/background toggle.
+
+        Methods:
+            set_color_sample
+        """
+        self.set_color_sample()
+
+    def set_color_sample(self):
+        """Set the color of the frame background to reflect the selected target.
+
+        Instance variables accessed:
+            theme_elements
+            highlight_target
+            fg_bg_toggle
+            highlight_sample
+
+        Attributes updated:
+            frame_color_set
+        """
+        # Set the color sample area.
+        tag = self.theme_elements[self.highlight_target.get()][0]
+        plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
+        color = self.highlight_sample.tag_cget(tag, plane)
+        self.frame_color_set['bg'] = color
+
+    def paint_theme_sample(self):
+        """Apply the theme colors to each element tag in the sample text.
+
+        Instance attributes accessed:
+            theme_elements
+            theme_source
+            builtin_name
+            custom_name
+
+        Attributes updated:
+            highlight_sample: Set the tag elements to the theme.
+
+        Methods:
+            set_color_sample
+
+        Called from:
+            var_changed_builtin_name
+            var_changed_custom_name
+            load_theme_cfg
+        """
+        if self.theme_source.get():  # Default theme
+            theme = self.builtin_name.get()
+        else:  # User theme
+            theme = self.custom_name.get()
+        for element_title in self.theme_elements:
+            element = self.theme_elements[element_title][0]
+            colors = idleConf.GetHighlight(theme, element)
+            if element == 'cursor':  # Cursor sample needs special painting.
+                colors['background'] = idleConf.GetHighlight(
+                        theme, 'normal', fgBg='bg')
+            # Handle any unsaved changes to this theme.
+            if theme in changes['highlight']:
+                theme_dict = changes['highlight'][theme]
+                if element + '-foreground' in theme_dict:
+                    colors['foreground'] = theme_dict[element + '-foreground']
+                if element + '-background' in theme_dict:
+                    colors['background'] = theme_dict[element + '-background']
+            self.highlight_sample.tag_config(element, **colors)
+        self.set_color_sample()
+
+    def save_new(self, theme_name, theme):
+        """Save a newly created theme to idleConf.
+
+        theme_name - string, the name of the new theme
+        theme - dictionary containing the new theme
+        """
+        if not idleConf.userCfg['highlight'].has_section(theme_name):
+            idleConf.userCfg['highlight'].add_section(theme_name)
+        for element in theme:
+            value = theme[element]
+            idleConf.userCfg['highlight'].SetOption(theme_name, element, value)
+
+    def delete_custom(self):
+        """Handle event to delete custom theme.
+
+        The current theme is deactivated and the default theme is
+        activated.  The custom theme is permanently removed from
+        the config file.
+
+        Attributes accessed:
+            custom_name
+
+        Attributes updated:
+            custom_theme_on
+            customlist
+            theme_source
+            builtin_name
+
+        Methods:
+            deactivate_current_config
+            save_all_changed_extensions
+            activate_config_changes
+            set_theme_type
+        """
+        theme_name = self.custom_name.get()
+        delmsg = 'Are you sure you wish to delete the theme %r ?'
+        if not tkMessageBox.askyesno(
+                'Delete Theme',  delmsg % theme_name, parent=self):
+            return
+        cd.deactivate_current_config()
+        # Remove theme from changes, config, and file.
+        changes.delete_section('highlight', theme_name)
+        # Reload user theme list.
+        item_list = idleConf.GetSectionList('user', 'highlight')
+        item_list.sort()
+        if not item_list:
+            self.custom_theme_on['state'] = DISABLED
+            self.customlist.SetMenu(item_list, '- no custom themes -')
+        else:
+            self.customlist.SetMenu(item_list, item_list[0])
+        # Revert to default theme.
+        self.theme_source.set(idleConf.defaultCfg['main'].Get('Theme', 'default'))
+        self.builtin_name.set(idleConf.defaultCfg['main'].Get('Theme', 'name'))
+        # User can't back out of these changes, they must be applied now.
+        changes.save_all()
+        cd.save_all_changed_extensions()
+        cd.activate_config_changes()
+        self.set_theme_type()
+
+
 class KeysPage(Frame):
 
     def __init__(self, master):
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-18-14-13-42.bpo-31206.F1-tKK.rst b/Misc/NEWS.d/next/IDLE/2017-08-18-14-13-42.bpo-31206.F1-tKK.rst
new file mode 100644
index 00000000000..ba984065e88
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-18-14-13-42.bpo-31206.F1-tKK.rst
@@ -0,0 +1,2 @@
+IDLE: Factor HighPage(Frame) class from ConfigDialog. Patch by Cheryl
+Sabella.


From webhook-mailer at python.org  Fri Aug 18 18:50:28 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 18 Aug 2017 22:50:28 -0000
Subject: [Python-checkins] gitignore: add more rules from master for Windows
 (#3148)
Message-ID: <mailman.58.1503096629.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/5e006aa05fe8228ebfb5405005a253dba2238379
commit: 5e006aa05fe8228ebfb5405005a253dba2238379
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-19T00:50:15+02:00
summary:

gitignore: add more rules from master for Windows (#3148)

files:
M .gitignore

diff --git a/.gitignore b/.gitignore
index cf5db7681f3..a8c73d4b14b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,9 @@ PC/*/*.suo
 PC/*/Win32-temp-*
 PC/*/x64-temp-*
 PC/*/amd64
+PCbuild/*.user
+PCbuild/*.suo
+PCbuild/*.*sdf
 PCbuild/*.bsc
 PCbuild/*.dll
 PCbuild/*.exe
@@ -55,6 +58,9 @@ PCbuild/*.pdb
 PCbuild/Win32-temp-*
 PCbuild/*.VC.db
 PCbuild/*.VC.opendb
+PCbuild/amd64/
+PCbuild/obj/
+PCbuild/win32/
 Parser/pgen
 Parser/pgen.stamp
 autom4te.cache
@@ -70,6 +76,7 @@ platform
 pybuilddir.txt
 pyconfig.h
 python$
+python.bat
 python.exe
 python*-gdb.py
 tags


From webhook-mailer at python.org  Fri Aug 18 19:06:31 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 18 Aug 2017 23:06:31 -0000
Subject: [Python-checkins] bpo-30947: Update libexpat from 2.2.1 to 2.2.3
 (#3106) (#3143)
Message-ID: <mailman.59.1503097592.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/83e37e16f3065086d721d4e62a3788e01db3431c
commit: 83e37e16f3065086d721d4e62a3788e01db3431c
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-19T01:06:27+02:00
summary:

bpo-30947: Update libexpat from 2.2.1 to 2.2.3 (#3106) (#3143)

* bpo-30947: Update libexpat from 2.2.1 to 2.2.3

* Add NEWS entry

* Add new loadlibrary.c

* expat_external.h: restore include "pyexpatns.h"

* PCbuild: add expat/loadlibrary.c

* Define XML_POOR_ENTROPY to compile expat

(cherry picked from commit 93d0cb58b4da2a88c56f472c6c19491cc7a390df)

files:
A Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst
A Modules/expat/loadlibrary.c
M Modules/expat/expat.h
M Modules/expat/siphash.h
M Modules/expat/xmlparse.c
M Modules/expat/xmlrole.c
M Modules/expat/xmltok.c
M Modules/expat/xmltok_impl.c
M PCbuild/_elementtree.vcxproj
M PCbuild/_elementtree.vcxproj.filters
M PCbuild/pyexpat.vcxproj
M PCbuild/pyexpat.vcxproj.filters
M setup.py

diff --git a/Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst b/Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst
new file mode 100644
index 00000000000..3caca9a79b4
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst
@@ -0,0 +1,2 @@
+Upgrade libexpat embedded copy from version 2.2.1 to 2.2.3 to get security
+fixes.
diff --git a/Modules/expat/expat.h b/Modules/expat/expat.h
index 28b0f954d41..7e5bbb7e393 100644
--- a/Modules/expat/expat.h
+++ b/Modules/expat/expat.h
@@ -24,7 +24,6 @@ extern "C" {
 struct XML_ParserStruct;
 typedef struct XML_ParserStruct *XML_Parser;
 
-/* Should this be defined using stdbool.h when C99 is available? */
 typedef unsigned char XML_Bool;
 #define XML_TRUE   ((XML_Bool) 1)
 #define XML_FALSE  ((XML_Bool) 0)
@@ -1049,7 +1048,7 @@ XML_GetFeatureList(void);
 */
 #define XML_MAJOR_VERSION 2
 #define XML_MINOR_VERSION 2
-#define XML_MICRO_VERSION 1
+#define XML_MICRO_VERSION 3
 
 #ifdef __cplusplus
 }
diff --git a/Modules/expat/loadlibrary.c b/Modules/expat/loadlibrary.c
new file mode 100644
index 00000000000..ffce868399b
--- /dev/null
+++ b/Modules/expat/loadlibrary.c
@@ -0,0 +1,141 @@
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 2016 - 2017, Steve Holme, <steve_holme at hotmail.com>.
+ *
+ * All rights reserved.
+ *
+ * Permission to  use, copy,  modify, and distribute  this software  for any
+ * purpose with  or without fee is  hereby granted, provided that  the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+ * EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+ * MERCHANTABILITY, FITNESS FOR A  PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR  OTHERWISE, ARISING FROM, OUT OF OR  IN CONNECTION WITH
+ * THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice,  the name of a copyright holder shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings  in this  Software without  prior written  authorization of  the
+ * copyright holder.
+ *
+ ***************************************************************************/
+
+#if defined(_WIN32)
+
+#include <windows.h>
+#include <tchar.h>
+
+
+HMODULE _Expat_LoadLibrary(LPCTSTR filename);
+
+
+#if !defined(LOAD_WITH_ALTERED_SEARCH_PATH)
+#define LOAD_WITH_ALTERED_SEARCH_PATH  0x00000008
+#endif
+
+#if !defined(LOAD_LIBRARY_SEARCH_SYSTEM32)
+#define LOAD_LIBRARY_SEARCH_SYSTEM32   0x00000800
+#endif
+
+/* We use our own typedef here since some headers might lack these */
+typedef HMODULE (APIENTRY *LOADLIBRARYEX_FN)(LPCTSTR, HANDLE, DWORD);
+
+/* See function definitions in winbase.h */
+#ifdef UNICODE
+#  ifdef _WIN32_WCE
+#    define LOADLIBARYEX  L"LoadLibraryExW"
+#  else
+#    define LOADLIBARYEX  "LoadLibraryExW"
+#  endif
+#else
+#  define LOADLIBARYEX    "LoadLibraryExA"
+#endif
+
+
+/*
+ * _Expat_LoadLibrary()
+ *
+ * This is used to dynamically load DLLs using the most secure method available
+ * for the version of Windows that we are running on.
+ *
+ * Parameters:
+ *
+ * filename  [in] - The filename or full path of the DLL to load. If only the
+ *                  filename is passed then the DLL will be loaded from the
+ *                  Windows system directory.
+ *
+ * Returns the handle of the module on success; otherwise NULL.
+ */
+HMODULE _Expat_LoadLibrary(LPCTSTR filename)
+{
+  HMODULE hModule = NULL;
+  LOADLIBRARYEX_FN pLoadLibraryEx = NULL;
+
+  /* Get a handle to kernel32 so we can access it's functions at runtime */
+  HMODULE hKernel32 = GetModuleHandle(TEXT("kernel32"));
+  if(!hKernel32)
+    return NULL;
+
+  /* Attempt to find LoadLibraryEx() which is only available on Windows 2000
+     and above */
+  pLoadLibraryEx = (LOADLIBRARYEX_FN) GetProcAddress(hKernel32, LOADLIBARYEX);
+
+  /* Detect if there's already a path in the filename and load the library if
+     there is. Note: Both back slashes and forward slashes have been supported
+     since the earlier days of DOS at an API level although they are not
+     supported by command prompt */
+  if(_tcspbrk(filename, TEXT("\\/"))) {
+    /** !checksrc! disable BANNEDFUNC 1 **/
+    hModule = pLoadLibraryEx ?
+      pLoadLibraryEx(filename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH) :
+      LoadLibrary(filename);
+  }
+  /* Detect if KB2533623 is installed, as LOAD_LIBARY_SEARCH_SYSTEM32 is only
+     supported on Windows Vista, Windows Server 2008, Windows 7 and Windows
+     Server 2008 R2 with this patch or natively on Windows 8 and above */
+  else if(pLoadLibraryEx && GetProcAddress(hKernel32, "AddDllDirectory")) {
+    /* Load the DLL from the Windows system directory */
+    hModule = pLoadLibraryEx(filename, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
+  }
+  else {
+    /* Attempt to get the Windows system path */
+    UINT systemdirlen = GetSystemDirectory(NULL, 0);
+    if(systemdirlen) {
+      /* Allocate space for the full DLL path (Room for the null terminator
+         is included in systemdirlen) */
+      size_t filenamelen = _tcslen(filename);
+      TCHAR *path = malloc(sizeof(TCHAR) * (systemdirlen + 1 + filenamelen));
+      if(path && GetSystemDirectory(path, systemdirlen)) {
+        /* Calculate the full DLL path */
+        _tcscpy(path + _tcslen(path), TEXT("\\"));
+        _tcscpy(path + _tcslen(path), filename);
+
+        /* Load the DLL from the Windows system directory */
+        /** !checksrc! disable BANNEDFUNC 1 **/
+        hModule = pLoadLibraryEx ?
+          pLoadLibraryEx(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH) :
+          LoadLibrary(path);
+
+      }
+      free(path);
+    }
+  }
+
+  return hModule;
+}
+
+#else /* defined(_WIN32) */
+
+/* ISO C requires a translation unit to contain at least one declaration
+   [-Wempty-translation-unit] */
+typedef int _TRANSLATION_UNIT_LOAD_LIBRARY_C_NOT_EMTPY;
+
+#endif /* defined(_WIN32) */
diff --git a/Modules/expat/siphash.h b/Modules/expat/siphash.h
index 23b56d2ae48..581872df7b4 100644
--- a/Modules/expat/siphash.h
+++ b/Modules/expat/siphash.h
@@ -2,9 +2,8 @@
  * siphash.h - SipHash-2-4 in a single header file
  * --------------------------------------------------------------------------
  * Derived by William Ahern from the reference implementation[1] published[2]
- * by Jean-Philippe Aumasson and Daniel J. Berstein. Licensed in kind.
  * by Jean-Philippe Aumasson and Daniel J. Berstein.
- * Minimal changes by Sebastian Pipping on top, details below.
+ * Minimal changes by Sebastian Pipping and Victor Stinner on top, see below.
  * Licensed under the CC0 Public Domain Dedication license.
  *
  * 1. https://www.131002.net/siphash/siphash24.c
@@ -12,14 +11,25 @@
  * --------------------------------------------------------------------------
  * HISTORY:
  *
- * 2017-06-10  (Sebastian Pipping)
+ * 2017-07-25  (Vadim Zeitlin)
+ *   - Fix use of SIPHASH_MAIN macro
+ *
+ * 2017-07-05  (Sebastian Pipping)
+ *   - Use _SIP_ULL macro to not require a C++11 compiler if compiled as C++
+ *   - Add const qualifiers at two places
+ *   - Ensure <=80 characters line length (assuming tab width 4)
+ *
+ * 2017-06-23  (Victor Stinner)
+ *   - Address Win64 compile warnings
+ *
+ * 2017-06-18  (Sebastian Pipping)
  *   - Clarify license note in the header
  *   - Address C89 issues:
  *     - Stop using inline keyword (and let compiler decide)
- *     - Turn integer suffix ULL to UL
  *     - Replace _Bool by int
  *     - Turn macro siphash24 into a function
  *     - Address invalid conversion (void pointer) by explicit cast
+ *   - Address lack of stdint.h for Visual Studio 2003 to 2008
  *   - Always expose sip24_valid (for self-tests)
  *
  * 2012-11-04 - Born.  (William Ahern)
@@ -76,7 +86,23 @@
 #define SIPHASH_H
 
 #include <stddef.h> /* size_t */
-#include <stdint.h> /* uint64_t uint32_t uint8_t */
+
+#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1600)
+  /* For vs2003/7.1 up to vs2008/9.0; _MSC_VER 1600 is vs2010/10.0 */
+  typedef unsigned __int8   uint8_t;
+  typedef unsigned __int32 uint32_t;
+  typedef unsigned __int64 uint64_t;
+#else
+ #include <stdint.h> /* uint64_t uint32_t uint8_t */
+#endif
+
+
+/*
+ * Workaround to not require a C++11 compiler for using ULL suffix
+ * if this code is included and compiled as C++; related GCC warning is:
+ * warning: use of C++11 long long integer constant [-Wlong-long]
+ */
+#define _SIP_ULL(high, low)  (((uint64_t)high << 32) | low)
 
 
 #define SIP_ROTL(x, b) (uint64_t)(((x) << (b)) | ( (x) >> (64 - (b))))
@@ -158,11 +184,12 @@ static void sip_round(struct siphash *H, const int rounds) {
 } /* sip_round() */
 
 
-static struct siphash *sip24_init(struct siphash *H, const struct sipkey *key) {
-	H->v0 = 0x736f6d6570736575UL ^ key->k[0];
-	H->v1 = 0x646f72616e646f6dUL ^ key->k[1];
-	H->v2 = 0x6c7967656e657261UL ^ key->k[0];
-	H->v3 = 0x7465646279746573UL ^ key->k[1];
+static struct siphash *sip24_init(struct siphash *H,
+		const struct sipkey *key) {
+	H->v0 = _SIP_ULL(0x736f6d65U, 0x70736575U) ^ key->k[0];
+	H->v1 = _SIP_ULL(0x646f7261U, 0x6e646f6dU) ^ key->k[1];
+	H->v2 = _SIP_ULL(0x6c796765U, 0x6e657261U) ^ key->k[0];
+	H->v3 = _SIP_ULL(0x74656462U, 0x79746573U) ^ key->k[1];
 
 	H->p = H->buf;
 	H->c = 0;
@@ -173,7 +200,8 @@ static struct siphash *sip24_init(struct siphash *H, const struct sipkey *key) {
 
 #define sip_endof(a) (&(a)[sizeof (a) / sizeof *(a)])
 
-static struct siphash *sip24_update(struct siphash *H, const void *src, size_t len) {
+static struct siphash *sip24_update(struct siphash *H, const void *src,
+		size_t len) {
 	const unsigned char *p = (const unsigned char *)src, *pe = p + len;
 	uint64_t m;
 
@@ -198,7 +226,7 @@ static struct siphash *sip24_update(struct siphash *H, const void *src, size_t l
 
 
 static uint64_t sip24_final(struct siphash *H) {
-	char left = H->p - H->buf;
+	const char left = (char)(H->p - H->buf);
 	uint64_t b = (H->c + left) << 56;
 
 	switch (left) {
@@ -222,7 +250,8 @@ static uint64_t sip24_final(struct siphash *H) {
 } /* sip24_final() */
 
 
-static uint64_t siphash24(const void *src, size_t len, const struct sipkey *key) {
+static uint64_t siphash24(const void *src, size_t len,
+		const struct sipkey *key) {
 	struct siphash state = SIPHASH_INITIALIZER;
 	return sip24_final(sip24_update(sip24_init(&state, key), src, len));
 } /* siphash24() */
@@ -310,10 +339,11 @@ static int sip24_valid(void) {
 	struct sipkey k;
 	size_t i;
 
-	sip_tokey(&k, "\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017");
+	sip_tokey(&k, "\000\001\002\003\004\005\006\007\010\011"
+			"\012\013\014\015\016\017");
 
 	for (i = 0; i < sizeof in; ++i) {
-		in[i] = i;
+		in[i] = (unsigned char)i;
 
 		if (siphash24(in, i, &k) != SIP_U8TO64_LE(vectors[i]))
 			return 0;
@@ -323,12 +353,12 @@ static int sip24_valid(void) {
 } /* sip24_valid() */
 
 
-#if SIPHASH_MAIN
+#ifdef SIPHASH_MAIN
 
 #include <stdio.h>
 
 int main(void) {
-	int ok = sip24_valid();
+	const int ok = sip24_valid();
 
 	if (ok)
 		puts("OK");
diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c
index daec151e232..b703e61a040 100644
--- a/Modules/expat/xmlparse.c
+++ b/Modules/expat/xmlparse.c
@@ -1,10 +1,12 @@
 /* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
    See the file COPYING for copying permission.
 
-   77fea421d361dca90041d0040ecf1dca651167fadf2af79e990e35168d70d933 (2.2.1+)
+   101bfd65d1ff3d1511cf6671e6aae65f82cd97df6f4da137d46d510731830ad9 (2.2.3+)
 */
 
-#define _GNU_SOURCE 1                   /* syscall prototype */
+#if !defined(_GNU_SOURCE)
+# define _GNU_SOURCE 1                  /* syscall prototype */
+#endif
 
 #include <stddef.h>
 #include <string.h>                     /* memset(), memcpy() */
@@ -19,6 +21,8 @@
 #include <sys/time.h>                   /* gettimeofday() */
 #include <sys/types.h>                  /* getpid() */
 #include <unistd.h>                     /* getpid() */
+#include <fcntl.h>                      /* O_RDONLY */
+#include <errno.h>
 #endif
 
 #define XML_BUILDING_EXPAT 1
@@ -33,6 +37,57 @@
 #include "expat.h"
 #include "siphash.h"
 
+#if defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM)
+# if defined(HAVE_GETRANDOM)
+#  include <sys/random.h>    /* getrandom */
+# else
+#  include <unistd.h>        /* syscall */
+#  include <sys/syscall.h>   /* SYS_getrandom */
+# endif
+# if ! defined(GRND_NONBLOCK)
+#  define GRND_NONBLOCK  0x0001
+# endif  /* defined(GRND_NONBLOCK) */
+#endif  /* defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM) */
+
+#if defined(HAVE_LIBBSD) \
+    && (defined(HAVE_ARC4RANDOM_BUF) || defined(HAVE_ARC4RANDOM))
+# include <bsd/stdlib.h>
+#endif
+
+#if defined(_WIN32) && !defined(LOAD_LIBRARY_SEARCH_SYSTEM32)
+# define LOAD_LIBRARY_SEARCH_SYSTEM32  0x00000800
+#endif
+
+#if !defined(HAVE_GETRANDOM) && !defined(HAVE_SYSCALL_GETRANDOM) \
+    && !defined(HAVE_ARC4RANDOM_BUF) && !defined(HAVE_ARC4RANDOM) \
+    && !defined(XML_DEV_URANDOM) \
+    && !defined(_WIN32) \
+    && !defined(XML_POOR_ENTROPY)
+# error  \
+    You do not have support for any sources of high quality entropy \
+    enabled.  For end user security, that is probably not what you want. \
+    \
+    Your options include: \
+      * Linux + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
+      * Linux + glibc <2.25 (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
+      * BSD / macOS >=10.7 (arc4random_buf): HAVE_ARC4RANDOM_BUF, \
+      * BSD / macOS <10.7 (arc4random): HAVE_ARC4RANDOM, \
+      * libbsd (arc4random_buf): HAVE_ARC4RANDOM_BUF + HAVE_LIBBSD, \
+      * libbsd (arc4random): HAVE_ARC4RANDOM + HAVE_LIBBSD, \
+      * Linux / BSD / macOS (/dev/urandom): XML_DEV_URANDOM \
+      * Windows (RtlGenRandom): _WIN32. \
+    \
+    If insist on not using any of these, bypass this error by defining \
+    XML_POOR_ENTROPY; you have been warned. \
+    \
+    For CMake, one way to pass the define is: \
+        cmake -DCMAKE_C_FLAGS="-pipe -O2 -DHAVE_SYSCALL_GETRANDOM" . \
+    \
+    If you have reasons to patch this detection code away or need changes \
+    to the build system, please open a bug.  Thank you!
+#endif
+
+
 #ifdef XML_UNICODE
 #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX
 #define XmlConvert XmlUtf16Convert
@@ -436,6 +491,9 @@ static ELEMENT_TYPE *
 getElementType(XML_Parser parser, const ENCODING *enc,
                const char *ptr, const char *end);
 
+static XML_Char *copyString(const XML_Char *s,
+                            const XML_Memory_Handling_Suite *memsuite);
+
 static unsigned long generate_hash_secret_salt(XML_Parser parser);
 static XML_Bool startParsing(XML_Parser parser);
 
@@ -696,21 +754,13 @@ static const XML_Char implicitContext[] = {
 
 
 #if defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM)
-# include <errno.h>
-
-# if defined(HAVE_GETRANDOM)
-#  include <sys/random.h>    /* getrandom */
-# else
-#  include <unistd.h>        /* syscall */
-#  include <sys/syscall.h>   /* SYS_getrandom */
-# endif
 
 /* Obtain entropy on Linux 3.17+ */
 static int
-writeRandomBytes_getrandom(void * target, size_t count) {
+writeRandomBytes_getrandom_nonblock(void * target, size_t count) {
   int success = 0;  /* full count bytes written? */
   size_t bytesWrittenTotal = 0;
-  const unsigned int getrandomFlags = 0;
+  const unsigned int getrandomFlags = GRND_NONBLOCK;
 
   do {
     void * const currentTarget = (void*)((char*)target + bytesWrittenTotal);
@@ -728,7 +778,7 @@ writeRandomBytes_getrandom(void * target, size_t count) {
       if (bytesWrittenTotal >= count)
         success = 1;
     }
-  } while (! success && (errno == EINTR || errno == EAGAIN));
+  } while (! success && (errno == EINTR));
 
   return success;
 }
@@ -736,12 +786,67 @@ writeRandomBytes_getrandom(void * target, size_t count) {
 #endif  /* defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM) */
 
 
+#if ! defined(_WIN32) && defined(XML_DEV_URANDOM)
+
+/* Extract entropy from /dev/urandom */
+static int
+writeRandomBytes_dev_urandom(void * target, size_t count) {
+  int success = 0;  /* full count bytes written? */
+  size_t bytesWrittenTotal = 0;
+
+  const int fd = open("/dev/urandom", O_RDONLY);
+  if (fd < 0) {
+    return 0;
+  }
+
+  do {
+    void * const currentTarget = (void*)((char*)target + bytesWrittenTotal);
+    const size_t bytesToWrite = count - bytesWrittenTotal;
+
+    const ssize_t bytesWrittenMore = read(fd, currentTarget, bytesToWrite);
+
+    if (bytesWrittenMore > 0) {
+      bytesWrittenTotal += bytesWrittenMore;
+      if (bytesWrittenTotal >= count)
+        success = 1;
+    }
+  } while (! success && (errno == EINTR));
+
+  close(fd);
+  return success;
+}
+
+#endif  /* ! defined(_WIN32) && defined(XML_DEV_URANDOM) */
+
+
+#if defined(HAVE_ARC4RANDOM)
+
+static void
+writeRandomBytes_arc4random(void * target, size_t count) {
+  size_t bytesWrittenTotal = 0;
+
+  while (bytesWrittenTotal < count) {
+    const uint32_t random32 = arc4random();
+    size_t i = 0;
+
+    for (; (i < sizeof(random32)) && (bytesWrittenTotal < count);
+        i++, bytesWrittenTotal++) {
+      const uint8_t random8 = (uint8_t)(random32 >> (i * 8));
+      ((uint8_t *)target)[bytesWrittenTotal] = random8;
+    }
+  }
+}
+
+#endif  /* defined(HAVE_ARC4RANDOM) */
+
+
 #ifdef _WIN32
 
 typedef BOOLEAN (APIENTRY *RTLGENRANDOM_FUNC)(PVOID, ULONG);
+HMODULE _Expat_LoadLibrary(LPCTSTR filename);  /* see loadlibrary.c */
 
 /* Obtain entropy on Windows XP / Windows Server 2003 and later.
- * Hint on RtlGenRandom and the following article from libsodioum.
+ * Hint on RtlGenRandom and the following article from libsodium.
  *
  * Michael Howard: Cryptographically Secure Random number on Windows without using CryptoAPI
  * https://blogs.msdn.microsoft.com/michael_howard/2005/01/14/cryptographically-secure-random-number-on-windows-without-using-cryptoapi/
@@ -749,7 +854,7 @@ typedef BOOLEAN (APIENTRY *RTLGENRANDOM_FUNC)(PVOID, ULONG);
 static int
 writeRandomBytes_RtlGenRandom(void * target, size_t count) {
   int success = 0;  /* full count bytes written? */
-  const HMODULE advapi32 = LoadLibrary("ADVAPI32.DLL");
+  const HMODULE advapi32 = _Expat_LoadLibrary(TEXT("ADVAPI32.DLL"));
 
   if (advapi32) {
     const RTLGENRANDOM_FUNC RtlGenRandom
@@ -768,6 +873,8 @@ writeRandomBytes_RtlGenRandom(void * target, size_t count) {
 #endif /* _WIN32 */
 
 
+#if ! defined(HAVE_ARC4RANDOM_BUF) && ! defined(HAVE_ARC4RANDOM)
+
 static unsigned long
 gather_time_entropy(void)
 {
@@ -780,16 +887,20 @@ gather_time_entropy(void)
   int gettimeofday_res;
 
   gettimeofday_res = gettimeofday(&tv, NULL);
+
+#if defined(NDEBUG)
+  (void)gettimeofday_res;
+#else
   assert (gettimeofday_res == 0);
+#endif  /* defined(NDEBUG) */
 
   /* Microseconds time is <20 bits entropy */
   return tv.tv_usec;
 #endif
 }
 
-#if defined(HAVE_ARC4RANDOM_BUF) && defined(HAVE_LIBBSD)
-# include <bsd/stdlib.h>
-#endif
+#endif  /* ! defined(HAVE_ARC4RANDOM_BUF) && ! defined(HAVE_ARC4RANDOM) */
+
 
 static unsigned long
 ENTROPY_DEBUG(const char * label, unsigned long entropy) {
@@ -808,10 +919,12 @@ generate_hash_secret_salt(XML_Parser parser)
 {
   unsigned long entropy;
   (void)parser;
-#if defined(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__)
-  (void)gather_time_entropy;
+#if defined(HAVE_ARC4RANDOM_BUF)
   arc4random_buf(&entropy, sizeof(entropy));
   return ENTROPY_DEBUG("arc4random_buf", entropy);
+#elif defined(HAVE_ARC4RANDOM)
+  writeRandomBytes_arc4random((void *)&entropy, sizeof(entropy));
+  return ENTROPY_DEBUG("arc4random", entropy);
 #else
   /* Try high quality providers first .. */
 #ifdef _WIN32
@@ -819,10 +932,15 @@ generate_hash_secret_salt(XML_Parser parser)
     return ENTROPY_DEBUG("RtlGenRandom", entropy);
   }
 #elif defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM)
-  if (writeRandomBytes_getrandom((void *)&entropy, sizeof(entropy))) {
+  if (writeRandomBytes_getrandom_nonblock((void *)&entropy, sizeof(entropy))) {
     return ENTROPY_DEBUG("getrandom", entropy);
   }
 #endif
+#if ! defined(_WIN32) && defined(XML_DEV_URANDOM)
+  if (writeRandomBytes_dev_urandom((void *)&entropy, sizeof(entropy))) {
+    return ENTROPY_DEBUG("/dev/urandom", entropy);
+  }
+#endif  /* ! defined(_WIN32) && defined(XML_DEV_URANDOM) */
   /* .. and self-made low quality for backup: */
 
   /* Process ID is 0 bits entropy if attacker has local access */
@@ -833,7 +951,7 @@ generate_hash_secret_salt(XML_Parser parser)
     return ENTROPY_DEBUG("fallback(4)", entropy * 2147483647);
   } else {
     return ENTROPY_DEBUG("fallback(8)",
-        entropy * (unsigned long)2305843009213693951);
+        entropy * (unsigned long)2305843009213693951ULL);
   }
 #endif
 }
@@ -962,6 +1080,8 @@ parserCreate(const XML_Char *encodingName,
   nsAttsVersion = 0;
   nsAttsPower = 0;
 
+  protocolEncodingName = NULL;
+
   poolInit(&tempPool, &(parser->m_mem));
   poolInit(&temp2Pool, &(parser->m_mem));
   parserInit(parser, encodingName);
@@ -988,9 +1108,9 @@ parserInit(XML_Parser parser, const XML_Char *encodingName)
 {
   processor = prologInitProcessor;
   XmlPrologStateInit(&prologState);
-  protocolEncodingName = (encodingName != NULL
-                          ? poolCopyString(&tempPool, encodingName)
-                          : NULL);
+  if (encodingName != NULL) {
+    protocolEncodingName = copyString(encodingName, &(parser->m_mem));
+  }
   curBase = NULL;
   XmlInitEncoding(&initEncoding, &encoding, 0);
   userData = NULL;
@@ -1103,6 +1223,8 @@ XML_ParserReset(XML_Parser parser, const XML_Char *encodingName)
     unknownEncodingRelease(unknownEncodingData);
   poolClear(&tempPool);
   poolClear(&temp2Pool);
+  FREE((void *)protocolEncodingName);
+  protocolEncodingName = NULL;
   parserInit(parser, encodingName);
   dtdReset(_dtd, &parser->m_mem);
   return XML_TRUE;
@@ -1119,10 +1241,16 @@ XML_SetEncoding(XML_Parser parser, const XML_Char *encodingName)
   */
   if (ps_parsing == XML_PARSING || ps_parsing == XML_SUSPENDED)
     return XML_STATUS_ERROR;
+
+  /* Get rid of any previous encoding name */
+  FREE((void *)protocolEncodingName);
+
   if (encodingName == NULL)
+    /* No new encoding name */
     protocolEncodingName = NULL;
   else {
-    protocolEncodingName = poolCopyString(&tempPool, encodingName);
+    /* Copy the new encoding name into allocated memory */
+    protocolEncodingName = copyString(encodingName, &(parser->m_mem));
     if (!protocolEncodingName)
       return XML_STATUS_ERROR;
   }
@@ -1357,6 +1485,7 @@ XML_ParserFree(XML_Parser parser)
   destroyBindings(inheritedBindings, parser);
   poolDestroy(&tempPool);
   poolDestroy(&temp2Pool);
+  FREE((void *)protocolEncodingName);
 #ifdef XML_DTD
   /* external parameter entity parsers share the DTD structure
      parser->m_dtd with the root parser, so we must not destroy it
@@ -1748,7 +1877,8 @@ enum XML_Status XMLCALL
 XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
 {
   if ((parser == NULL) || (len < 0) || ((s == NULL) && (len != 0))) {
-    errorCode = XML_ERROR_INVALID_ARGUMENT;
+    if (parser != NULL)
+      parser->m_errorCode = XML_ERROR_INVALID_ARGUMENT;
     return XML_STATUS_ERROR;
   }
   switch (ps_parsing) {
@@ -1783,9 +1913,22 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
     if (errorCode == XML_ERROR_NONE) {
       switch (ps_parsing) {
       case XML_SUSPENDED:
+        /* It is hard to be certain, but it seems that this case
+         * cannot occur.  This code is cleaning up a previous parse
+         * with no new data (since len == 0).  Changing the parsing
+         * state requires getting to execute a handler function, and
+         * there doesn't seem to be an opportunity for that while in
+         * this circumstance.
+         *
+         * Given the uncertainty, we retain the code but exclude it
+         * from coverage tests.
+         *
+         * LCOV_EXCL_START
+         */
         XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position);
         positionPtr = bufferPtr;
         return XML_STATUS_SUSPENDED;
+        /* LCOV_EXCL_STOP */
       case XML_INITIALIZED:
       case XML_PARSING:
         ps_parsing = XML_FINISHED;
@@ -2974,9 +3117,17 @@ doContent(XML_Parser parser,
         return XML_ERROR_NO_MEMORY;
       break;
     default:
+      /* All of the tokens produced by XmlContentTok() have their own
+       * explicit cases, so this default is not strictly necessary.
+       * However it is a useful safety net, so we retain the code and
+       * simply exclude it from the coverage tests.
+       *
+       * LCOV_EXCL_START
+       */
       if (defaultHandler)
         reportDefault(parser, enc, s, next);
       break;
+      /* LCOV_EXCL_STOP */
     }
     *eventPP = s = next;
     switch (ps_parsing) {
@@ -3067,13 +3218,17 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
 #endif
     attsSize = n + nDefaultAtts + INIT_ATTS_SIZE;
     temp = (ATTRIBUTE *)REALLOC((void *)atts, attsSize * sizeof(ATTRIBUTE));
-    if (temp == NULL)
+    if (temp == NULL) {
+      attsSize = oldAttsSize;
       return XML_ERROR_NO_MEMORY;
+    }
     atts = temp;
 #ifdef XML_ATTR_INFO
     temp2 = (XML_AttrInfo *)REALLOC((void *)attInfo, attsSize * sizeof(XML_AttrInfo));
-    if (temp2 == NULL)
+    if (temp2 == NULL) {
+      attsSize = oldAttsSize;
       return XML_ERROR_NO_MEMORY;
+    }
     attInfo = temp2;
 #endif
     if (n > oldAttsSize)
@@ -3210,6 +3365,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
     int j;  /* hash table index */
     unsigned long version = nsAttsVersion;
     int nsAttsSize = (int)1 << nsAttsPower;
+    unsigned char oldNsAttsPower = nsAttsPower;
     /* size of hash table must be at least 2 * (# of prefixed attributes) */
     if ((nPrefixes << 1) >> nsAttsPower) {  /* true for nsAttsPower = 0 */
       NS_ATT *temp;
@@ -3219,8 +3375,11 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
         nsAttsPower = 3;
       nsAttsSize = (int)1 << nsAttsPower;
       temp = (NS_ATT *)REALLOC(nsAtts, nsAttsSize * sizeof(NS_ATT));
-      if (!temp)
+      if (!temp) {
+        /* Restore actual size of memory in nsAtts */
+        nsAttsPower = oldNsAttsPower;
         return XML_ERROR_NO_MEMORY;
+      }
       nsAtts = temp;
       version = 0;  /* force re-initialization of nsAtts hash table */
     }
@@ -3247,8 +3406,23 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
 
         ((XML_Char *)s)[-1] = 0;  /* clear flag */
         id = (ATTRIBUTE_ID *)lookup(parser, &dtd->attributeIds, s, 0);
-        if (!id || !id->prefix)
-          return XML_ERROR_NO_MEMORY;
+        if (!id || !id->prefix) {
+          /* This code is walking through the appAtts array, dealing
+           * with (in this case) a prefixed attribute name.  To be in
+           * the array, the attribute must have already been bound, so
+           * has to have passed through the hash table lookup once
+           * already.  That implies that an entry for it already
+           * exists, so the lookup above will return a pointer to
+           * already allocated memory.  There is no opportunaity for
+           * the allocator to fail, so the condition above cannot be
+           * fulfilled.
+           *
+           * Since it is difficult to be certain that the above
+           * analysis is complete, we retain the test and merely
+           * remove the code from coverage tests.
+           */
+          return XML_ERROR_NO_MEMORY; /* LCOV_EXCL_LINE */
+        }
         b = id->prefix->binding;
         if (!b)
           return XML_ERROR_UNBOUND_PREFIX;
@@ -3625,8 +3799,16 @@ doCdataSection(XML_Parser parser,
       }
       return XML_ERROR_UNCLOSED_CDATA_SECTION;
     default:
+      /* Every token returned by XmlCdataSectionTok() has its own
+       * explicit case, so this default case will never be executed.
+       * We retain it as a safety net and exclude it from the coverage
+       * statistics.
+       *
+       * LCOV_EXCL_START
+      */
       *eventPP = next;
       return XML_ERROR_UNEXPECTED_STATE;
+      /* LCOV_EXCL_STOP */
     }
 
     *eventPP = s = next;
@@ -3686,8 +3868,20 @@ doIgnoreSection(XML_Parser parser,
     eventEndPP = &eventEndPtr;
   }
   else {
+    /* It's not entirely clear, but it seems the following two lines
+     * of code cannot be executed.  The only occasions on which 'enc'
+     * is not 'parser->m_encoding' are when this function is called
+     * from the internal entity processing, and IGNORE sections are an
+     * error in internal entities.
+     *
+     * Since it really isn't clear that this is true, we keep the code
+     * and just remove it from our coverage tests.
+     *
+     * LCOV_EXCL_START
+     */
     eventPP = &(openInternalEntities->internalEventPtr);
     eventEndPP = &(openInternalEntities->internalEventEndPtr);
+    /* LCOV_EXCL_STOP */
   }
   *eventPP = s;
   *startPtr = NULL;
@@ -3720,8 +3914,16 @@ doIgnoreSection(XML_Parser parser,
     }
     return XML_ERROR_SYNTAX; /* XML_ERROR_UNCLOSED_IGNORE_SECTION */
   default:
+    /* All of the tokens that XmlIgnoreSectionTok() returns have
+     * explicit cases to handle them, so this default case is never
+     * executed.  We keep it as a safety net anyway, and remove it
+     * from our test coverage statistics.
+     *
+     * LCOV_EXCL_START
+     */
     *eventPP = next;
     return XML_ERROR_UNEXPECTED_STATE;
+    /* LCOV_EXCL_STOP */
   }
   /* not reached */
 }
@@ -3734,6 +3936,7 @@ initializeEncoding(XML_Parser parser)
   const char *s;
 #ifdef XML_UNICODE
   char encodingBuf[128];
+  /* See comments abount `protoclEncodingName` in parserInit() */
   if (!protocolEncodingName)
     s = NULL;
   else {
@@ -3817,7 +4020,14 @@ processXmlDecl(XML_Parser parser, int isGeneralTextEntity,
     reportDefault(parser, encoding, s, next);
   if (protocolEncodingName == NULL) {
     if (newEncoding) {
-      if (newEncoding->minBytesPerChar != encoding->minBytesPerChar) {
+      /* Check that the specified encoding does not conflict with what
+       * the parser has already deduced.  Do we have the same number
+       * of bytes in the smallest representation of a character?  If
+       * this is UTF-16, is it the same endianness?
+       */
+      if (newEncoding->minBytesPerChar != encoding->minBytesPerChar
+          || (newEncoding->minBytesPerChar == 2 &&
+              newEncoding != encoding)) {
         eventPtr = encodingName;
         return XML_ERROR_INCORRECT_ENCODING;
       }
@@ -3962,15 +4172,14 @@ entityValueInitProcessor(XML_Parser parser,
       result = processXmlDecl(parser, 0, start, next);
       if (result != XML_ERROR_NONE)
         return result;
-      switch (ps_parsing) {
-      case XML_SUSPENDED:
-        *nextPtr = next;
-        return XML_ERROR_NONE;
-      case XML_FINISHED:
+      /* At this point, ps_parsing cannot be XML_SUSPENDED.  For that
+       * to happen, a parameter entity parsing handler must have
+       * attempted to suspend the parser, which fails and raises an
+       * error.  The parser can be aborted, but can't be suspended.
+       */
+      if (ps_parsing == XML_FINISHED)
         return XML_ERROR_ABORTED;
-      default:
-        *nextPtr = next;
-      }
+      *nextPtr = next;
       /* stop scanning for text declaration - we found one */
       processor = entityValueProcessor;
       return entityValueProcessor(parser, next, end, nextPtr);
@@ -4293,8 +4502,14 @@ doProlog(XML_Parser parser,
                                             &dtd->paramEntities,
                                             externalSubsetName,
                                             sizeof(ENTITY));
-          if (!entity)
-            return XML_ERROR_NO_MEMORY;
+          if (!entity) {
+            /* The external subset name "#" will have already been
+             * inserted into the hash table at the start of the
+             * external entity parsing, so no allocation will happen
+             * and lookup() cannot fail.
+             */
+            return XML_ERROR_NO_MEMORY; /* LCOV_EXCL_LINE */
+          }
           if (useForeignDTD)
             entity->base = curBase;
           dtd->paramEntityRead = XML_FALSE;
@@ -4773,8 +4988,10 @@ doProlog(XML_Parser parser,
       if (prologState.level >= groupSize) {
         if (groupSize) {
           char *temp = (char *)REALLOC(groupConnector, groupSize *= 2);
-          if (temp == NULL)
+          if (temp == NULL) {
+            groupSize /= 2;
             return XML_ERROR_NO_MEMORY;
+          }
           groupConnector = temp;
           if (dtd->scaffIndex) {
             int *temp = (int *)REALLOC(dtd->scaffIndex,
@@ -4786,8 +5003,10 @@ doProlog(XML_Parser parser,
         }
         else {
           groupConnector = (char *)MALLOC(groupSize = 32);
-          if (!groupConnector)
+          if (!groupConnector) {
+            groupSize = 0;
             return XML_ERROR_NO_MEMORY;
+          }
         }
       }
       groupConnector[prologState.level] = 0;
@@ -4850,8 +5069,29 @@ doProlog(XML_Parser parser,
              : !dtd->hasParamEntityRefs)) {
           if (!entity)
             return XML_ERROR_UNDEFINED_ENTITY;
-          else if (!entity->is_internal)
-            return XML_ERROR_ENTITY_DECLARED_IN_PE;
+          else if (!entity->is_internal) {
+            /* It's hard to exhaustively search the code to be sure,
+             * but there doesn't seem to be a way of executing the
+             * following line.  There are two cases:
+             *
+             * If 'standalone' is false, the DTD must have no
+             * parameter entities or we wouldn't have passed the outer
+             * 'if' statement.  That measn the only entity in the hash
+             * table is the external subset name "#" which cannot be
+             * given as a parameter entity name in XML syntax, so the
+             * lookup must have returned NULL and we don't even reach
+             * the test for an internal entity.
+             *
+             * If 'standalone' is true, it does not seem to be
+             * possible to create entities taking this code path that
+             * are not internal entities, so fail the test above.
+             *
+             * Because this analysis is very uncertain, the code is
+             * being left in place and merely removed from the
+             * coverage test statistics.
+             */
+            return XML_ERROR_ENTITY_DECLARED_IN_PE; /* LCOV_EXCL_LINE */
+          }
         }
         else if (!entity) {
           dtd->keepProcessing = dtd->standalone;
@@ -5323,11 +5563,15 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
             && (poolLength(pool) == 0 || poolLastChar(pool) == 0x20))
           break;
         n = XmlEncode(n, (ICHAR *)buf);
-        if (!n) {
-          if (enc == encoding)
-            eventPtr = ptr;
-          return XML_ERROR_BAD_CHAR_REF;
-        }
+        /* The XmlEncode() functions can never return 0 here.  That
+         * error return happens if the code point passed in is either
+         * negative or greater than or equal to 0x110000.  The
+         * XmlCharRefNumber() functions will all return a number
+         * strictly less than 0x110000 or a negative value if an error
+         * occurred.  The negative value is intercepted above, so
+         * XmlEncode() is never passed a value it might return an
+         * error for.
+         */
         for (i = 0; i < n; i++) {
           if (!poolAppendChar(pool, buf[i]))
             return XML_ERROR_NO_MEMORY;
@@ -5401,8 +5645,26 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
           break;
         }
         if (entity->open) {
-          if (enc == encoding)
-            eventPtr = ptr;
+          if (enc == encoding) {
+            /* It does not appear that this line can be executed.
+             *
+             * The "if (entity->open)" check catches recursive entity
+             * definitions.  In order to be called with an open
+             * entity, it must have gone through this code before and
+             * been through the recursive call to
+             * appendAttributeValue() some lines below.  That call
+             * sets the local encoding ("enc") to the parser's
+             * internal encoding (internal_utf8 or internal_utf16),
+             * which can never be the same as the principle encoding.
+             * It doesn't appear there is another code path that gets
+             * here with entity->open being TRUE.
+             *
+             * Since it is not certain that this logic is watertight,
+             * we keep the line and merely exclude it from coverage
+             * tests.
+             */
+            eventPtr = ptr; /* LCOV_EXCL_LINE */
+          }
           return XML_ERROR_RECURSIVE_ENTITY_REF;
         }
         if (entity->notation) {
@@ -5429,9 +5691,21 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
       }
       break;
     default:
+      /* The only token returned by XmlAttributeValueTok() that does
+       * not have an explicit case here is XML_TOK_PARTIAL_CHAR.
+       * Getting that would require an entity name to contain an
+       * incomplete XML character (e.g. \xE2\x82); however previous
+       * tokenisers will have already recognised and rejected such
+       * names before XmlAttributeValueTok() gets a look-in.  This
+       * default case should be retained as a safety net, but the code
+       * excluded from coverage tests.
+       *
+       * LCOV_EXCL_START
+       */
       if (enc == encoding)
         eventPtr = ptr;
       return XML_ERROR_UNEXPECTED_STATE;
+      /* LCOV_EXCL_STOP */
     }
     ptr = next;
   }
@@ -5564,12 +5838,15 @@ storeEntityValue(XML_Parser parser,
           goto endEntityValue;
         }
         n = XmlEncode(n, (ICHAR *)buf);
-        if (!n) {
-          if (enc == encoding)
-            eventPtr = entityTextPtr;
-          result = XML_ERROR_BAD_CHAR_REF;
-          goto endEntityValue;
-        }
+        /* The XmlEncode() functions can never return 0 here.  That
+         * error return happens if the code point passed in is either
+         * negative or greater than or equal to 0x110000.  The
+         * XmlCharRefNumber() functions will all return a number
+         * strictly less than 0x110000 or a negative value if an error
+         * occurred.  The negative value is intercepted above, so
+         * XmlEncode() is never passed a value it might return an
+         * error for.
+         */
         for (i = 0; i < n; i++) {
           if (pool->end == pool->ptr && !poolGrow(pool)) {
             result = XML_ERROR_NO_MEMORY;
@@ -5590,10 +5867,18 @@ storeEntityValue(XML_Parser parser,
       result = XML_ERROR_INVALID_TOKEN;
       goto endEntityValue;
     default:
+      /* This default case should be unnecessary -- all the tokens
+       * that XmlEntityValueTok() can return have their own explicit
+       * cases -- but should be retained for safety.  We do however
+       * exclude it from the coverage statistics.
+       *
+       * LCOV_EXCL_START
+       */
       if (enc == encoding)
         eventPtr = entityTextPtr;
       result = XML_ERROR_UNEXPECTED_STATE;
       goto endEntityValue;
+      /* LCOV_EXCL_STOP */
     }
     entityTextPtr = next;
   }
@@ -5691,8 +5976,25 @@ reportDefault(XML_Parser parser, const ENCODING *enc,
       eventEndPP = &eventEndPtr;
     }
     else {
+      /* To get here, two things must be true; the parser must be
+       * using a character encoding that is not the same as the
+       * encoding passed in, and the encoding passed in must need
+       * conversion to the internal format (UTF-8 unless XML_UNICODE
+       * is defined).  The only occasions on which the encoding passed
+       * in is not the same as the parser's encoding are when it is
+       * the internal encoding (e.g. a previously defined parameter
+       * entity, already converted to internal format).  This by
+       * definition doesn't need conversion, so the whole branch never
+       * gets executed.
+       *
+       * For safety's sake we don't delete these lines and merely
+       * exclude them from coverage statistics.
+       *
+       * LCOV_EXCL_START
+       */
       eventPP = &(openInternalEntities->internalEventPtr);
       eventEndPP = &(openInternalEntities->internalEventEndPtr);
+      /* LCOV_EXCL_STOP */
     }
     do {
       ICHAR *dataPtr = (ICHAR *)dataBuf;
@@ -5861,9 +6163,30 @@ getContext(XML_Parser parser)
     len = dtd->defaultPrefix.binding->uriLen;
     if (namespaceSeparator)
       len--;
-    for (i = 0; i < len; i++)
-      if (!poolAppendChar(&tempPool, dtd->defaultPrefix.binding->uri[i]))
-        return NULL;
+    for (i = 0; i < len; i++) {
+      if (!poolAppendChar(&tempPool, dtd->defaultPrefix.binding->uri[i])) {
+        /* Because of memory caching, I don't believe this line can be
+         * executed.
+         *
+         * This is part of a loop copying the default prefix binding
+         * URI into the parser's temporary string pool.  Previously,
+         * that URI was copied into the same string pool, with a
+         * terminating NUL character, as part of setContext().  When
+         * the pool was cleared, that leaves a block definitely big
+         * enough to hold the URI on the free block list of the pool.
+         * The URI copy in getContext() therefore cannot run out of
+         * memory.
+         *
+         * If the pool is used between the setContext() and
+         * getContext() calls, the worst it can do is leave a bigger
+         * block on the front of the free list.  Given that this is
+         * all somewhat inobvious and program logic can be changed, we
+         * don't delete the line but we do exclude it from the test
+         * coverage statistics.
+         */
+        return NULL; /* LCOV_EXCL_LINE */
+      }
+    }
     needSep = XML_TRUE;
   }
 
@@ -5875,8 +6198,15 @@ getContext(XML_Parser parser)
     PREFIX *prefix = (PREFIX *)hashTableIterNext(&iter);
     if (!prefix)
       break;
-    if (!prefix->binding)
-      continue;
+    if (!prefix->binding) {
+      /* This test appears to be (justifiable) paranoia.  There does
+       * not seem to be a way of injecting a prefix without a binding
+       * that doesn't get errored long before this function is called.
+       * The test should remain for safety's sake, so we instead
+       * exclude the following line from the coverage statistics.
+       */
+      continue; /* LCOV_EXCL_LINE */
+    }
     if (needSep && !poolAppendChar(&tempPool, CONTEXT_SEP))
       return NULL;
     for (s = prefix->name; *s; s++)
@@ -6547,8 +6877,20 @@ poolCopyString(STRING_POOL *pool, const XML_Char *s)
 static const XML_Char *
 poolCopyStringN(STRING_POOL *pool, const XML_Char *s, int n)
 {
-  if (!pool->ptr && !poolGrow(pool))
-    return NULL;
+  if (!pool->ptr && !poolGrow(pool)) {
+    /* The following line is unreachable given the current usage of
+     * poolCopyStringN().  Currently it is called from exactly one
+     * place to copy the text of a simple general entity.  By that
+     * point, the name of the entity is already stored in the pool, so
+     * pool->ptr cannot be NULL.
+     *
+     * If poolCopyStringN() is used elsewhere as it well might be,
+     * this line may well become executable again.  Regardless, this
+     * sort of check shouldn't be removed lightly, so we just exclude
+     * it from the coverage statistics.
+     */
+    return NULL; /* LCOV_EXCL_LINE */
+  }
   for (; n > 0; --n, s++) {
     if (!poolAppendChar(pool, *s))
       return NULL;
@@ -6641,8 +6983,19 @@ poolGrow(STRING_POOL *pool)
     int blockSize = (int)((unsigned)(pool->end - pool->start)*2U);
     size_t bytesToAllocate;
 
-    if (blockSize < 0)
-      return XML_FALSE;
+    // NOTE: Needs to be calculated prior to calling `realloc`
+    //       to avoid dangling pointers:
+    const ptrdiff_t offsetInsideBlock = pool->ptr - pool->start;
+
+    if (blockSize < 0) {
+      /* This condition traps a situation where either more than
+       * INT_MAX/2 bytes have already been allocated.  This isn't
+       * readily testable, since it is unlikely that an average
+       * machine will have that much memory, so we exclude it from the
+       * coverage statistics.
+       */
+      return XML_FALSE; /* LCOV_EXCL_LINE */
+    }
 
     bytesToAllocate = poolBytesToAllocateFor(blockSize);
     if (bytesToAllocate == 0)
@@ -6654,7 +7007,7 @@ poolGrow(STRING_POOL *pool)
       return XML_FALSE;
     pool->blocks = temp;
     pool->blocks->size = blockSize;
-    pool->ptr = pool->blocks->s + (pool->ptr - pool->start);
+    pool->ptr = pool->blocks->s + offsetInsideBlock;
     pool->start = pool->blocks->s;
     pool->end = pool->start + blockSize;
   }
@@ -6663,8 +7016,18 @@ poolGrow(STRING_POOL *pool)
     int blockSize = (int)(pool->end - pool->start);
     size_t bytesToAllocate;
 
-    if (blockSize < 0)
-      return XML_FALSE;
+    if (blockSize < 0) {
+      /* This condition traps a situation where either more than
+       * INT_MAX bytes have already been allocated (which is prevented
+       * by various pieces of program logic, not least this one, never
+       * mind the unlikelihood of actually having that much memory) or
+       * the pool control fields have been corrupted (which could
+       * conceivably happen in an extremely buggy user handler
+       * function).  Either way it isn't readily testable, so we
+       * exclude it from the coverage statistics.
+       */
+      return XML_FALSE;  /* LCOV_EXCL_LINE */
+    }
 
     if (blockSize < INIT_BLOCK_SIZE)
       blockSize = INIT_BLOCK_SIZE;
@@ -6827,3 +7190,26 @@ getElementType(XML_Parser parser,
   }
   return ret;
 }
+
+static XML_Char *
+copyString(const XML_Char *s,
+           const XML_Memory_Handling_Suite *memsuite)
+{
+    int charsRequired = 0;
+    XML_Char *result;
+
+    /* First determine how long the string is */
+    while (s[charsRequired] != 0) {
+      charsRequired++;
+    }
+    /* Include the terminator */
+    charsRequired++;
+
+    /* Now allocate space for the copy */
+    result = memsuite->malloc_fcn(charsRequired * sizeof(XML_Char));
+    if (result == NULL)
+        return NULL;
+    /* Copy the original into place */
+    memcpy(result, s, charsRequired * sizeof(XML_Char));
+    return result;
+}
diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c
index a7c56302796..c809ee51482 100644
--- a/Modules/expat/xmlrole.c
+++ b/Modules/expat/xmlrole.c
@@ -170,7 +170,14 @@ prolog1(PROLOG_STATE *state,
   case XML_TOK_COMMENT:
     return XML_ROLE_COMMENT;
   case XML_TOK_BOM:
-    return XML_ROLE_NONE;
+    /* This case can never arise.  To reach this role function, the
+     * parse must have passed through prolog0 and therefore have had
+     * some form of input, even if only a space.  At that point, a
+     * byte order mark is no longer a valid character (though
+     * technically it should be interpreted as a non-breaking space),
+     * so will be rejected by the tokenizing stages.
+     */
+    return XML_ROLE_NONE; /* LCOV_EXCL_LINE */
   case XML_TOK_DECL_OPEN:
     if (!XmlNameMatchesAscii(enc,
                              ptr + 2 * MIN_BYTES_PER_CHAR(enc),
@@ -1285,6 +1292,26 @@ declClose(PROLOG_STATE *state,
   return common(state, tok);
 }
 
+/* This function will only be invoked if the internal logic of the
+ * parser has broken down.  It is used in two cases:
+ *
+ * 1: When the XML prolog has been finished.  At this point the
+ * processor (the parser level above these role handlers) should
+ * switch from prologProcessor to contentProcessor and reinitialise
+ * the handler function.
+ *
+ * 2: When an error has been detected (via common() below).  At this
+ * point again the processor should be switched to errorProcessor,
+ * which will never call a handler.
+ *
+ * The result of this is that error() can only be called if the
+ * processor switch failed to happen, which is an internal error and
+ * therefore we shouldn't be able to provoke it simply by using the
+ * library.  It is a necessary backstop, however, so we merely exclude
+ * it from the coverage statistics.
+ *
+ * LCOV_EXCL_START
+ */
 static int PTRCALL
 error(PROLOG_STATE *UNUSED_P(state),
       int UNUSED_P(tok),
@@ -1294,6 +1321,7 @@ error(PROLOG_STATE *UNUSED_P(state),
 {
   return XML_ROLE_NONE;
 }
+/* LCOV_EXCL_STOP */
 
 static int FASTCALL
 common(PROLOG_STATE *state, int tok)
diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c
index cdf0720dd89..db4a5c8ca3e 100644
--- a/Modules/expat/xmltok.c
+++ b/Modules/expat/xmltok.c
@@ -1019,7 +1019,11 @@ streqci(const char *s1, const char *s2)
     if (ASCII_a <= c1 && c1 <= ASCII_z)
       c1 += ASCII_A - ASCII_a;
     if (ASCII_a <= c2 && c2 <= ASCII_z)
-      c2 += ASCII_A - ASCII_a;
+      /* The following line will never get executed.  streqci() is
+       * only called from two places, both of which guarantee to put
+       * upper-case strings into s2.
+       */
+      c2 += ASCII_A - ASCII_a; /* LCOV_EXCL_LINE */
     if (c1 != c2)
       return 0;
     if (!c1)
@@ -1291,7 +1295,7 @@ XmlUtf8Encode(int c, char *buf)
   };
 
   if (c < 0)
-    return 0;
+    return 0; /* LCOV_EXCL_LINE: this case is always eliminated beforehand */
   if (c < min2) {
     buf[0] = (char)(c | UTF8_cval1);
     return 1;
@@ -1314,7 +1318,7 @@ XmlUtf8Encode(int c, char *buf)
     buf[3] = (char)((c & 0x3f) | 0x80);
     return 4;
   }
-  return 0;
+  return 0; /* LCOV_EXCL_LINE: this case too is eliminated before calling */
 }
 
 int FASTCALL
@@ -1465,6 +1469,9 @@ XmlInitUnknownEncoding(void *mem,
     else if (c < 0) {
       if (c < -4)
         return 0;
+      /* Multi-byte sequences need a converter function */
+      if (!convert)
+        return 0;
       e->normal.type[i] = (unsigned char)(BT_LEAD2 - (c + 2));
       e->utf8[i][0] = 0;
       e->utf16[i] = 0;
diff --git a/Modules/expat/xmltok_impl.c b/Modules/expat/xmltok_impl.c
index 5f779c0571b..4fa1ff679ce 100644
--- a/Modules/expat/xmltok_impl.c
+++ b/Modules/expat/xmltok_impl.c
@@ -1198,8 +1198,14 @@ PREFIX(attributeValueTok)(const ENCODING *enc, const char *ptr,
   const char *start;
   if (ptr >= end)
     return XML_TOK_NONE;
-  else if (! HAS_CHAR(enc, ptr, end))
-    return XML_TOK_PARTIAL;
+  else if (! HAS_CHAR(enc, ptr, end)) {
+    /* This line cannot be executed.  The incoming data has already
+     * been tokenized once, so incomplete characters like this have
+     * already been eliminated from the input.  Retaining the paranoia
+     * check is still valuable, however.
+     */
+    return XML_TOK_PARTIAL; /* LCOV_EXCL_LINE */
+  }
   start = ptr;
   while (HAS_CHAR(enc, ptr, end)) {
     switch (BYTE_TYPE(enc, ptr)) {
@@ -1258,8 +1264,14 @@ PREFIX(entityValueTok)(const ENCODING *enc, const char *ptr,
   const char *start;
   if (ptr >= end)
     return XML_TOK_NONE;
-  else if (! HAS_CHAR(enc, ptr, end))
-    return XML_TOK_PARTIAL;
+  else if (! HAS_CHAR(enc, ptr, end)) {
+    /* This line cannot be executed.  The incoming data has already
+     * been tokenized once, so incomplete characters like this have
+     * already been eliminated from the input.  Retaining the paranoia
+     * check is still valuable, however.
+     */
+    return XML_TOK_PARTIAL; /* LCOV_EXCL_LINE */
+  }
   start = ptr;
   while (HAS_CHAR(enc, ptr, end)) {
     switch (BYTE_TYPE(enc, ptr)) {
@@ -1614,6 +1626,14 @@ PREFIX(predefinedEntityName)(const ENCODING *UNUSED_P(enc), const char *ptr,
   return 0;
 }
 
+/* This function does not appear to be called from anywhere within the
+ * library code.  It is used via the macro XmlSameName(), which is
+ * defined but never used.  Since it appears in the encoding function
+ * table, removing it is not a thing to be undertaken lightly.  For
+ * the moment, we simply exclude it from coverage tests.
+ *
+ * LCOV_EXCL_START
+ */
 static int PTRCALL
 PREFIX(sameName)(const ENCODING *enc, const char *ptr1, const char *ptr2)
 {
@@ -1677,14 +1697,21 @@ PREFIX(sameName)(const ENCODING *enc, const char *ptr1, const char *ptr2)
   }
   /* not reached */
 }
+/* LCOV_EXCL_STOP */
 
 static int PTRCALL
 PREFIX(nameMatchesAscii)(const ENCODING *UNUSED_P(enc), const char *ptr1,
                          const char *end1, const char *ptr2)
 {
   for (; *ptr2; ptr1 += MINBPC(enc), ptr2++) {
-    if (end1 - ptr1 < MINBPC(enc))
-      return 0;
+    if (end1 - ptr1 < MINBPC(enc)) {
+      /* This line cannot be executed.  THe incoming data has already
+       * been tokenized once, so imcomplete characters like this have
+       * already been eliminated from the input.  Retaining the
+       * paranoia check is still valuable, however.
+       */
+      return 0; /* LCOV_EXCL_LINE */
+    }
     if (!CHAR_MATCHES(enc, ptr1, *ptr2))
       return 0;
   }
diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
index 639ba479db5..0db61f20818 100644
--- a/PCbuild/_elementtree.vcxproj
+++ b/PCbuild/_elementtree.vcxproj
@@ -87,6 +87,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Modules\_elementtree.c" />
+    <ClCompile Include="..\Modules\expat\loadlibrary.c" />
     <ClCompile Include="..\Modules\expat\xmlparse.c" />
     <ClCompile Include="..\Modules\expat\xmlrole.c" />
     <ClCompile Include="..\Modules\expat\xmltok.c" />
diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters
index ee78295fa94..4597ee521b3 100644
--- a/PCbuild/_elementtree.vcxproj.filters
+++ b/PCbuild/_elementtree.vcxproj.filters
@@ -33,6 +33,9 @@
     <ClInclude Include="..\Modules\expat\latin1tab.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\Modules\expat\loadlibrary.c">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\Modules\expat\macconfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -69,4 +72,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
index a2763f02063..51ca69e95d7 100644
--- a/PCbuild/pyexpat.vcxproj
+++ b/PCbuild/pyexpat.vcxproj
@@ -68,6 +68,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Modules\pyexpat.c" />
+    <ClCompile Include="..\Modules\expat\loadlibrary.c" />
     <ClCompile Include="..\Modules\expat\xmlparse.c" />
     <ClCompile Include="..\Modules\expat\xmlrole.c" />
     <ClCompile Include="..\Modules\expat\xmltok.c" />
@@ -84,4 +85,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters
index abf362fb0bf..cb02847980c 100644
--- a/PCbuild/pyexpat.vcxproj.filters
+++ b/PCbuild/pyexpat.vcxproj.filters
@@ -20,6 +20,9 @@
     <ClCompile Include="..\Modules\pyexpat.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\Modules\expat\loadlibrary.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\Modules\expat\xmlparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -30,4 +33,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/setup.py b/setup.py
index fe477974bd0..1cd15039970 100644
--- a/setup.py
+++ b/setup.py
@@ -1503,6 +1503,9 @@ class db_found(Exception): pass
             expat_inc = [os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')]
             define_macros = [
                 ('HAVE_EXPAT_CONFIG_H', '1'),
+                # bpo-30947: Python uses best available entropy sources to
+                # call XML_SetHashSalt(), expat entropy sources are not needed
+                ('XML_POOR_ENTROPY', '1'),
             ]
             expat_lib = []
             expat_sources = ['expat/xmlparse.c',


From webhook-mailer at python.org  Fri Aug 18 19:06:48 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 18 Aug 2017 23:06:48 -0000
Subject: [Python-checkins] bpo-30947: Update libexpat from 2.2.1 to 2.2.3
 (#3106) (#3145)
Message-ID: <mailman.60.1503097609.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/ec4ab09b7c0b5070bdb27351f979cbecc4636245
commit: ec4ab09b7c0b5070bdb27351f979cbecc4636245
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-19T01:06:45+02:00
summary:

bpo-30947: Update libexpat from 2.2.1 to 2.2.3 (#3106) (#3145)

* bpo-30947: Update libexpat from 2.2.1 to 2.2.3

* Add NEWS entry

* Add new loadlibrary.c

* expat_external.h: restore include "pyexpatns.h"

* PCbuild: add expat/loadlibrary.c

* Define XML_POOR_ENTROPY to compile expat

Python 2.7 backport: add expat/loadlibrary.c to PC/VS9.0/ project
files (_elementtree and pyexpat).

(cherry picked from commit 93d0cb58b4da2a88c56f472c6c19491cc7a390df)

files:
A Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst
A Modules/expat/loadlibrary.c
M Modules/expat/expat.h
M Modules/expat/siphash.h
M Modules/expat/xmlparse.c
M Modules/expat/xmlrole.c
M Modules/expat/xmltok.c
M Modules/expat/xmltok_impl.c
M PC/VS9.0/_elementtree.vcproj
M PC/VS9.0/pyexpat.vcproj
M PCbuild/_elementtree.vcxproj
M PCbuild/_elementtree.vcxproj.filters
M PCbuild/pyexpat.vcxproj
M PCbuild/pyexpat.vcxproj.filters
M setup.py

diff --git a/Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst b/Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst
new file mode 100644
index 00000000000..3caca9a79b4
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst
@@ -0,0 +1,2 @@
+Upgrade libexpat embedded copy from version 2.2.1 to 2.2.3 to get security
+fixes.
diff --git a/Modules/expat/expat.h b/Modules/expat/expat.h
index 28b0f954d41..7e5bbb7e393 100644
--- a/Modules/expat/expat.h
+++ b/Modules/expat/expat.h
@@ -24,7 +24,6 @@ extern "C" {
 struct XML_ParserStruct;
 typedef struct XML_ParserStruct *XML_Parser;
 
-/* Should this be defined using stdbool.h when C99 is available? */
 typedef unsigned char XML_Bool;
 #define XML_TRUE   ((XML_Bool) 1)
 #define XML_FALSE  ((XML_Bool) 0)
@@ -1049,7 +1048,7 @@ XML_GetFeatureList(void);
 */
 #define XML_MAJOR_VERSION 2
 #define XML_MINOR_VERSION 2
-#define XML_MICRO_VERSION 1
+#define XML_MICRO_VERSION 3
 
 #ifdef __cplusplus
 }
diff --git a/Modules/expat/loadlibrary.c b/Modules/expat/loadlibrary.c
new file mode 100644
index 00000000000..ffce868399b
--- /dev/null
+++ b/Modules/expat/loadlibrary.c
@@ -0,0 +1,141 @@
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 2016 - 2017, Steve Holme, <steve_holme at hotmail.com>.
+ *
+ * All rights reserved.
+ *
+ * Permission to  use, copy,  modify, and distribute  this software  for any
+ * purpose with  or without fee is  hereby granted, provided that  the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+ * EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+ * MERCHANTABILITY, FITNESS FOR A  PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR  OTHERWISE, ARISING FROM, OUT OF OR  IN CONNECTION WITH
+ * THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice,  the name of a copyright holder shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings  in this  Software without  prior written  authorization of  the
+ * copyright holder.
+ *
+ ***************************************************************************/
+
+#if defined(_WIN32)
+
+#include <windows.h>
+#include <tchar.h>
+
+
+HMODULE _Expat_LoadLibrary(LPCTSTR filename);
+
+
+#if !defined(LOAD_WITH_ALTERED_SEARCH_PATH)
+#define LOAD_WITH_ALTERED_SEARCH_PATH  0x00000008
+#endif
+
+#if !defined(LOAD_LIBRARY_SEARCH_SYSTEM32)
+#define LOAD_LIBRARY_SEARCH_SYSTEM32   0x00000800
+#endif
+
+/* We use our own typedef here since some headers might lack these */
+typedef HMODULE (APIENTRY *LOADLIBRARYEX_FN)(LPCTSTR, HANDLE, DWORD);
+
+/* See function definitions in winbase.h */
+#ifdef UNICODE
+#  ifdef _WIN32_WCE
+#    define LOADLIBARYEX  L"LoadLibraryExW"
+#  else
+#    define LOADLIBARYEX  "LoadLibraryExW"
+#  endif
+#else
+#  define LOADLIBARYEX    "LoadLibraryExA"
+#endif
+
+
+/*
+ * _Expat_LoadLibrary()
+ *
+ * This is used to dynamically load DLLs using the most secure method available
+ * for the version of Windows that we are running on.
+ *
+ * Parameters:
+ *
+ * filename  [in] - The filename or full path of the DLL to load. If only the
+ *                  filename is passed then the DLL will be loaded from the
+ *                  Windows system directory.
+ *
+ * Returns the handle of the module on success; otherwise NULL.
+ */
+HMODULE _Expat_LoadLibrary(LPCTSTR filename)
+{
+  HMODULE hModule = NULL;
+  LOADLIBRARYEX_FN pLoadLibraryEx = NULL;
+
+  /* Get a handle to kernel32 so we can access it's functions at runtime */
+  HMODULE hKernel32 = GetModuleHandle(TEXT("kernel32"));
+  if(!hKernel32)
+    return NULL;
+
+  /* Attempt to find LoadLibraryEx() which is only available on Windows 2000
+     and above */
+  pLoadLibraryEx = (LOADLIBRARYEX_FN) GetProcAddress(hKernel32, LOADLIBARYEX);
+
+  /* Detect if there's already a path in the filename and load the library if
+     there is. Note: Both back slashes and forward slashes have been supported
+     since the earlier days of DOS at an API level although they are not
+     supported by command prompt */
+  if(_tcspbrk(filename, TEXT("\\/"))) {
+    /** !checksrc! disable BANNEDFUNC 1 **/
+    hModule = pLoadLibraryEx ?
+      pLoadLibraryEx(filename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH) :
+      LoadLibrary(filename);
+  }
+  /* Detect if KB2533623 is installed, as LOAD_LIBARY_SEARCH_SYSTEM32 is only
+     supported on Windows Vista, Windows Server 2008, Windows 7 and Windows
+     Server 2008 R2 with this patch or natively on Windows 8 and above */
+  else if(pLoadLibraryEx && GetProcAddress(hKernel32, "AddDllDirectory")) {
+    /* Load the DLL from the Windows system directory */
+    hModule = pLoadLibraryEx(filename, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
+  }
+  else {
+    /* Attempt to get the Windows system path */
+    UINT systemdirlen = GetSystemDirectory(NULL, 0);
+    if(systemdirlen) {
+      /* Allocate space for the full DLL path (Room for the null terminator
+         is included in systemdirlen) */
+      size_t filenamelen = _tcslen(filename);
+      TCHAR *path = malloc(sizeof(TCHAR) * (systemdirlen + 1 + filenamelen));
+      if(path && GetSystemDirectory(path, systemdirlen)) {
+        /* Calculate the full DLL path */
+        _tcscpy(path + _tcslen(path), TEXT("\\"));
+        _tcscpy(path + _tcslen(path), filename);
+
+        /* Load the DLL from the Windows system directory */
+        /** !checksrc! disable BANNEDFUNC 1 **/
+        hModule = pLoadLibraryEx ?
+          pLoadLibraryEx(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH) :
+          LoadLibrary(path);
+
+      }
+      free(path);
+    }
+  }
+
+  return hModule;
+}
+
+#else /* defined(_WIN32) */
+
+/* ISO C requires a translation unit to contain at least one declaration
+   [-Wempty-translation-unit] */
+typedef int _TRANSLATION_UNIT_LOAD_LIBRARY_C_NOT_EMTPY;
+
+#endif /* defined(_WIN32) */
diff --git a/Modules/expat/siphash.h b/Modules/expat/siphash.h
index 3c5fef49be8..581872df7b4 100644
--- a/Modules/expat/siphash.h
+++ b/Modules/expat/siphash.h
@@ -2,9 +2,8 @@
  * siphash.h - SipHash-2-4 in a single header file
  * --------------------------------------------------------------------------
  * Derived by William Ahern from the reference implementation[1] published[2]
- * by Jean-Philippe Aumasson and Daniel J. Berstein. Licensed in kind.
  * by Jean-Philippe Aumasson and Daniel J. Berstein.
- * Minimal changes by Sebastian Pipping on top, details below.
+ * Minimal changes by Sebastian Pipping and Victor Stinner on top, see below.
  * Licensed under the CC0 Public Domain Dedication license.
  *
  * 1. https://www.131002.net/siphash/siphash24.c
@@ -12,17 +11,25 @@
  * --------------------------------------------------------------------------
  * HISTORY:
  *
- * 2017-06-18  (Sebastian Pipping)
- *   - Address lack of stdint.h for Visual Studio 2003 to 2008
+ * 2017-07-25  (Vadim Zeitlin)
+ *   - Fix use of SIPHASH_MAIN macro
+ *
+ * 2017-07-05  (Sebastian Pipping)
+ *   - Use _SIP_ULL macro to not require a C++11 compiler if compiled as C++
+ *   - Add const qualifiers at two places
+ *   - Ensure <=80 characters line length (assuming tab width 4)
  *
- * 2017-06-10  (Sebastian Pipping)
+ * 2017-06-23  (Victor Stinner)
+ *   - Address Win64 compile warnings
+ *
+ * 2017-06-18  (Sebastian Pipping)
  *   - Clarify license note in the header
  *   - Address C89 issues:
  *     - Stop using inline keyword (and let compiler decide)
- *     - Turn integer suffix ULL to UL
  *     - Replace _Bool by int
  *     - Turn macro siphash24 into a function
  *     - Address invalid conversion (void pointer) by explicit cast
+ *   - Address lack of stdint.h for Visual Studio 2003 to 2008
  *   - Always expose sip24_valid (for self-tests)
  *
  * 2012-11-04 - Born.  (William Ahern)
@@ -90,6 +97,14 @@
 #endif
 
 
+/*
+ * Workaround to not require a C++11 compiler for using ULL suffix
+ * if this code is included and compiled as C++; related GCC warning is:
+ * warning: use of C++11 long long integer constant [-Wlong-long]
+ */
+#define _SIP_ULL(high, low)  (((uint64_t)high << 32) | low)
+
+
 #define SIP_ROTL(x, b) (uint64_t)(((x) << (b)) | ( (x) >> (64 - (b))))
 
 #define SIP_U32TO8_LE(p, v) \
@@ -169,11 +184,12 @@ static void sip_round(struct siphash *H, const int rounds) {
 } /* sip_round() */
 
 
-static struct siphash *sip24_init(struct siphash *H, const struct sipkey *key) {
-	H->v0 = 0x736f6d6570736575UL ^ key->k[0];
-	H->v1 = 0x646f72616e646f6dUL ^ key->k[1];
-	H->v2 = 0x6c7967656e657261UL ^ key->k[0];
-	H->v3 = 0x7465646279746573UL ^ key->k[1];
+static struct siphash *sip24_init(struct siphash *H,
+		const struct sipkey *key) {
+	H->v0 = _SIP_ULL(0x736f6d65U, 0x70736575U) ^ key->k[0];
+	H->v1 = _SIP_ULL(0x646f7261U, 0x6e646f6dU) ^ key->k[1];
+	H->v2 = _SIP_ULL(0x6c796765U, 0x6e657261U) ^ key->k[0];
+	H->v3 = _SIP_ULL(0x74656462U, 0x79746573U) ^ key->k[1];
 
 	H->p = H->buf;
 	H->c = 0;
@@ -184,7 +200,8 @@ static struct siphash *sip24_init(struct siphash *H, const struct sipkey *key) {
 
 #define sip_endof(a) (&(a)[sizeof (a) / sizeof *(a)])
 
-static struct siphash *sip24_update(struct siphash *H, const void *src, size_t len) {
+static struct siphash *sip24_update(struct siphash *H, const void *src,
+		size_t len) {
 	const unsigned char *p = (const unsigned char *)src, *pe = p + len;
 	uint64_t m;
 
@@ -209,7 +226,7 @@ static struct siphash *sip24_update(struct siphash *H, const void *src, size_t l
 
 
 static uint64_t sip24_final(struct siphash *H) {
-	char left = H->p - H->buf;
+	const char left = (char)(H->p - H->buf);
 	uint64_t b = (H->c + left) << 56;
 
 	switch (left) {
@@ -233,7 +250,8 @@ static uint64_t sip24_final(struct siphash *H) {
 } /* sip24_final() */
 
 
-static uint64_t siphash24(const void *src, size_t len, const struct sipkey *key) {
+static uint64_t siphash24(const void *src, size_t len,
+		const struct sipkey *key) {
 	struct siphash state = SIPHASH_INITIALIZER;
 	return sip24_final(sip24_update(sip24_init(&state, key), src, len));
 } /* siphash24() */
@@ -321,10 +339,11 @@ static int sip24_valid(void) {
 	struct sipkey k;
 	size_t i;
 
-	sip_tokey(&k, "\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017");
+	sip_tokey(&k, "\000\001\002\003\004\005\006\007\010\011"
+			"\012\013\014\015\016\017");
 
 	for (i = 0; i < sizeof in; ++i) {
-		in[i] = i;
+		in[i] = (unsigned char)i;
 
 		if (siphash24(in, i, &k) != SIP_U8TO64_LE(vectors[i]))
 			return 0;
@@ -334,12 +353,12 @@ static int sip24_valid(void) {
 } /* sip24_valid() */
 
 
-#if SIPHASH_MAIN
+#ifdef SIPHASH_MAIN
 
 #include <stdio.h>
 
 int main(void) {
-	int ok = sip24_valid();
+	const int ok = sip24_valid();
 
 	if (ok)
 		puts("OK");
diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c
index daec151e232..b703e61a040 100644
--- a/Modules/expat/xmlparse.c
+++ b/Modules/expat/xmlparse.c
@@ -1,10 +1,12 @@
 /* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
    See the file COPYING for copying permission.
 
-   77fea421d361dca90041d0040ecf1dca651167fadf2af79e990e35168d70d933 (2.2.1+)
+   101bfd65d1ff3d1511cf6671e6aae65f82cd97df6f4da137d46d510731830ad9 (2.2.3+)
 */
 
-#define _GNU_SOURCE 1                   /* syscall prototype */
+#if !defined(_GNU_SOURCE)
+# define _GNU_SOURCE 1                  /* syscall prototype */
+#endif
 
 #include <stddef.h>
 #include <string.h>                     /* memset(), memcpy() */
@@ -19,6 +21,8 @@
 #include <sys/time.h>                   /* gettimeofday() */
 #include <sys/types.h>                  /* getpid() */
 #include <unistd.h>                     /* getpid() */
+#include <fcntl.h>                      /* O_RDONLY */
+#include <errno.h>
 #endif
 
 #define XML_BUILDING_EXPAT 1
@@ -33,6 +37,57 @@
 #include "expat.h"
 #include "siphash.h"
 
+#if defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM)
+# if defined(HAVE_GETRANDOM)
+#  include <sys/random.h>    /* getrandom */
+# else
+#  include <unistd.h>        /* syscall */
+#  include <sys/syscall.h>   /* SYS_getrandom */
+# endif
+# if ! defined(GRND_NONBLOCK)
+#  define GRND_NONBLOCK  0x0001
+# endif  /* defined(GRND_NONBLOCK) */
+#endif  /* defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM) */
+
+#if defined(HAVE_LIBBSD) \
+    && (defined(HAVE_ARC4RANDOM_BUF) || defined(HAVE_ARC4RANDOM))
+# include <bsd/stdlib.h>
+#endif
+
+#if defined(_WIN32) && !defined(LOAD_LIBRARY_SEARCH_SYSTEM32)
+# define LOAD_LIBRARY_SEARCH_SYSTEM32  0x00000800
+#endif
+
+#if !defined(HAVE_GETRANDOM) && !defined(HAVE_SYSCALL_GETRANDOM) \
+    && !defined(HAVE_ARC4RANDOM_BUF) && !defined(HAVE_ARC4RANDOM) \
+    && !defined(XML_DEV_URANDOM) \
+    && !defined(_WIN32) \
+    && !defined(XML_POOR_ENTROPY)
+# error  \
+    You do not have support for any sources of high quality entropy \
+    enabled.  For end user security, that is probably not what you want. \
+    \
+    Your options include: \
+      * Linux + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
+      * Linux + glibc <2.25 (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
+      * BSD / macOS >=10.7 (arc4random_buf): HAVE_ARC4RANDOM_BUF, \
+      * BSD / macOS <10.7 (arc4random): HAVE_ARC4RANDOM, \
+      * libbsd (arc4random_buf): HAVE_ARC4RANDOM_BUF + HAVE_LIBBSD, \
+      * libbsd (arc4random): HAVE_ARC4RANDOM + HAVE_LIBBSD, \
+      * Linux / BSD / macOS (/dev/urandom): XML_DEV_URANDOM \
+      * Windows (RtlGenRandom): _WIN32. \
+    \
+    If insist on not using any of these, bypass this error by defining \
+    XML_POOR_ENTROPY; you have been warned. \
+    \
+    For CMake, one way to pass the define is: \
+        cmake -DCMAKE_C_FLAGS="-pipe -O2 -DHAVE_SYSCALL_GETRANDOM" . \
+    \
+    If you have reasons to patch this detection code away or need changes \
+    to the build system, please open a bug.  Thank you!
+#endif
+
+
 #ifdef XML_UNICODE
 #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX
 #define XmlConvert XmlUtf16Convert
@@ -436,6 +491,9 @@ static ELEMENT_TYPE *
 getElementType(XML_Parser parser, const ENCODING *enc,
                const char *ptr, const char *end);
 
+static XML_Char *copyString(const XML_Char *s,
+                            const XML_Memory_Handling_Suite *memsuite);
+
 static unsigned long generate_hash_secret_salt(XML_Parser parser);
 static XML_Bool startParsing(XML_Parser parser);
 
@@ -696,21 +754,13 @@ static const XML_Char implicitContext[] = {
 
 
 #if defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM)
-# include <errno.h>
-
-# if defined(HAVE_GETRANDOM)
-#  include <sys/random.h>    /* getrandom */
-# else
-#  include <unistd.h>        /* syscall */
-#  include <sys/syscall.h>   /* SYS_getrandom */
-# endif
 
 /* Obtain entropy on Linux 3.17+ */
 static int
-writeRandomBytes_getrandom(void * target, size_t count) {
+writeRandomBytes_getrandom_nonblock(void * target, size_t count) {
   int success = 0;  /* full count bytes written? */
   size_t bytesWrittenTotal = 0;
-  const unsigned int getrandomFlags = 0;
+  const unsigned int getrandomFlags = GRND_NONBLOCK;
 
   do {
     void * const currentTarget = (void*)((char*)target + bytesWrittenTotal);
@@ -728,7 +778,7 @@ writeRandomBytes_getrandom(void * target, size_t count) {
       if (bytesWrittenTotal >= count)
         success = 1;
     }
-  } while (! success && (errno == EINTR || errno == EAGAIN));
+  } while (! success && (errno == EINTR));
 
   return success;
 }
@@ -736,12 +786,67 @@ writeRandomBytes_getrandom(void * target, size_t count) {
 #endif  /* defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM) */
 
 
+#if ! defined(_WIN32) && defined(XML_DEV_URANDOM)
+
+/* Extract entropy from /dev/urandom */
+static int
+writeRandomBytes_dev_urandom(void * target, size_t count) {
+  int success = 0;  /* full count bytes written? */
+  size_t bytesWrittenTotal = 0;
+
+  const int fd = open("/dev/urandom", O_RDONLY);
+  if (fd < 0) {
+    return 0;
+  }
+
+  do {
+    void * const currentTarget = (void*)((char*)target + bytesWrittenTotal);
+    const size_t bytesToWrite = count - bytesWrittenTotal;
+
+    const ssize_t bytesWrittenMore = read(fd, currentTarget, bytesToWrite);
+
+    if (bytesWrittenMore > 0) {
+      bytesWrittenTotal += bytesWrittenMore;
+      if (bytesWrittenTotal >= count)
+        success = 1;
+    }
+  } while (! success && (errno == EINTR));
+
+  close(fd);
+  return success;
+}
+
+#endif  /* ! defined(_WIN32) && defined(XML_DEV_URANDOM) */
+
+
+#if defined(HAVE_ARC4RANDOM)
+
+static void
+writeRandomBytes_arc4random(void * target, size_t count) {
+  size_t bytesWrittenTotal = 0;
+
+  while (bytesWrittenTotal < count) {
+    const uint32_t random32 = arc4random();
+    size_t i = 0;
+
+    for (; (i < sizeof(random32)) && (bytesWrittenTotal < count);
+        i++, bytesWrittenTotal++) {
+      const uint8_t random8 = (uint8_t)(random32 >> (i * 8));
+      ((uint8_t *)target)[bytesWrittenTotal] = random8;
+    }
+  }
+}
+
+#endif  /* defined(HAVE_ARC4RANDOM) */
+
+
 #ifdef _WIN32
 
 typedef BOOLEAN (APIENTRY *RTLGENRANDOM_FUNC)(PVOID, ULONG);
+HMODULE _Expat_LoadLibrary(LPCTSTR filename);  /* see loadlibrary.c */
 
 /* Obtain entropy on Windows XP / Windows Server 2003 and later.
- * Hint on RtlGenRandom and the following article from libsodioum.
+ * Hint on RtlGenRandom and the following article from libsodium.
  *
  * Michael Howard: Cryptographically Secure Random number on Windows without using CryptoAPI
  * https://blogs.msdn.microsoft.com/michael_howard/2005/01/14/cryptographically-secure-random-number-on-windows-without-using-cryptoapi/
@@ -749,7 +854,7 @@ typedef BOOLEAN (APIENTRY *RTLGENRANDOM_FUNC)(PVOID, ULONG);
 static int
 writeRandomBytes_RtlGenRandom(void * target, size_t count) {
   int success = 0;  /* full count bytes written? */
-  const HMODULE advapi32 = LoadLibrary("ADVAPI32.DLL");
+  const HMODULE advapi32 = _Expat_LoadLibrary(TEXT("ADVAPI32.DLL"));
 
   if (advapi32) {
     const RTLGENRANDOM_FUNC RtlGenRandom
@@ -768,6 +873,8 @@ writeRandomBytes_RtlGenRandom(void * target, size_t count) {
 #endif /* _WIN32 */
 
 
+#if ! defined(HAVE_ARC4RANDOM_BUF) && ! defined(HAVE_ARC4RANDOM)
+
 static unsigned long
 gather_time_entropy(void)
 {
@@ -780,16 +887,20 @@ gather_time_entropy(void)
   int gettimeofday_res;
 
   gettimeofday_res = gettimeofday(&tv, NULL);
+
+#if defined(NDEBUG)
+  (void)gettimeofday_res;
+#else
   assert (gettimeofday_res == 0);
+#endif  /* defined(NDEBUG) */
 
   /* Microseconds time is <20 bits entropy */
   return tv.tv_usec;
 #endif
 }
 
-#if defined(HAVE_ARC4RANDOM_BUF) && defined(HAVE_LIBBSD)
-# include <bsd/stdlib.h>
-#endif
+#endif  /* ! defined(HAVE_ARC4RANDOM_BUF) && ! defined(HAVE_ARC4RANDOM) */
+
 
 static unsigned long
 ENTROPY_DEBUG(const char * label, unsigned long entropy) {
@@ -808,10 +919,12 @@ generate_hash_secret_salt(XML_Parser parser)
 {
   unsigned long entropy;
   (void)parser;
-#if defined(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__)
-  (void)gather_time_entropy;
+#if defined(HAVE_ARC4RANDOM_BUF)
   arc4random_buf(&entropy, sizeof(entropy));
   return ENTROPY_DEBUG("arc4random_buf", entropy);
+#elif defined(HAVE_ARC4RANDOM)
+  writeRandomBytes_arc4random((void *)&entropy, sizeof(entropy));
+  return ENTROPY_DEBUG("arc4random", entropy);
 #else
   /* Try high quality providers first .. */
 #ifdef _WIN32
@@ -819,10 +932,15 @@ generate_hash_secret_salt(XML_Parser parser)
     return ENTROPY_DEBUG("RtlGenRandom", entropy);
   }
 #elif defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM)
-  if (writeRandomBytes_getrandom((void *)&entropy, sizeof(entropy))) {
+  if (writeRandomBytes_getrandom_nonblock((void *)&entropy, sizeof(entropy))) {
     return ENTROPY_DEBUG("getrandom", entropy);
   }
 #endif
+#if ! defined(_WIN32) && defined(XML_DEV_URANDOM)
+  if (writeRandomBytes_dev_urandom((void *)&entropy, sizeof(entropy))) {
+    return ENTROPY_DEBUG("/dev/urandom", entropy);
+  }
+#endif  /* ! defined(_WIN32) && defined(XML_DEV_URANDOM) */
   /* .. and self-made low quality for backup: */
 
   /* Process ID is 0 bits entropy if attacker has local access */
@@ -833,7 +951,7 @@ generate_hash_secret_salt(XML_Parser parser)
     return ENTROPY_DEBUG("fallback(4)", entropy * 2147483647);
   } else {
     return ENTROPY_DEBUG("fallback(8)",
-        entropy * (unsigned long)2305843009213693951);
+        entropy * (unsigned long)2305843009213693951ULL);
   }
 #endif
 }
@@ -962,6 +1080,8 @@ parserCreate(const XML_Char *encodingName,
   nsAttsVersion = 0;
   nsAttsPower = 0;
 
+  protocolEncodingName = NULL;
+
   poolInit(&tempPool, &(parser->m_mem));
   poolInit(&temp2Pool, &(parser->m_mem));
   parserInit(parser, encodingName);
@@ -988,9 +1108,9 @@ parserInit(XML_Parser parser, const XML_Char *encodingName)
 {
   processor = prologInitProcessor;
   XmlPrologStateInit(&prologState);
-  protocolEncodingName = (encodingName != NULL
-                          ? poolCopyString(&tempPool, encodingName)
-                          : NULL);
+  if (encodingName != NULL) {
+    protocolEncodingName = copyString(encodingName, &(parser->m_mem));
+  }
   curBase = NULL;
   XmlInitEncoding(&initEncoding, &encoding, 0);
   userData = NULL;
@@ -1103,6 +1223,8 @@ XML_ParserReset(XML_Parser parser, const XML_Char *encodingName)
     unknownEncodingRelease(unknownEncodingData);
   poolClear(&tempPool);
   poolClear(&temp2Pool);
+  FREE((void *)protocolEncodingName);
+  protocolEncodingName = NULL;
   parserInit(parser, encodingName);
   dtdReset(_dtd, &parser->m_mem);
   return XML_TRUE;
@@ -1119,10 +1241,16 @@ XML_SetEncoding(XML_Parser parser, const XML_Char *encodingName)
   */
   if (ps_parsing == XML_PARSING || ps_parsing == XML_SUSPENDED)
     return XML_STATUS_ERROR;
+
+  /* Get rid of any previous encoding name */
+  FREE((void *)protocolEncodingName);
+
   if (encodingName == NULL)
+    /* No new encoding name */
     protocolEncodingName = NULL;
   else {
-    protocolEncodingName = poolCopyString(&tempPool, encodingName);
+    /* Copy the new encoding name into allocated memory */
+    protocolEncodingName = copyString(encodingName, &(parser->m_mem));
     if (!protocolEncodingName)
       return XML_STATUS_ERROR;
   }
@@ -1357,6 +1485,7 @@ XML_ParserFree(XML_Parser parser)
   destroyBindings(inheritedBindings, parser);
   poolDestroy(&tempPool);
   poolDestroy(&temp2Pool);
+  FREE((void *)protocolEncodingName);
 #ifdef XML_DTD
   /* external parameter entity parsers share the DTD structure
      parser->m_dtd with the root parser, so we must not destroy it
@@ -1748,7 +1877,8 @@ enum XML_Status XMLCALL
 XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
 {
   if ((parser == NULL) || (len < 0) || ((s == NULL) && (len != 0))) {
-    errorCode = XML_ERROR_INVALID_ARGUMENT;
+    if (parser != NULL)
+      parser->m_errorCode = XML_ERROR_INVALID_ARGUMENT;
     return XML_STATUS_ERROR;
   }
   switch (ps_parsing) {
@@ -1783,9 +1913,22 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
     if (errorCode == XML_ERROR_NONE) {
       switch (ps_parsing) {
       case XML_SUSPENDED:
+        /* It is hard to be certain, but it seems that this case
+         * cannot occur.  This code is cleaning up a previous parse
+         * with no new data (since len == 0).  Changing the parsing
+         * state requires getting to execute a handler function, and
+         * there doesn't seem to be an opportunity for that while in
+         * this circumstance.
+         *
+         * Given the uncertainty, we retain the code but exclude it
+         * from coverage tests.
+         *
+         * LCOV_EXCL_START
+         */
         XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position);
         positionPtr = bufferPtr;
         return XML_STATUS_SUSPENDED;
+        /* LCOV_EXCL_STOP */
       case XML_INITIALIZED:
       case XML_PARSING:
         ps_parsing = XML_FINISHED;
@@ -2974,9 +3117,17 @@ doContent(XML_Parser parser,
         return XML_ERROR_NO_MEMORY;
       break;
     default:
+      /* All of the tokens produced by XmlContentTok() have their own
+       * explicit cases, so this default is not strictly necessary.
+       * However it is a useful safety net, so we retain the code and
+       * simply exclude it from the coverage tests.
+       *
+       * LCOV_EXCL_START
+       */
       if (defaultHandler)
         reportDefault(parser, enc, s, next);
       break;
+      /* LCOV_EXCL_STOP */
     }
     *eventPP = s = next;
     switch (ps_parsing) {
@@ -3067,13 +3218,17 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
 #endif
     attsSize = n + nDefaultAtts + INIT_ATTS_SIZE;
     temp = (ATTRIBUTE *)REALLOC((void *)atts, attsSize * sizeof(ATTRIBUTE));
-    if (temp == NULL)
+    if (temp == NULL) {
+      attsSize = oldAttsSize;
       return XML_ERROR_NO_MEMORY;
+    }
     atts = temp;
 #ifdef XML_ATTR_INFO
     temp2 = (XML_AttrInfo *)REALLOC((void *)attInfo, attsSize * sizeof(XML_AttrInfo));
-    if (temp2 == NULL)
+    if (temp2 == NULL) {
+      attsSize = oldAttsSize;
       return XML_ERROR_NO_MEMORY;
+    }
     attInfo = temp2;
 #endif
     if (n > oldAttsSize)
@@ -3210,6 +3365,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
     int j;  /* hash table index */
     unsigned long version = nsAttsVersion;
     int nsAttsSize = (int)1 << nsAttsPower;
+    unsigned char oldNsAttsPower = nsAttsPower;
     /* size of hash table must be at least 2 * (# of prefixed attributes) */
     if ((nPrefixes << 1) >> nsAttsPower) {  /* true for nsAttsPower = 0 */
       NS_ATT *temp;
@@ -3219,8 +3375,11 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
         nsAttsPower = 3;
       nsAttsSize = (int)1 << nsAttsPower;
       temp = (NS_ATT *)REALLOC(nsAtts, nsAttsSize * sizeof(NS_ATT));
-      if (!temp)
+      if (!temp) {
+        /* Restore actual size of memory in nsAtts */
+        nsAttsPower = oldNsAttsPower;
         return XML_ERROR_NO_MEMORY;
+      }
       nsAtts = temp;
       version = 0;  /* force re-initialization of nsAtts hash table */
     }
@@ -3247,8 +3406,23 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
 
         ((XML_Char *)s)[-1] = 0;  /* clear flag */
         id = (ATTRIBUTE_ID *)lookup(parser, &dtd->attributeIds, s, 0);
-        if (!id || !id->prefix)
-          return XML_ERROR_NO_MEMORY;
+        if (!id || !id->prefix) {
+          /* This code is walking through the appAtts array, dealing
+           * with (in this case) a prefixed attribute name.  To be in
+           * the array, the attribute must have already been bound, so
+           * has to have passed through the hash table lookup once
+           * already.  That implies that an entry for it already
+           * exists, so the lookup above will return a pointer to
+           * already allocated memory.  There is no opportunaity for
+           * the allocator to fail, so the condition above cannot be
+           * fulfilled.
+           *
+           * Since it is difficult to be certain that the above
+           * analysis is complete, we retain the test and merely
+           * remove the code from coverage tests.
+           */
+          return XML_ERROR_NO_MEMORY; /* LCOV_EXCL_LINE */
+        }
         b = id->prefix->binding;
         if (!b)
           return XML_ERROR_UNBOUND_PREFIX;
@@ -3625,8 +3799,16 @@ doCdataSection(XML_Parser parser,
       }
       return XML_ERROR_UNCLOSED_CDATA_SECTION;
     default:
+      /* Every token returned by XmlCdataSectionTok() has its own
+       * explicit case, so this default case will never be executed.
+       * We retain it as a safety net and exclude it from the coverage
+       * statistics.
+       *
+       * LCOV_EXCL_START
+      */
       *eventPP = next;
       return XML_ERROR_UNEXPECTED_STATE;
+      /* LCOV_EXCL_STOP */
     }
 
     *eventPP = s = next;
@@ -3686,8 +3868,20 @@ doIgnoreSection(XML_Parser parser,
     eventEndPP = &eventEndPtr;
   }
   else {
+    /* It's not entirely clear, but it seems the following two lines
+     * of code cannot be executed.  The only occasions on which 'enc'
+     * is not 'parser->m_encoding' are when this function is called
+     * from the internal entity processing, and IGNORE sections are an
+     * error in internal entities.
+     *
+     * Since it really isn't clear that this is true, we keep the code
+     * and just remove it from our coverage tests.
+     *
+     * LCOV_EXCL_START
+     */
     eventPP = &(openInternalEntities->internalEventPtr);
     eventEndPP = &(openInternalEntities->internalEventEndPtr);
+    /* LCOV_EXCL_STOP */
   }
   *eventPP = s;
   *startPtr = NULL;
@@ -3720,8 +3914,16 @@ doIgnoreSection(XML_Parser parser,
     }
     return XML_ERROR_SYNTAX; /* XML_ERROR_UNCLOSED_IGNORE_SECTION */
   default:
+    /* All of the tokens that XmlIgnoreSectionTok() returns have
+     * explicit cases to handle them, so this default case is never
+     * executed.  We keep it as a safety net anyway, and remove it
+     * from our test coverage statistics.
+     *
+     * LCOV_EXCL_START
+     */
     *eventPP = next;
     return XML_ERROR_UNEXPECTED_STATE;
+    /* LCOV_EXCL_STOP */
   }
   /* not reached */
 }
@@ -3734,6 +3936,7 @@ initializeEncoding(XML_Parser parser)
   const char *s;
 #ifdef XML_UNICODE
   char encodingBuf[128];
+  /* See comments abount `protoclEncodingName` in parserInit() */
   if (!protocolEncodingName)
     s = NULL;
   else {
@@ -3817,7 +4020,14 @@ processXmlDecl(XML_Parser parser, int isGeneralTextEntity,
     reportDefault(parser, encoding, s, next);
   if (protocolEncodingName == NULL) {
     if (newEncoding) {
-      if (newEncoding->minBytesPerChar != encoding->minBytesPerChar) {
+      /* Check that the specified encoding does not conflict with what
+       * the parser has already deduced.  Do we have the same number
+       * of bytes in the smallest representation of a character?  If
+       * this is UTF-16, is it the same endianness?
+       */
+      if (newEncoding->minBytesPerChar != encoding->minBytesPerChar
+          || (newEncoding->minBytesPerChar == 2 &&
+              newEncoding != encoding)) {
         eventPtr = encodingName;
         return XML_ERROR_INCORRECT_ENCODING;
       }
@@ -3962,15 +4172,14 @@ entityValueInitProcessor(XML_Parser parser,
       result = processXmlDecl(parser, 0, start, next);
       if (result != XML_ERROR_NONE)
         return result;
-      switch (ps_parsing) {
-      case XML_SUSPENDED:
-        *nextPtr = next;
-        return XML_ERROR_NONE;
-      case XML_FINISHED:
+      /* At this point, ps_parsing cannot be XML_SUSPENDED.  For that
+       * to happen, a parameter entity parsing handler must have
+       * attempted to suspend the parser, which fails and raises an
+       * error.  The parser can be aborted, but can't be suspended.
+       */
+      if (ps_parsing == XML_FINISHED)
         return XML_ERROR_ABORTED;
-      default:
-        *nextPtr = next;
-      }
+      *nextPtr = next;
       /* stop scanning for text declaration - we found one */
       processor = entityValueProcessor;
       return entityValueProcessor(parser, next, end, nextPtr);
@@ -4293,8 +4502,14 @@ doProlog(XML_Parser parser,
                                             &dtd->paramEntities,
                                             externalSubsetName,
                                             sizeof(ENTITY));
-          if (!entity)
-            return XML_ERROR_NO_MEMORY;
+          if (!entity) {
+            /* The external subset name "#" will have already been
+             * inserted into the hash table at the start of the
+             * external entity parsing, so no allocation will happen
+             * and lookup() cannot fail.
+             */
+            return XML_ERROR_NO_MEMORY; /* LCOV_EXCL_LINE */
+          }
           if (useForeignDTD)
             entity->base = curBase;
           dtd->paramEntityRead = XML_FALSE;
@@ -4773,8 +4988,10 @@ doProlog(XML_Parser parser,
       if (prologState.level >= groupSize) {
         if (groupSize) {
           char *temp = (char *)REALLOC(groupConnector, groupSize *= 2);
-          if (temp == NULL)
+          if (temp == NULL) {
+            groupSize /= 2;
             return XML_ERROR_NO_MEMORY;
+          }
           groupConnector = temp;
           if (dtd->scaffIndex) {
             int *temp = (int *)REALLOC(dtd->scaffIndex,
@@ -4786,8 +5003,10 @@ doProlog(XML_Parser parser,
         }
         else {
           groupConnector = (char *)MALLOC(groupSize = 32);
-          if (!groupConnector)
+          if (!groupConnector) {
+            groupSize = 0;
             return XML_ERROR_NO_MEMORY;
+          }
         }
       }
       groupConnector[prologState.level] = 0;
@@ -4850,8 +5069,29 @@ doProlog(XML_Parser parser,
              : !dtd->hasParamEntityRefs)) {
           if (!entity)
             return XML_ERROR_UNDEFINED_ENTITY;
-          else if (!entity->is_internal)
-            return XML_ERROR_ENTITY_DECLARED_IN_PE;
+          else if (!entity->is_internal) {
+            /* It's hard to exhaustively search the code to be sure,
+             * but there doesn't seem to be a way of executing the
+             * following line.  There are two cases:
+             *
+             * If 'standalone' is false, the DTD must have no
+             * parameter entities or we wouldn't have passed the outer
+             * 'if' statement.  That measn the only entity in the hash
+             * table is the external subset name "#" which cannot be
+             * given as a parameter entity name in XML syntax, so the
+             * lookup must have returned NULL and we don't even reach
+             * the test for an internal entity.
+             *
+             * If 'standalone' is true, it does not seem to be
+             * possible to create entities taking this code path that
+             * are not internal entities, so fail the test above.
+             *
+             * Because this analysis is very uncertain, the code is
+             * being left in place and merely removed from the
+             * coverage test statistics.
+             */
+            return XML_ERROR_ENTITY_DECLARED_IN_PE; /* LCOV_EXCL_LINE */
+          }
         }
         else if (!entity) {
           dtd->keepProcessing = dtd->standalone;
@@ -5323,11 +5563,15 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
             && (poolLength(pool) == 0 || poolLastChar(pool) == 0x20))
           break;
         n = XmlEncode(n, (ICHAR *)buf);
-        if (!n) {
-          if (enc == encoding)
-            eventPtr = ptr;
-          return XML_ERROR_BAD_CHAR_REF;
-        }
+        /* The XmlEncode() functions can never return 0 here.  That
+         * error return happens if the code point passed in is either
+         * negative or greater than or equal to 0x110000.  The
+         * XmlCharRefNumber() functions will all return a number
+         * strictly less than 0x110000 or a negative value if an error
+         * occurred.  The negative value is intercepted above, so
+         * XmlEncode() is never passed a value it might return an
+         * error for.
+         */
         for (i = 0; i < n; i++) {
           if (!poolAppendChar(pool, buf[i]))
             return XML_ERROR_NO_MEMORY;
@@ -5401,8 +5645,26 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
           break;
         }
         if (entity->open) {
-          if (enc == encoding)
-            eventPtr = ptr;
+          if (enc == encoding) {
+            /* It does not appear that this line can be executed.
+             *
+             * The "if (entity->open)" check catches recursive entity
+             * definitions.  In order to be called with an open
+             * entity, it must have gone through this code before and
+             * been through the recursive call to
+             * appendAttributeValue() some lines below.  That call
+             * sets the local encoding ("enc") to the parser's
+             * internal encoding (internal_utf8 or internal_utf16),
+             * which can never be the same as the principle encoding.
+             * It doesn't appear there is another code path that gets
+             * here with entity->open being TRUE.
+             *
+             * Since it is not certain that this logic is watertight,
+             * we keep the line and merely exclude it from coverage
+             * tests.
+             */
+            eventPtr = ptr; /* LCOV_EXCL_LINE */
+          }
           return XML_ERROR_RECURSIVE_ENTITY_REF;
         }
         if (entity->notation) {
@@ -5429,9 +5691,21 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
       }
       break;
     default:
+      /* The only token returned by XmlAttributeValueTok() that does
+       * not have an explicit case here is XML_TOK_PARTIAL_CHAR.
+       * Getting that would require an entity name to contain an
+       * incomplete XML character (e.g. \xE2\x82); however previous
+       * tokenisers will have already recognised and rejected such
+       * names before XmlAttributeValueTok() gets a look-in.  This
+       * default case should be retained as a safety net, but the code
+       * excluded from coverage tests.
+       *
+       * LCOV_EXCL_START
+       */
       if (enc == encoding)
         eventPtr = ptr;
       return XML_ERROR_UNEXPECTED_STATE;
+      /* LCOV_EXCL_STOP */
     }
     ptr = next;
   }
@@ -5564,12 +5838,15 @@ storeEntityValue(XML_Parser parser,
           goto endEntityValue;
         }
         n = XmlEncode(n, (ICHAR *)buf);
-        if (!n) {
-          if (enc == encoding)
-            eventPtr = entityTextPtr;
-          result = XML_ERROR_BAD_CHAR_REF;
-          goto endEntityValue;
-        }
+        /* The XmlEncode() functions can never return 0 here.  That
+         * error return happens if the code point passed in is either
+         * negative or greater than or equal to 0x110000.  The
+         * XmlCharRefNumber() functions will all return a number
+         * strictly less than 0x110000 or a negative value if an error
+         * occurred.  The negative value is intercepted above, so
+         * XmlEncode() is never passed a value it might return an
+         * error for.
+         */
         for (i = 0; i < n; i++) {
           if (pool->end == pool->ptr && !poolGrow(pool)) {
             result = XML_ERROR_NO_MEMORY;
@@ -5590,10 +5867,18 @@ storeEntityValue(XML_Parser parser,
       result = XML_ERROR_INVALID_TOKEN;
       goto endEntityValue;
     default:
+      /* This default case should be unnecessary -- all the tokens
+       * that XmlEntityValueTok() can return have their own explicit
+       * cases -- but should be retained for safety.  We do however
+       * exclude it from the coverage statistics.
+       *
+       * LCOV_EXCL_START
+       */
       if (enc == encoding)
         eventPtr = entityTextPtr;
       result = XML_ERROR_UNEXPECTED_STATE;
       goto endEntityValue;
+      /* LCOV_EXCL_STOP */
     }
     entityTextPtr = next;
   }
@@ -5691,8 +5976,25 @@ reportDefault(XML_Parser parser, const ENCODING *enc,
       eventEndPP = &eventEndPtr;
     }
     else {
+      /* To get here, two things must be true; the parser must be
+       * using a character encoding that is not the same as the
+       * encoding passed in, and the encoding passed in must need
+       * conversion to the internal format (UTF-8 unless XML_UNICODE
+       * is defined).  The only occasions on which the encoding passed
+       * in is not the same as the parser's encoding are when it is
+       * the internal encoding (e.g. a previously defined parameter
+       * entity, already converted to internal format).  This by
+       * definition doesn't need conversion, so the whole branch never
+       * gets executed.
+       *
+       * For safety's sake we don't delete these lines and merely
+       * exclude them from coverage statistics.
+       *
+       * LCOV_EXCL_START
+       */
       eventPP = &(openInternalEntities->internalEventPtr);
       eventEndPP = &(openInternalEntities->internalEventEndPtr);
+      /* LCOV_EXCL_STOP */
     }
     do {
       ICHAR *dataPtr = (ICHAR *)dataBuf;
@@ -5861,9 +6163,30 @@ getContext(XML_Parser parser)
     len = dtd->defaultPrefix.binding->uriLen;
     if (namespaceSeparator)
       len--;
-    for (i = 0; i < len; i++)
-      if (!poolAppendChar(&tempPool, dtd->defaultPrefix.binding->uri[i]))
-        return NULL;
+    for (i = 0; i < len; i++) {
+      if (!poolAppendChar(&tempPool, dtd->defaultPrefix.binding->uri[i])) {
+        /* Because of memory caching, I don't believe this line can be
+         * executed.
+         *
+         * This is part of a loop copying the default prefix binding
+         * URI into the parser's temporary string pool.  Previously,
+         * that URI was copied into the same string pool, with a
+         * terminating NUL character, as part of setContext().  When
+         * the pool was cleared, that leaves a block definitely big
+         * enough to hold the URI on the free block list of the pool.
+         * The URI copy in getContext() therefore cannot run out of
+         * memory.
+         *
+         * If the pool is used between the setContext() and
+         * getContext() calls, the worst it can do is leave a bigger
+         * block on the front of the free list.  Given that this is
+         * all somewhat inobvious and program logic can be changed, we
+         * don't delete the line but we do exclude it from the test
+         * coverage statistics.
+         */
+        return NULL; /* LCOV_EXCL_LINE */
+      }
+    }
     needSep = XML_TRUE;
   }
 
@@ -5875,8 +6198,15 @@ getContext(XML_Parser parser)
     PREFIX *prefix = (PREFIX *)hashTableIterNext(&iter);
     if (!prefix)
       break;
-    if (!prefix->binding)
-      continue;
+    if (!prefix->binding) {
+      /* This test appears to be (justifiable) paranoia.  There does
+       * not seem to be a way of injecting a prefix without a binding
+       * that doesn't get errored long before this function is called.
+       * The test should remain for safety's sake, so we instead
+       * exclude the following line from the coverage statistics.
+       */
+      continue; /* LCOV_EXCL_LINE */
+    }
     if (needSep && !poolAppendChar(&tempPool, CONTEXT_SEP))
       return NULL;
     for (s = prefix->name; *s; s++)
@@ -6547,8 +6877,20 @@ poolCopyString(STRING_POOL *pool, const XML_Char *s)
 static const XML_Char *
 poolCopyStringN(STRING_POOL *pool, const XML_Char *s, int n)
 {
-  if (!pool->ptr && !poolGrow(pool))
-    return NULL;
+  if (!pool->ptr && !poolGrow(pool)) {
+    /* The following line is unreachable given the current usage of
+     * poolCopyStringN().  Currently it is called from exactly one
+     * place to copy the text of a simple general entity.  By that
+     * point, the name of the entity is already stored in the pool, so
+     * pool->ptr cannot be NULL.
+     *
+     * If poolCopyStringN() is used elsewhere as it well might be,
+     * this line may well become executable again.  Regardless, this
+     * sort of check shouldn't be removed lightly, so we just exclude
+     * it from the coverage statistics.
+     */
+    return NULL; /* LCOV_EXCL_LINE */
+  }
   for (; n > 0; --n, s++) {
     if (!poolAppendChar(pool, *s))
       return NULL;
@@ -6641,8 +6983,19 @@ poolGrow(STRING_POOL *pool)
     int blockSize = (int)((unsigned)(pool->end - pool->start)*2U);
     size_t bytesToAllocate;
 
-    if (blockSize < 0)
-      return XML_FALSE;
+    // NOTE: Needs to be calculated prior to calling `realloc`
+    //       to avoid dangling pointers:
+    const ptrdiff_t offsetInsideBlock = pool->ptr - pool->start;
+
+    if (blockSize < 0) {
+      /* This condition traps a situation where either more than
+       * INT_MAX/2 bytes have already been allocated.  This isn't
+       * readily testable, since it is unlikely that an average
+       * machine will have that much memory, so we exclude it from the
+       * coverage statistics.
+       */
+      return XML_FALSE; /* LCOV_EXCL_LINE */
+    }
 
     bytesToAllocate = poolBytesToAllocateFor(blockSize);
     if (bytesToAllocate == 0)
@@ -6654,7 +7007,7 @@ poolGrow(STRING_POOL *pool)
       return XML_FALSE;
     pool->blocks = temp;
     pool->blocks->size = blockSize;
-    pool->ptr = pool->blocks->s + (pool->ptr - pool->start);
+    pool->ptr = pool->blocks->s + offsetInsideBlock;
     pool->start = pool->blocks->s;
     pool->end = pool->start + blockSize;
   }
@@ -6663,8 +7016,18 @@ poolGrow(STRING_POOL *pool)
     int blockSize = (int)(pool->end - pool->start);
     size_t bytesToAllocate;
 
-    if (blockSize < 0)
-      return XML_FALSE;
+    if (blockSize < 0) {
+      /* This condition traps a situation where either more than
+       * INT_MAX bytes have already been allocated (which is prevented
+       * by various pieces of program logic, not least this one, never
+       * mind the unlikelihood of actually having that much memory) or
+       * the pool control fields have been corrupted (which could
+       * conceivably happen in an extremely buggy user handler
+       * function).  Either way it isn't readily testable, so we
+       * exclude it from the coverage statistics.
+       */
+      return XML_FALSE;  /* LCOV_EXCL_LINE */
+    }
 
     if (blockSize < INIT_BLOCK_SIZE)
       blockSize = INIT_BLOCK_SIZE;
@@ -6827,3 +7190,26 @@ getElementType(XML_Parser parser,
   }
   return ret;
 }
+
+static XML_Char *
+copyString(const XML_Char *s,
+           const XML_Memory_Handling_Suite *memsuite)
+{
+    int charsRequired = 0;
+    XML_Char *result;
+
+    /* First determine how long the string is */
+    while (s[charsRequired] != 0) {
+      charsRequired++;
+    }
+    /* Include the terminator */
+    charsRequired++;
+
+    /* Now allocate space for the copy */
+    result = memsuite->malloc_fcn(charsRequired * sizeof(XML_Char));
+    if (result == NULL)
+        return NULL;
+    /* Copy the original into place */
+    memcpy(result, s, charsRequired * sizeof(XML_Char));
+    return result;
+}
diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c
index a7c56302796..c809ee51482 100644
--- a/Modules/expat/xmlrole.c
+++ b/Modules/expat/xmlrole.c
@@ -170,7 +170,14 @@ prolog1(PROLOG_STATE *state,
   case XML_TOK_COMMENT:
     return XML_ROLE_COMMENT;
   case XML_TOK_BOM:
-    return XML_ROLE_NONE;
+    /* This case can never arise.  To reach this role function, the
+     * parse must have passed through prolog0 and therefore have had
+     * some form of input, even if only a space.  At that point, a
+     * byte order mark is no longer a valid character (though
+     * technically it should be interpreted as a non-breaking space),
+     * so will be rejected by the tokenizing stages.
+     */
+    return XML_ROLE_NONE; /* LCOV_EXCL_LINE */
   case XML_TOK_DECL_OPEN:
     if (!XmlNameMatchesAscii(enc,
                              ptr + 2 * MIN_BYTES_PER_CHAR(enc),
@@ -1285,6 +1292,26 @@ declClose(PROLOG_STATE *state,
   return common(state, tok);
 }
 
+/* This function will only be invoked if the internal logic of the
+ * parser has broken down.  It is used in two cases:
+ *
+ * 1: When the XML prolog has been finished.  At this point the
+ * processor (the parser level above these role handlers) should
+ * switch from prologProcessor to contentProcessor and reinitialise
+ * the handler function.
+ *
+ * 2: When an error has been detected (via common() below).  At this
+ * point again the processor should be switched to errorProcessor,
+ * which will never call a handler.
+ *
+ * The result of this is that error() can only be called if the
+ * processor switch failed to happen, which is an internal error and
+ * therefore we shouldn't be able to provoke it simply by using the
+ * library.  It is a necessary backstop, however, so we merely exclude
+ * it from the coverage statistics.
+ *
+ * LCOV_EXCL_START
+ */
 static int PTRCALL
 error(PROLOG_STATE *UNUSED_P(state),
       int UNUSED_P(tok),
@@ -1294,6 +1321,7 @@ error(PROLOG_STATE *UNUSED_P(state),
 {
   return XML_ROLE_NONE;
 }
+/* LCOV_EXCL_STOP */
 
 static int FASTCALL
 common(PROLOG_STATE *state, int tok)
diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c
index cdf0720dd89..db4a5c8ca3e 100644
--- a/Modules/expat/xmltok.c
+++ b/Modules/expat/xmltok.c
@@ -1019,7 +1019,11 @@ streqci(const char *s1, const char *s2)
     if (ASCII_a <= c1 && c1 <= ASCII_z)
       c1 += ASCII_A - ASCII_a;
     if (ASCII_a <= c2 && c2 <= ASCII_z)
-      c2 += ASCII_A - ASCII_a;
+      /* The following line will never get executed.  streqci() is
+       * only called from two places, both of which guarantee to put
+       * upper-case strings into s2.
+       */
+      c2 += ASCII_A - ASCII_a; /* LCOV_EXCL_LINE */
     if (c1 != c2)
       return 0;
     if (!c1)
@@ -1291,7 +1295,7 @@ XmlUtf8Encode(int c, char *buf)
   };
 
   if (c < 0)
-    return 0;
+    return 0; /* LCOV_EXCL_LINE: this case is always eliminated beforehand */
   if (c < min2) {
     buf[0] = (char)(c | UTF8_cval1);
     return 1;
@@ -1314,7 +1318,7 @@ XmlUtf8Encode(int c, char *buf)
     buf[3] = (char)((c & 0x3f) | 0x80);
     return 4;
   }
-  return 0;
+  return 0; /* LCOV_EXCL_LINE: this case too is eliminated before calling */
 }
 
 int FASTCALL
@@ -1465,6 +1469,9 @@ XmlInitUnknownEncoding(void *mem,
     else if (c < 0) {
       if (c < -4)
         return 0;
+      /* Multi-byte sequences need a converter function */
+      if (!convert)
+        return 0;
       e->normal.type[i] = (unsigned char)(BT_LEAD2 - (c + 2));
       e->utf8[i][0] = 0;
       e->utf16[i] = 0;
diff --git a/Modules/expat/xmltok_impl.c b/Modules/expat/xmltok_impl.c
index 5f779c0571b..4fa1ff679ce 100644
--- a/Modules/expat/xmltok_impl.c
+++ b/Modules/expat/xmltok_impl.c
@@ -1198,8 +1198,14 @@ PREFIX(attributeValueTok)(const ENCODING *enc, const char *ptr,
   const char *start;
   if (ptr >= end)
     return XML_TOK_NONE;
-  else if (! HAS_CHAR(enc, ptr, end))
-    return XML_TOK_PARTIAL;
+  else if (! HAS_CHAR(enc, ptr, end)) {
+    /* This line cannot be executed.  The incoming data has already
+     * been tokenized once, so incomplete characters like this have
+     * already been eliminated from the input.  Retaining the paranoia
+     * check is still valuable, however.
+     */
+    return XML_TOK_PARTIAL; /* LCOV_EXCL_LINE */
+  }
   start = ptr;
   while (HAS_CHAR(enc, ptr, end)) {
     switch (BYTE_TYPE(enc, ptr)) {
@@ -1258,8 +1264,14 @@ PREFIX(entityValueTok)(const ENCODING *enc, const char *ptr,
   const char *start;
   if (ptr >= end)
     return XML_TOK_NONE;
-  else if (! HAS_CHAR(enc, ptr, end))
-    return XML_TOK_PARTIAL;
+  else if (! HAS_CHAR(enc, ptr, end)) {
+    /* This line cannot be executed.  The incoming data has already
+     * been tokenized once, so incomplete characters like this have
+     * already been eliminated from the input.  Retaining the paranoia
+     * check is still valuable, however.
+     */
+    return XML_TOK_PARTIAL; /* LCOV_EXCL_LINE */
+  }
   start = ptr;
   while (HAS_CHAR(enc, ptr, end)) {
     switch (BYTE_TYPE(enc, ptr)) {
@@ -1614,6 +1626,14 @@ PREFIX(predefinedEntityName)(const ENCODING *UNUSED_P(enc), const char *ptr,
   return 0;
 }
 
+/* This function does not appear to be called from anywhere within the
+ * library code.  It is used via the macro XmlSameName(), which is
+ * defined but never used.  Since it appears in the encoding function
+ * table, removing it is not a thing to be undertaken lightly.  For
+ * the moment, we simply exclude it from coverage tests.
+ *
+ * LCOV_EXCL_START
+ */
 static int PTRCALL
 PREFIX(sameName)(const ENCODING *enc, const char *ptr1, const char *ptr2)
 {
@@ -1677,14 +1697,21 @@ PREFIX(sameName)(const ENCODING *enc, const char *ptr1, const char *ptr2)
   }
   /* not reached */
 }
+/* LCOV_EXCL_STOP */
 
 static int PTRCALL
 PREFIX(nameMatchesAscii)(const ENCODING *UNUSED_P(enc), const char *ptr1,
                          const char *end1, const char *ptr2)
 {
   for (; *ptr2; ptr1 += MINBPC(enc), ptr2++) {
-    if (end1 - ptr1 < MINBPC(enc))
-      return 0;
+    if (end1 - ptr1 < MINBPC(enc)) {
+      /* This line cannot be executed.  THe incoming data has already
+       * been tokenized once, so imcomplete characters like this have
+       * already been eliminated from the input.  Retaining the
+       * paranoia check is still valuable, however.
+       */
+      return 0; /* LCOV_EXCL_LINE */
+    }
     if (!CHAR_MATCHES(enc, ptr1, *ptr2))
       return 0;
   }
diff --git a/PC/VS9.0/_elementtree.vcproj b/PC/VS9.0/_elementtree.vcproj
index f89409cc3ed..2915eb3eef0 100644
--- a/PC/VS9.0/_elementtree.vcproj
+++ b/PC/VS9.0/_elementtree.vcproj
@@ -595,6 +595,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Modules\expat\loadlibrary.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Modules\expat\xmlparse.c"
 				>
 			</File>
diff --git a/PC/VS9.0/pyexpat.vcproj b/PC/VS9.0/pyexpat.vcproj
index 76b698f7402..7a2474e67cb 100644
--- a/PC/VS9.0/pyexpat.vcproj
+++ b/PC/VS9.0/pyexpat.vcproj
@@ -535,6 +535,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Modules\expat\loadlibrary.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Modules\expat\xmlparse.c"
 				>
 			</File>
diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
index 511e26bb60d..1b024b9d854 100644
--- a/PCbuild/_elementtree.vcxproj
+++ b/PCbuild/_elementtree.vcxproj
@@ -87,6 +87,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Modules\_elementtree.c" />
+    <ClCompile Include="..\Modules\expat\loadlibrary.c" />
     <ClCompile Include="..\Modules\expat\xmlparse.c" />
     <ClCompile Include="..\Modules\expat\xmlrole.c" />
     <ClCompile Include="..\Modules\expat\xmltok.c" />
diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters
index 6acdf35846a..4597ee521b3 100644
--- a/PCbuild/_elementtree.vcxproj.filters
+++ b/PCbuild/_elementtree.vcxproj.filters
@@ -33,6 +33,9 @@
     <ClInclude Include="..\Modules\expat\latin1tab.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\Modules\expat\loadlibrary.c">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\Modules\expat\macconfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
index 61a2697e116..e8be337c259 100644
--- a/PCbuild/pyexpat.vcxproj
+++ b/PCbuild/pyexpat.vcxproj
@@ -68,6 +68,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Modules\pyexpat.c" />
+    <ClCompile Include="..\Modules\expat\loadlibrary.c" />
     <ClCompile Include="..\Modules\expat\xmlparse.c" />
     <ClCompile Include="..\Modules\expat\xmlrole.c" />
     <ClCompile Include="..\Modules\expat\xmltok.c" />
diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters
index f8d46026c9c..cb02847980c 100644
--- a/PCbuild/pyexpat.vcxproj.filters
+++ b/PCbuild/pyexpat.vcxproj.filters
@@ -20,6 +20,9 @@
     <ClCompile Include="..\Modules\pyexpat.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\Modules\expat\loadlibrary.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\Modules\expat\xmlparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/setup.py b/setup.py
index 54054c208a7..5503486ccbf 100644
--- a/setup.py
+++ b/setup.py
@@ -1492,6 +1492,9 @@ class db_found(Exception): pass
             expat_inc = [os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')]
             define_macros = [
                 ('HAVE_EXPAT_CONFIG_H', '1'),
+                # bpo-30947: Python uses best available entropy sources to
+                # call XML_SetHashSalt(), expat entropy sources are not needed
+                ('XML_POOR_ENTROPY', '1'),
             ]
             expat_lib = []
             expat_sources = ['expat/xmlparse.c',


From webhook-mailer at python.org  Fri Aug 18 19:11:47 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 18 Aug 2017 23:11:47 -0000
Subject: [Python-checkins] bpo-31235: Fix ResourceWarning in test_logging
 (#3147) (#3149)
Message-ID: <mailman.61.1503097909.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/3e866dfaecaa4eb8f98c12782d2488f681225c37
commit: 3e866dfaecaa4eb8f98c12782d2488f681225c37
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-19T01:11:44+02:00
summary:

bpo-31235: Fix ResourceWarning in test_logging (#3147) (#3149)

(cherry picked from commit a7719e27b3cad0f2b86cb932a76cbe55c541b02e)

files:
M Lib/test/test_logging.py

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 474affdaebc..4ec02e10093 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -770,6 +770,7 @@ def stop(self, timeout=None):
             """
             self.close()
             self._thread.join(timeout)
+            asyncore.close_all(map=self._map, ignore_all=True)
             self._thread = None
 
     class ControlMixin(object):


From webhook-mailer at python.org  Fri Aug 18 19:54:45 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 18 Aug 2017 23:54:45 -0000
Subject: [Python-checkins] bpo-31234: test_threading: fix ref cycle (#3150)
Message-ID: <mailman.62.1503100486.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/3d284c081fc3042036adfe1bf2ce92c34d743b0b
commit: 3d284c081fc3042036adfe1bf2ce92c34d743b0b
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-19T01:54:42+02:00
summary:

bpo-31234: test_threading: fix ref cycle (#3150)

test_bare_raise_in_brand_new_thread() now explicitly breaks a
reference cycle to not leak a dangling thread.

files:
M Lib/test/test_threading.py

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 0f3ac555c2d..800d26f71b2 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -1069,6 +1069,8 @@ def run(self):
         thread.join()
         self.assertIsNotNone(thread.exc)
         self.assertIsInstance(thread.exc, RuntimeError)
+        # explicitly break the reference cycle to not leak a dangling thread
+        thread.exc = None
 
 class TimerTests(BaseTestCase):
 


From webhook-mailer at python.org  Fri Aug 18 20:32:57 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Sat, 19 Aug 2017 00:32:57 -0000
Subject: [Python-checkins] bpo-31234: test_threading: fix ref cycle (#3150)
 (#3152)
Message-ID: <mailman.63.1503102778.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/b50e7683acac36ff16e6c6c2c32d9a15e46b5174
commit: b50e7683acac36ff16e6c6c2c32d9a15e46b5174
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-19T02:32:54+02:00
summary:

bpo-31234: test_threading: fix ref cycle (#3150) (#3152)

test_bare_raise_in_brand_new_thread() now explicitly breaks a
reference cycle to not leak a dangling thread.
(cherry picked from commit 3d284c081fc3042036adfe1bf2ce92c34d743b0b)

files:
M Lib/test/test_threading.py

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 0db028864d2..162a72ea03f 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -1066,6 +1066,8 @@ def run(self):
         thread.join()
         self.assertIsNotNone(thread.exc)
         self.assertIsInstance(thread.exc, RuntimeError)
+        # explicitly break the reference cycle to not leak a dangling thread
+        thread.exc = None
 
 class TimerTests(BaseTestCase):
 


From webhook-mailer at python.org  Sat Aug 19 02:59:42 2017
From: webhook-mailer at python.org (Nick Coghlan)
Date: Sat, 19 Aug 2017 06:59:42 -0000
Subject: [Python-checkins] [3.6] bpo-31232: Backport custom print rshift
 message (GH-3155)
Message-ID: <mailman.64.1503125983.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/1a05e87ec75436d818f05a5dabcecaea67334cbd
commit: 1a05e87ec75436d818f05a5dabcecaea67334cbd
branch: 3.6
author: Nick Coghlan <ncoghlan at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-19T16:59:38+10:00
summary:

[3.6] bpo-31232: Backport custom print rshift message (GH-3155)

bpo-30721 added a "Did you mean ...?" suggestion to rshift
TypeError messages that triggers when the LHS is a Python
C function called "print".

Since this custom error message is expected to be triggered
primarily by attempts to use Python 2 print redirection syntax
in Python 3, and is incredibly unlikely to be encountered
otherwise, it is also being backported to the next 3.6
maintenance release.

Initial patch by Sanyam Khurana.

files:
A Misc/NEWS.d/next/Core and Builtins/2017-08-18-15-15-20.bpo-30721.Hmc56z.rst
M Lib/test/test_print.py
M Objects/abstract.c

diff --git a/Lib/test/test_print.py b/Lib/test/test_print.py
index 03f13b4edfc..e6434feaf5e 100644
--- a/Lib/test/test_print.py
+++ b/Lib/test/test_print.py
@@ -1,4 +1,5 @@
 import unittest
+import sys
 from io import StringIO
 
 from test import support
@@ -155,6 +156,38 @@ def test_string_with_excessive_whitespace(self):
 
         self.assertIn('print("Hello World", end=" ")', str(context.exception))
 
+    def test_stream_redirection_hint_for_py2_migration(self):
+        # Test correct hint produced for Py2 redirection syntax
+        with self.assertRaises(TypeError) as context:
+            print >> sys.stderr, "message"
+        self.assertIn('Did you mean "print(<message>, '
+                'file=<output_stream>)"?', str(context.exception))
+
+        # Test correct hint is produced in the case where RHS implements
+        # __rrshift__ but returns NotImplemented
+        with self.assertRaises(TypeError) as context:
+            print >> 42
+        self.assertIn('Did you mean "print(<message>, '
+                'file=<output_stream>)"?', str(context.exception))
+
+        # Test stream redirection hint is specific to print
+        with self.assertRaises(TypeError) as context:
+            max >> sys.stderr
+        self.assertNotIn('Did you mean ', str(context.exception))
+
+        # Test stream redirection hint is specific to rshift
+        with self.assertRaises(TypeError) as context:
+            print << sys.stderr
+        self.assertNotIn('Did you mean', str(context.exception))
+
+        # Ensure right operand implementing rrshift still works
+        class OverrideRRShift:
+            def __rrshift__(self, lhs):
+                return 42 # Force result independent of LHS
+
+        self.assertEqual(print >> OverrideRRShift(), 42)
+
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-18-15-15-20.bpo-30721.Hmc56z.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-18-15-15-20.bpo-30721.Hmc56z.rst
new file mode 100644
index 00000000000..da553d654ec
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-18-15-15-20.bpo-30721.Hmc56z.rst	
@@ -0,0 +1,2 @@
+``print`` now shows correct usage hint for using Python 2 redirection
+syntax.  Patch by Sanyam Khurana.
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 38de774de3a..6c6c86cd44a 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -809,6 +809,21 @@ binary_op(PyObject *v, PyObject *w, const int op_slot, const char *op_name)
     PyObject *result = binary_op1(v, w, op_slot);
     if (result == Py_NotImplemented) {
         Py_DECREF(result);
+
+        if (op_slot == NB_SLOT(nb_rshift) &&
+            PyCFunction_Check(v) &&
+            strcmp(((PyCFunctionObject *)v)->m_ml->ml_name, "print") == 0)
+        {
+            PyErr_Format(PyExc_TypeError,
+                "unsupported operand type(s) for %.100s: "
+                "'%.100s' and '%.100s'. Did you mean \"print(<message>, "
+                "file=<output_stream>)\"?",
+                op_name,
+                v->ob_type->tp_name,
+                w->ob_type->tp_name);
+            return NULL;
+        }
+
         return binop_type_error(v, w, op_name);
     }
     return result;


From solipsis at pitrou.net  Sat Aug 19 05:06:28 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 19 Aug 2017 09:06:28 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=5
Message-ID: <20170819090628.6864.0D66FE4762E97657@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [0, -7, 8] memory blocks, sum=1
test_functools leaked [0, 3, 1] memory blocks, sum=4


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogzHicaG', '--timeout', '7200']

From webhook-mailer at python.org  Sat Aug 19 09:22:57 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 19 Aug 2017 13:22:57 -0000
Subject: [Python-checkins] [3.6] bpo-31206: IDLE: Factor HighPage class from
 ConfigDialog (GH-3141) (#3154)
Message-ID: <mailman.65.1503148981.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/764e282158df0d7d6d7e0c72f38756c979a36539
commit: 764e282158df0d7d6d7e0c72f38756c979a36539
branch: 3.6
author: Cheryl Sabella <cheryl.sabella at gmail.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-08-19T09:22:54-04:00
summary:

[3.6] bpo-31206: IDLE: Factor HighPage class from ConfigDialog (GH-3141) (#3154)

This is the first half of a patch similar to the one for for bpo-31205.  It is being split into 2 PRs to avoid what happened with PR-3096 -- an incomprehensible diff that could not be cleanly backported to 3.6.  This half copies several methods of ConfigDialog and turns them into a new class.  Patch by Cheryl Sabella.
(cherry picked from commit a32e40561a24de373d1c5a437a8aa329758ba8e4)

files:
A Misc/NEWS.d/next/IDLE/2017-08-18-14-13-42.bpo-31206.F1-tKK.rst
M Lib/idlelib/configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index a36bf83ad0f..587f16ec9df 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -1290,6 +1290,649 @@ def var_changed_space_num(self, *params):
         changes.add_option('main', 'Indent', 'num-spaces', value)
 
 
+class HighPage(Frame):
+
+    def __init__(self, master):
+        super().__init__(master)
+        self.cd = master.master
+        self.create_page_highlight()
+        self.load_theme_cfg()
+
+    def create_page_highlight(self):
+        """Return frame of widgets for Highlighting tab.
+
+        Enable users to provisionally change foreground and background
+        colors applied to textual tags.  Color mappings are stored in
+        complete listings called themes.  Built-in themes in
+        idlelib/config-highlight.def are fixed as far as the dialog is
+        concerned. Any theme can be used as the base for a new custom
+        theme, stored in .idlerc/config-highlight.cfg.
+
+        Function load_theme_cfg() initializes tk variables and theme
+        lists and calls paint_theme_sample() and set_highlight_target()
+        for the current theme.  Radiobuttons builtin_theme_on and
+        custom_theme_on toggle var theme_source, which controls if the
+        current set of colors are from a builtin or custom theme.
+        DynOptionMenus builtinlist and customlist contain lists of the
+        builtin and custom themes, respectively, and the current item
+        from each list is stored in vars builtin_name and custom_name.
+
+        Function paint_theme_sample() applies the colors from the theme
+        to the tags in text widget highlight_sample and then invokes
+        set_color_sample().  Function set_highlight_target() sets the state
+        of the radiobuttons fg_on and bg_on based on the tag and it also
+        invokes set_color_sample().
+
+        Function set_color_sample() sets the background color for the frame
+        holding the color selector.  This provides a larger visual of the
+        color for the current tag and plane (foreground/background).
+
+        Note: set_color_sample() is called from many places and is often
+        called more than once when a change is made.  It is invoked when
+        foreground or background is selected (radiobuttons), from
+        paint_theme_sample() (theme is changed or load_cfg is called), and
+        from set_highlight_target() (target tag is changed or load_cfg called).
+
+        Button delete_custom invokes delete_custom() to delete
+        a custom theme from idleConf.userCfg['highlight'] and changes.
+        Button save_custom invokes save_as_new_theme() which calls
+        get_new_theme_name() and create_new() to save a custom theme
+        and its colors to idleConf.userCfg['highlight'].
+
+        Radiobuttons fg_on and bg_on toggle var fg_bg_toggle to control
+        if the current selected color for a tag is for the foreground or
+        background.
+
+        DynOptionMenu targetlist contains a readable description of the
+        tags applied to Python source within IDLE.  Selecting one of the
+        tags from this list populates highlight_target, which has a callback
+        function set_highlight_target().
+
+        Text widget highlight_sample displays a block of text (which is
+        mock Python code) in which is embedded the defined tags and reflects
+        the color attributes of the current theme and changes for those tags.
+        Mouse button 1 allows for selection of a tag and updates
+        highlight_target with that tag value.
+
+        Note: The font in highlight_sample is set through the config in
+        the fonts tab.
+
+        In other words, a tag can be selected either from targetlist or
+        by clicking on the sample text within highlight_sample.  The
+        plane (foreground/background) is selected via the radiobutton.
+        Together, these two (tag and plane) control what color is
+        shown in set_color_sample() for the current theme.  Button set_color
+        invokes get_color() which displays a ColorChooser to change the
+        color for the selected tag/plane.  If a new color is picked,
+        it will be saved to changes and the highlight_sample and
+        frame background will be updated.
+
+        Tk Variables:
+            color: Color of selected target.
+            builtin_name: Menu variable for built-in theme.
+            custom_name: Menu variable for custom theme.
+            fg_bg_toggle: Toggle for foreground/background color.
+                Note: this has no callback.
+            theme_source: Selector for built-in or custom theme.
+            highlight_target: Menu variable for the highlight tag target.
+
+        Instance Data Attributes:
+            theme_elements: Dictionary of tags for text highlighting.
+                The key is the display name and the value is a tuple of
+                (tag name, display sort order).
+
+        Methods [attachment]:
+            load_theme_cfg: Load current highlight colors.
+            get_color: Invoke colorchooser [button_set_color].
+            set_color_sample_binding: Call set_color_sample [fg_bg_toggle].
+            set_highlight_target: set fg_bg_toggle, set_color_sample().
+            set_color_sample: Set frame background to target.
+            on_new_color_set: Set new color and add option.
+            paint_theme_sample: Recolor sample.
+            get_new_theme_name: Get from popup.
+            create_new: Combine theme with changes and save.
+            save_as_new_theme: Save [button_save_custom].
+            set_theme_type: Command for [theme_source].
+            delete_custom: Activate default [button_delete_custom].
+            save_new: Save to userCfg['theme'] (is function).
+
+        Widgets of highlights page frame:  (*) widgets bound to self
+            frame_custom: LabelFrame
+                (*)highlight_sample: Text
+                (*)frame_color_set: Frame
+                    (*)button_set_color: Button
+                    (*)targetlist: DynOptionMenu - highlight_target
+                frame_fg_bg_toggle: Frame
+                    (*)fg_on: Radiobutton - fg_bg_toggle
+                    (*)bg_on: Radiobutton - fg_bg_toggle
+                (*)button_save_custom: Button
+            frame_theme: LabelFrame
+                theme_type_title: Label
+                (*)builtin_theme_on: Radiobutton - theme_source
+                (*)custom_theme_on: Radiobutton - theme_source
+                (*)builtinlist: DynOptionMenu - builtin_name
+                (*)customlist: DynOptionMenu - custom_name
+                (*)button_delete_custom: Button
+                (*)theme_message: Label
+        """
+        self.theme_elements = {
+            'Normal Text': ('normal', '00'),
+            'Python Keywords': ('keyword', '01'),
+            'Python Definitions': ('definition', '02'),
+            'Python Builtins': ('builtin', '03'),
+            'Python Comments': ('comment', '04'),
+            'Python Strings': ('string', '05'),
+            'Selected Text': ('hilite', '06'),
+            'Found Text': ('hit', '07'),
+            'Cursor': ('cursor', '08'),
+            'Editor Breakpoint': ('break', '09'),
+            'Shell Normal Text': ('console', '10'),
+            'Shell Error Text': ('error', '11'),
+            'Shell Stdout Text': ('stdout', '12'),
+            'Shell Stderr Text': ('stderr', '13'),
+            }
+        self.builtin_name = tracers.add(
+                StringVar(self), self.var_changed_builtin_name)
+        self.custom_name = tracers.add(
+                StringVar(self), self.var_changed_custom_name)
+        self.fg_bg_toggle = BooleanVar(self)
+        self.color = tracers.add(
+                StringVar(self), self.var_changed_color)
+        self.theme_source = tracers.add(
+                BooleanVar(self), self.var_changed_theme_source)
+        self.highlight_target = tracers.add(
+                StringVar(self), self.var_changed_highlight_target)
+
+        # Create widgets:
+        # body frame and section frames.
+        frame_custom = LabelFrame(self, borderwidth=2, relief=GROOVE,
+                                  text=' Custom Highlighting ')
+        frame_theme = LabelFrame(self, borderwidth=2, relief=GROOVE,
+                                 text=' Highlighting Theme ')
+        # frame_custom.
+        text = self.highlight_sample = Text(
+                frame_custom, relief=SOLID, borderwidth=1,
+                font=('courier', 12, ''), cursor='hand2', width=21, height=13,
+                takefocus=FALSE, highlightthickness=0, wrap=NONE)
+        text.bind('<Double-Button-1>', lambda e: 'break')
+        text.bind('<B1-Motion>', lambda e: 'break')
+        text_and_tags=(('\n', 'normal'),
+            ('#you can click here', 'comment'), ('\n', 'normal'),
+            ('#to choose items', 'comment'), ('\n', 'normal'),
+            ('def', 'keyword'), (' ', 'normal'),
+            ('func', 'definition'), ('(param):\n  ', 'normal'),
+            ('"""string"""', 'string'), ('\n  var0 = ', 'normal'),
+            ("'string'", 'string'), ('\n  var1 = ', 'normal'),
+            ("'selected'", 'hilite'), ('\n  var2 = ', 'normal'),
+            ("'found'", 'hit'), ('\n  var3 = ', 'normal'),
+            ('list', 'builtin'), ('(', 'normal'),
+            ('None', 'keyword'), (')\n', 'normal'),
+            ('  breakpoint("line")', 'break'), ('\n\n', 'normal'),
+            (' error ', 'error'), (' ', 'normal'),
+            ('cursor |', 'cursor'), ('\n ', 'normal'),
+            ('shell', 'console'), (' ', 'normal'),
+            ('stdout', 'stdout'), (' ', 'normal'),
+            ('stderr', 'stderr'), ('\n\n', 'normal'))
+        for texttag in text_and_tags:
+            text.insert(END, texttag[0], texttag[1])
+        for element in self.theme_elements:
+            def tem(event, elem=element):
+                event.widget.winfo_toplevel().highlight_target.set(elem)
+            text.tag_bind(
+                    self.theme_elements[element][0], '<ButtonPress-1>', tem)
+        text['state'] = DISABLED
+        self.frame_color_set = Frame(frame_custom, relief=SOLID, borderwidth=1)
+        frame_fg_bg_toggle = Frame(frame_custom)
+        self.button_set_color = Button(
+                self.frame_color_set, text='Choose Color for :',
+                command=self.get_color, highlightthickness=0)
+        self.targetlist = DynOptionMenu(
+                self.frame_color_set, self.highlight_target, None,
+                highlightthickness=0) #, command=self.set_highlight_targetBinding
+        self.fg_on = Radiobutton(
+                frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=1,
+                text='Foreground', command=self.set_color_sample_binding)
+        self.bg_on = Radiobutton(
+                frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=0,
+                text='Background', command=self.set_color_sample_binding)
+        self.fg_bg_toggle.set(1)
+        self.button_save_custom = Button(
+                frame_custom, text='Save as New Custom Theme',
+                command=self.save_as_new_theme)
+        # frame_theme.
+        theme_type_title = Label(frame_theme, text='Select : ')
+        self.builtin_theme_on = Radiobutton(
+                frame_theme, variable=self.theme_source, value=1,
+                command=self.set_theme_type, text='a Built-in Theme')
+        self.custom_theme_on = Radiobutton(
+                frame_theme, variable=self.theme_source, value=0,
+                command=self.set_theme_type, text='a Custom Theme')
+        self.builtinlist = DynOptionMenu(
+                frame_theme, self.builtin_name, None, command=None)
+        self.customlist = DynOptionMenu(
+                frame_theme, self.custom_name, None, command=None)
+        self.button_delete_custom = Button(
+                frame_theme, text='Delete Custom Theme',
+                command=self.delete_custom)
+        self.theme_message = Label(frame_theme, bd=2)
+
+        # Pack widgets:
+        # body.
+        frame_custom.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
+        frame_theme.pack(side=LEFT, padx=5, pady=5, fill=Y)
+        # frame_custom.
+        self.frame_color_set.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=X)
+        frame_fg_bg_toggle.pack(side=TOP, padx=5, pady=0)
+        self.highlight_sample.pack(
+                side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
+        self.button_set_color.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=4)
+        self.targetlist.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=3)
+        self.fg_on.pack(side=LEFT, anchor=E)
+        self.bg_on.pack(side=RIGHT, anchor=W)
+        self.button_save_custom.pack(side=BOTTOM, fill=X, padx=5, pady=5)
+        # frame_theme.
+        theme_type_title.pack(side=TOP, anchor=W, padx=5, pady=5)
+        self.builtin_theme_on.pack(side=TOP, anchor=W, padx=5)
+        self.custom_theme_on.pack(side=TOP, anchor=W, padx=5, pady=2)
+        self.builtinlist.pack(side=TOP, fill=X, padx=5, pady=5)
+        self.customlist.pack(side=TOP, fill=X, anchor=W, padx=5, pady=5)
+        self.button_delete_custom.pack(side=TOP, fill=X, padx=5, pady=5)
+        self.theme_message.pack(side=TOP, fill=X, pady=5)
+
+    def load_theme_cfg(self):
+        """Load current configuration settings for the theme options.
+
+        Based on the theme_source toggle, the theme is set as
+        either builtin or custom and the initial widget values
+        reflect the current settings from idleConf.
+
+        Attributes updated:
+            theme_source: Set from idleConf.
+            builtinlist: List of default themes from idleConf.
+            customlist: List of custom themes from idleConf.
+            custom_theme_on: Disabled if there are no custom themes.
+            custom_theme: Message with additional information.
+            targetlist: Create menu from self.theme_elements.
+
+        Methods:
+            set_theme_type
+            paint_theme_sample
+            set_highlight_target
+        """
+        # Set current theme type radiobutton.
+        self.theme_source.set(idleConf.GetOption(
+                'main', 'Theme', 'default', type='bool', default=1))
+        # Set current theme.
+        current_option = idleConf.CurrentTheme()
+        # Load available theme option menus.
+        if self.theme_source.get():  # Default theme selected.
+            item_list = idleConf.GetSectionList('default', 'highlight')
+            item_list.sort()
+            self.builtinlist.SetMenu(item_list, current_option)
+            item_list = idleConf.GetSectionList('user', 'highlight')
+            item_list.sort()
+            if not item_list:
+                self.custom_theme_on['state'] = DISABLED
+                self.custom_name.set('- no custom themes -')
+            else:
+                self.customlist.SetMenu(item_list, item_list[0])
+        else:  # User theme selected.
+            item_list = idleConf.GetSectionList('user', 'highlight')
+            item_list.sort()
+            self.customlist.SetMenu(item_list, current_option)
+            item_list = idleConf.GetSectionList('default', 'highlight')
+            item_list.sort()
+            self.builtinlist.SetMenu(item_list, item_list[0])
+        self.set_theme_type()
+        # Load theme element option menu.
+        theme_names = list(self.theme_elements.keys())
+        theme_names.sort(key=lambda x: self.theme_elements[x][1])
+        self.targetlist.SetMenu(theme_names, theme_names[0])
+        self.paint_theme_sample()
+        self.set_highlight_target()
+
+    def var_changed_builtin_name(self, *params):
+        """Process new builtin theme selection.
+
+        Add the changed theme's name to the changed_items and recreate
+        the sample with the values from the selected theme.
+        """
+        old_themes = ('IDLE Classic', 'IDLE New')
+        value = self.builtin_name.get()
+        if value not in old_themes:
+            if idleConf.GetOption('main', 'Theme', 'name') not in old_themes:
+                changes.add_option('main', 'Theme', 'name', old_themes[0])
+            changes.add_option('main', 'Theme', 'name2', value)
+            self.theme_message['text'] = 'New theme, see Help'
+            self.theme_message['fg'] = '#500000'
+        else:
+            changes.add_option('main', 'Theme', 'name', value)
+            changes.add_option('main', 'Theme', 'name2', '')
+            self.theme_message['text'] = ''
+            self.theme_message['fg'] = 'black'
+        self.paint_theme_sample()
+
+    def var_changed_custom_name(self, *params):
+        """Process new custom theme selection.
+
+        If a new custom theme is selected, add the name to the
+        changed_items and apply the theme to the sample.
+        """
+        value = self.custom_name.get()
+        if value != '- no custom themes -':
+            changes.add_option('main', 'Theme', 'name', value)
+            self.paint_theme_sample()
+
+    def var_changed_theme_source(self, *params):
+        """Process toggle between builtin and custom theme.
+
+        Update the default toggle value and apply the newly
+        selected theme type.
+        """
+        value = self.theme_source.get()
+        changes.add_option('main', 'Theme', 'default', value)
+        if value:
+            self.var_changed_builtin_name()
+        else:
+            self.var_changed_custom_name()
+
+    def var_changed_color(self, *params):
+        "Process change to color choice."
+        self.on_new_color_set()
+
+    def var_changed_highlight_target(self, *params):
+        "Process selection of new target tag for highlighting."
+        self.set_highlight_target()
+
+    def set_theme_type(self):
+        """Set available screen options based on builtin or custom theme.
+
+        Attributes accessed:
+            theme_source
+
+        Attributes updated:
+            builtinlist
+            customlist
+            button_delete_custom
+            custom_theme_on
+
+        Called from:
+            handler for builtin_theme_on and custom_theme_on
+            delete_custom
+            create_new
+            load_theme_cfg
+        """
+        if self.theme_source.get():
+            self.builtinlist['state'] = NORMAL
+            self.customlist['state'] = DISABLED
+            self.button_delete_custom['state'] = DISABLED
+        else:
+            self.builtinlist['state'] = DISABLED
+            self.custom_theme_on['state'] = NORMAL
+            self.customlist['state'] = NORMAL
+            self.button_delete_custom['state'] = NORMAL
+
+    def get_color(self):
+        """Handle button to select a new color for the target tag.
+
+        If a new color is selected while using a builtin theme, a
+        name must be supplied to create a custom theme.
+
+        Attributes accessed:
+            highlight_target
+            frame_color_set
+            theme_source
+
+        Attributes updated:
+            color
+
+        Methods:
+            get_new_theme_name
+            create_new
+        """
+        target = self.highlight_target.get()
+        prev_color = self.frame_color_set.cget('bg')
+        rgbTuplet, color_string = tkColorChooser.askcolor(
+                parent=self, title='Pick new color for : '+target,
+                initialcolor=prev_color)
+        if color_string and (color_string != prev_color):
+            # User didn't cancel and they chose a new color.
+            if self.theme_source.get():  # Current theme is a built-in.
+                message = ('Your changes will be saved as a new Custom Theme. '
+                           'Enter a name for your new Custom Theme below.')
+                new_theme = self.get_new_theme_name(message)
+                if not new_theme:  # User cancelled custom theme creation.
+                    return
+                else:  # Create new custom theme based on previously active theme.
+                    self.create_new(new_theme)
+                    self.color.set(color_string)
+            else:  # Current theme is user defined.
+                self.color.set(color_string)
+
+    def on_new_color_set(self):
+        "Display sample of new color selection on the dialog."
+        new_color = self.color.get()
+        self.frame_color_set['bg'] = new_color  # Set sample.
+        plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
+        sample_element = self.theme_elements[self.highlight_target.get()][0]
+        self.highlight_sample.tag_config(sample_element, **{plane: new_color})
+        theme = self.custom_name.get()
+        theme_element = sample_element + '-' + plane
+        changes.add_option('highlight', theme, theme_element, new_color)
+
+    def get_new_theme_name(self, message):
+        "Return name of new theme from query popup."
+        used_names = (idleConf.GetSectionList('user', 'highlight') +
+                idleConf.GetSectionList('default', 'highlight'))
+        new_theme = SectionName(
+                self, 'New Custom Theme', message, used_names).result
+        return new_theme
+
+    def save_as_new_theme(self):
+        """Prompt for new theme name and create the theme.
+
+        Methods:
+            get_new_theme_name
+            create_new
+        """
+        new_theme_name = self.get_new_theme_name('New Theme Name:')
+        if new_theme_name:
+            self.create_new(new_theme_name)
+
+    def create_new(self, new_theme_name):
+        """Create a new custom theme with the given name.
+
+        Create the new theme based on the previously active theme
+        with the current changes applied.  Once it is saved, then
+        activate the new theme.
+
+        Attributes accessed:
+            builtin_name
+            custom_name
+
+        Attributes updated:
+            customlist
+            theme_source
+
+        Method:
+            save_new
+            set_theme_type
+        """
+        if self.theme_source.get():
+            theme_type = 'default'
+            theme_name = self.builtin_name.get()
+        else:
+            theme_type = 'user'
+            theme_name = self.custom_name.get()
+        new_theme = idleConf.GetThemeDict(theme_type, theme_name)
+        # Apply any of the old theme's unsaved changes to the new theme.
+        if theme_name in changes['highlight']:
+            theme_changes = changes['highlight'][theme_name]
+            for element in theme_changes:
+                new_theme[element] = theme_changes[element]
+        # Save the new theme.
+        self.save_new(new_theme_name, new_theme)
+        # Change GUI over to the new theme.
+        custom_theme_list = idleConf.GetSectionList('user', 'highlight')
+        custom_theme_list.sort()
+        self.customlist.SetMenu(custom_theme_list, new_theme_name)
+        self.theme_source.set(0)
+        self.set_theme_type()
+
+    def set_highlight_target(self):
+        """Set fg/bg toggle and color based on highlight tag target.
+
+        Instance variables accessed:
+            highlight_target
+
+        Attributes updated:
+            fg_on
+            bg_on
+            fg_bg_toggle
+
+        Methods:
+            set_color_sample
+
+        Called from:
+            var_changed_highlight_target
+            load_theme_cfg
+        """
+        if self.highlight_target.get() == 'Cursor':  # bg not possible
+            self.fg_on['state'] = DISABLED
+            self.bg_on['state'] = DISABLED
+            self.fg_bg_toggle.set(1)
+        else:  # Both fg and bg can be set.
+            self.fg_on['state'] = NORMAL
+            self.bg_on['state'] = NORMAL
+            self.fg_bg_toggle.set(1)
+        self.set_color_sample()
+
+    def set_color_sample_binding(self, *args):
+        """Change color sample based on foreground/background toggle.
+
+        Methods:
+            set_color_sample
+        """
+        self.set_color_sample()
+
+    def set_color_sample(self):
+        """Set the color of the frame background to reflect the selected target.
+
+        Instance variables accessed:
+            theme_elements
+            highlight_target
+            fg_bg_toggle
+            highlight_sample
+
+        Attributes updated:
+            frame_color_set
+        """
+        # Set the color sample area.
+        tag = self.theme_elements[self.highlight_target.get()][0]
+        plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
+        color = self.highlight_sample.tag_cget(tag, plane)
+        self.frame_color_set['bg'] = color
+
+    def paint_theme_sample(self):
+        """Apply the theme colors to each element tag in the sample text.
+
+        Instance attributes accessed:
+            theme_elements
+            theme_source
+            builtin_name
+            custom_name
+
+        Attributes updated:
+            highlight_sample: Set the tag elements to the theme.
+
+        Methods:
+            set_color_sample
+
+        Called from:
+            var_changed_builtin_name
+            var_changed_custom_name
+            load_theme_cfg
+        """
+        if self.theme_source.get():  # Default theme
+            theme = self.builtin_name.get()
+        else:  # User theme
+            theme = self.custom_name.get()
+        for element_title in self.theme_elements:
+            element = self.theme_elements[element_title][0]
+            colors = idleConf.GetHighlight(theme, element)
+            if element == 'cursor':  # Cursor sample needs special painting.
+                colors['background'] = idleConf.GetHighlight(
+                        theme, 'normal', fgBg='bg')
+            # Handle any unsaved changes to this theme.
+            if theme in changes['highlight']:
+                theme_dict = changes['highlight'][theme]
+                if element + '-foreground' in theme_dict:
+                    colors['foreground'] = theme_dict[element + '-foreground']
+                if element + '-background' in theme_dict:
+                    colors['background'] = theme_dict[element + '-background']
+            self.highlight_sample.tag_config(element, **colors)
+        self.set_color_sample()
+
+    def save_new(self, theme_name, theme):
+        """Save a newly created theme to idleConf.
+
+        theme_name - string, the name of the new theme
+        theme - dictionary containing the new theme
+        """
+        if not idleConf.userCfg['highlight'].has_section(theme_name):
+            idleConf.userCfg['highlight'].add_section(theme_name)
+        for element in theme:
+            value = theme[element]
+            idleConf.userCfg['highlight'].SetOption(theme_name, element, value)
+
+    def delete_custom(self):
+        """Handle event to delete custom theme.
+
+        The current theme is deactivated and the default theme is
+        activated.  The custom theme is permanently removed from
+        the config file.
+
+        Attributes accessed:
+            custom_name
+
+        Attributes updated:
+            custom_theme_on
+            customlist
+            theme_source
+            builtin_name
+
+        Methods:
+            deactivate_current_config
+            save_all_changed_extensions
+            activate_config_changes
+            set_theme_type
+        """
+        theme_name = self.custom_name.get()
+        delmsg = 'Are you sure you wish to delete the theme %r ?'
+        if not tkMessageBox.askyesno(
+                'Delete Theme',  delmsg % theme_name, parent=self):
+            return
+        cd.deactivate_current_config()
+        # Remove theme from changes, config, and file.
+        changes.delete_section('highlight', theme_name)
+        # Reload user theme list.
+        item_list = idleConf.GetSectionList('user', 'highlight')
+        item_list.sort()
+        if not item_list:
+            self.custom_theme_on['state'] = DISABLED
+            self.customlist.SetMenu(item_list, '- no custom themes -')
+        else:
+            self.customlist.SetMenu(item_list, item_list[0])
+        # Revert to default theme.
+        self.theme_source.set(idleConf.defaultCfg['main'].Get('Theme', 'default'))
+        self.builtin_name.set(idleConf.defaultCfg['main'].Get('Theme', 'name'))
+        # User can't back out of these changes, they must be applied now.
+        changes.save_all()
+        cd.save_all_changed_extensions()
+        cd.activate_config_changes()
+        self.set_theme_type()
+
+
 class KeysPage(Frame):
 
     def __init__(self, master):
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-18-14-13-42.bpo-31206.F1-tKK.rst b/Misc/NEWS.d/next/IDLE/2017-08-18-14-13-42.bpo-31206.F1-tKK.rst
new file mode 100644
index 00000000000..ba984065e88
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-18-14-13-42.bpo-31206.F1-tKK.rst
@@ -0,0 +1,2 @@
+IDLE: Factor HighPage(Frame) class from ConfigDialog. Patch by Cheryl
+Sabella.


From webhook-mailer at python.org  Sat Aug 19 22:04:43 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 20 Aug 2017 02:04:43 -0000
Subject: [Python-checkins] bpo-31206: IDLE: Factor HighPage class from
 ConfigDialog (#3156)
Message-ID: <mailman.66.1503194685.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/8f7a798edbdbca9a400105e3225463e59b334666
commit: 8f7a798edbdbca9a400105e3225463e59b334666
branch: master
author: Cheryl Sabella <cheryl.sabella at gmail.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-08-19T22:04:40-04:00
summary:

bpo-31206: IDLE: Factor HighPage class from ConfigDialog (#3156)

Patch 2 of 3, to avoid horrendous diff.  Create highlights page from new HighPage class instead of old ConfigDialog methods and change tests to match.

files:
M Lib/idlelib/configdialog.py
M Lib/idlelib/idle_test/test_configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 587f16ec9df..a9863023a76 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -75,8 +75,7 @@ def __init__(self, parent, title='', _htest=False, _utest=False):
         # self.bind('<Escape>', self.Cancel) #dismiss dialog, no save
         # self.bind('<Alt-a>', self.Apply) #apply changes, save
         # self.bind('<F1>', self.Help) #context help
-        self.load_configs()
-        # Avoid callbacks during load_configs.
+        # Attach callbacks after loading config to avoid calling them.
         tracers.attach()
 
         if not _utest:
@@ -84,13 +83,12 @@ def __init__(self, parent, title='', _htest=False, _utest=False):
             self.wm_deiconify()
             self.wait_window()
 
-
     def create_widgets(self):
         """Create and place widgets for tabbed dialog.
 
         Widgets Bound to self:
             note: Notebook
-            highpage: self.create_page_highlight
+            highpage: HighPage
             fontpage: FontPage
             keyspage: KeysPage
             genpage: GenPage
@@ -102,7 +100,7 @@ def create_widgets(self):
             activate_config_changes: Tell editors to reload.
         """
         self.note = note = Notebook(self, width=450, height=450)
-        self.highpage = self.create_page_highlight()
+        self.highpage = HighPage(note)
         self.fontpage = FontPage(note, self.highpage)
         self.keyspage = KeysPage(note)
         self.genpage = GenPage(note)
@@ -131,11 +129,10 @@ def load_configs(self):
         """
         #self.load_font_cfg()
         #self.load_tab_cfg()
-        self.load_theme_cfg()
+        # self.load_theme_cfg()
         # self.load_key_cfg()
         # self.load_general_cfg()
         # note: extension page handled separately
-
     def create_action_buttons(self):
         """Return frame of action buttons for dialog.
 
@@ -1477,7 +1474,8 @@ def create_page_highlight(self):
             text.insert(END, texttag[0], texttag[1])
         for element in self.theme_elements:
             def tem(event, elem=element):
-                event.widget.winfo_toplevel().highlight_target.set(elem)
+                # event.widget.winfo_top_level().highlight_target.set(elem)
+                self.highlight_target.set(elem)
             text.tag_bind(
                     self.theme_elements[element][0], '<ButtonPress-1>', tem)
         text['state'] = DISABLED
@@ -1912,7 +1910,7 @@ def delete_custom(self):
         if not tkMessageBox.askyesno(
                 'Delete Theme',  delmsg % theme_name, parent=self):
             return
-        cd.deactivate_current_config()
+        self.cd.deactivate_current_config()
         # Remove theme from changes, config, and file.
         changes.delete_section('highlight', theme_name)
         # Reload user theme list.
@@ -1928,8 +1926,8 @@ def delete_custom(self):
         self.builtin_name.set(idleConf.defaultCfg['main'].Get('Theme', 'name'))
         # User can't back out of these changes, they must be applied now.
         changes.save_all()
-        cd.save_all_changed_extensions()
-        cd.activate_config_changes()
+        self.cd.save_all_changed_extensions()
+        self.cd.activate_config_changes()
         self.set_theme_type()
 
 
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index 966a72b50a9..df801c32b73 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -1,7 +1,7 @@
 """Test idlelib.configdialog.
 
 Half the class creates dialog, half works with user customizations.
-Coverage: 81%.
+Coverage: 95%.
 """
 from idlelib import configdialog
 from test.support import requires
@@ -226,7 +226,7 @@ def test_indent_scale(self):
         self.assertEqual(mainpage, {'Indent': {'num-spaces': '16'}})
 
 
-class HighlightTest(unittest.TestCase):
+class HighPageTest(unittest.TestCase):
     """Test that highlight tab widgets enable users to make changes.
 
     Test that widget actions set vars, that var changes add
@@ -235,21 +235,21 @@ class HighlightTest(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        d = dialog
-        dialog.note.select(d.highpage)
-        d.set_theme_type = Func()
-        d.paint_theme_sample = Func()
-        d.set_highlight_target = Func()
-        d.set_color_sample = Func()
+        page = cls.page = dialog.highpage
+        dialog.note.select(page)
+        page.set_theme_type = Func()
+        page.paint_theme_sample = Func()
+        page.set_highlight_target = Func()
+        page.set_color_sample = Func()
 
     @classmethod
     def tearDownClass(cls):
-        d = dialog
+        d = cls.page
         del d.set_theme_type, d.paint_theme_sample
         del d.set_highlight_target, d.set_color_sample
 
     def setUp(self):
-        d = dialog
+        d = self.page
         # The following is needed for test_load_key_cfg, _delete_custom_keys.
         # This may indicate a defect in some test or function.
         for section in idleConf.GetSectionList('user', 'highlight'):
@@ -262,7 +262,7 @@ def setUp(self):
 
     def test_load_theme_cfg(self):
         tracers.detach()
-        d = dialog
+        d = self.page
         eq = self.assertEqual
 
         # Use builtin theme with no user themes created.
@@ -303,7 +303,7 @@ def test_load_theme_cfg(self):
 
     def test_theme_source(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         # Test these separately.
         d.var_changed_builtin_name = Func()
         d.var_changed_custom_name = Func()
@@ -324,7 +324,7 @@ def test_theme_source(self):
 
     def test_builtin_name(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         item_list = ['IDLE Classic', 'IDLE Dark', 'IDLE New']
 
         # Not in old_themes, defaults name to first item.
@@ -351,7 +351,7 @@ def test_builtin_name(self):
         eq(d.paint_theme_sample.called, 3)
 
     def test_custom_name(self):
-        d = dialog
+        d = self.page
 
         # If no selections, doesn't get added.
         d.customlist.SetMenu([], '- no custom themes -')
@@ -365,7 +365,7 @@ def test_custom_name(self):
         self.assertEqual(d.paint_theme_sample.called, 1)
 
     def test_color(self):
-        d = dialog
+        d = self.page
         d.on_new_color_set = Func()
         # self.color is only set in get_color through ColorChooser.
         d.color.set('green')
@@ -375,7 +375,7 @@ def test_color(self):
     def test_highlight_target_list_mouse(self):
         # Set highlight_target through targetlist.
         eq = self.assertEqual
-        d = dialog
+        d = self.page
 
         d.targetlist.SetMenu(['a', 'b', 'c'], 'c')
         eq(d.highlight_target.get(), 'c')
@@ -384,7 +384,7 @@ def test_highlight_target_list_mouse(self):
     def test_highlight_target_text_mouse(self):
         # Set highlight_target through clicking highlight_sample.
         eq = self.assertEqual
-        d = dialog
+        d = self.page
 
         elem = {}
         count = 0
@@ -420,7 +420,7 @@ def click_it(start):
 
     def test_set_theme_type(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         del d.set_theme_type
 
         # Builtin theme selected.
@@ -441,7 +441,7 @@ def test_set_theme_type(self):
 
     def test_get_color(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         orig_chooser = configdialog.tkColorChooser.askcolor
         chooser = configdialog.tkColorChooser.askcolor = Func()
         gntn = d.get_new_theme_name = Func()
@@ -487,7 +487,7 @@ def test_get_color(self):
         configdialog.tkColorChooser.askcolor = orig_chooser
 
     def test_on_new_color_set(self):
-        d = dialog
+        d = self.page
         color = '#3f7cae'
         d.custom_name.set('Python')
         d.highlight_target.set('Selected Text')
@@ -502,7 +502,7 @@ def test_on_new_color_set(self):
     def test_get_new_theme_name(self):
         orig_sectionname = configdialog.SectionName
         sn = configdialog.SectionName = Func(return_self=True)
-        d = dialog
+        d = self.page
 
         sn.result = 'New Theme'
         self.assertEqual(d.get_new_theme_name(''), 'New Theme')
@@ -510,7 +510,7 @@ def test_get_new_theme_name(self):
         configdialog.SectionName = orig_sectionname
 
     def test_save_as_new_theme(self):
-        d = dialog
+        d = self.page
         gntn = d.get_new_theme_name = Func()
         d.theme_source.set(True)
 
@@ -530,7 +530,7 @@ def test_save_as_new_theme(self):
 
     def test_create_new_and_save_new(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
 
         # Use default as previously active theme.
         d.theme_source.set(True)
@@ -562,7 +562,7 @@ def test_create_new_and_save_new(self):
 
     def test_set_highlight_target(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         del d.set_highlight_target
 
         # Target is cursor.
@@ -582,7 +582,7 @@ def test_set_highlight_target(self):
         d.set_highlight_target = Func()
 
     def test_set_color_sample_binding(self):
-        d = dialog
+        d = self.page
         scs = d.set_color_sample
 
         d.fg_on.invoke()
@@ -592,7 +592,7 @@ def test_set_color_sample_binding(self):
         self.assertEqual(scs.called, 2)
 
     def test_set_color_sample(self):
-        d = dialog
+        d = self.page
         del d.set_color_sample
         d.highlight_target.set('Selected Text')
         d.fg_bg_toggle.set(True)
@@ -603,7 +603,7 @@ def test_set_color_sample(self):
 
     def test_paint_theme_sample(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         del d.paint_theme_sample
         hs_tag = d.highlight_sample.tag_cget
         gh = idleConf.GetHighlight
@@ -640,7 +640,7 @@ def test_paint_theme_sample(self):
 
     def test_delete_custom(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         d.button_delete_custom['state'] = NORMAL
         yesno = configdialog.tkMessageBox.askyesno = Func()
         dialog.deactivate_current_config = Func()


From solipsis at pitrou.net  Sun Aug 20 05:05:30 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 20 Aug 2017 09:05:30 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=71
Message-ID: <20170820090529.26207.F4C130F3B7488888@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_fork leaked [44, 0, 0] references, sum=44
test_multiprocessing_fork leaked [21, -1, 1] memory blocks, sum=21
test_multiprocessing_fork leaked [2, 0, 0] file descriptors, sum=2


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogwnXcV1', '--timeout', '7200']

From webhook-mailer at python.org  Sun Aug 20 08:03:08 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 20 Aug 2017 12:03:08 -0000
Subject: [Python-checkins] [3.6] bpo-31206: IDLE: Factor HighPage class from
 ConfigDialog (GH-3156) (#3159)
Message-ID: <mailman.67.1503230589.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/3d9c0d498de3245199ca95aba14ce260e7d33489
commit: 3d9c0d498de3245199ca95aba14ce260e7d33489
branch: 3.6
author: Cheryl Sabella <cheryl.sabella at gmail.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-08-20T08:03:05-04:00
summary:

[3.6] bpo-31206: IDLE: Factor HighPage class from ConfigDialog (GH-3156) (#3159)

Patch 2 of 3, to avoid horrendous diff.  Create highlights page from new HighPage class instead of old ConfigDialog methods and change tests to match. Patch by Cheryl Sabella.
(cherry picked from commit 8f7a798edbdbca9a400105e3225463e59b334666)

files:
M Lib/idlelib/configdialog.py
M Lib/idlelib/idle_test/test_configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 587f16ec9df..a9863023a76 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -75,8 +75,7 @@ def __init__(self, parent, title='', _htest=False, _utest=False):
         # self.bind('<Escape>', self.Cancel) #dismiss dialog, no save
         # self.bind('<Alt-a>', self.Apply) #apply changes, save
         # self.bind('<F1>', self.Help) #context help
-        self.load_configs()
-        # Avoid callbacks during load_configs.
+        # Attach callbacks after loading config to avoid calling them.
         tracers.attach()
 
         if not _utest:
@@ -84,13 +83,12 @@ def __init__(self, parent, title='', _htest=False, _utest=False):
             self.wm_deiconify()
             self.wait_window()
 
-
     def create_widgets(self):
         """Create and place widgets for tabbed dialog.
 
         Widgets Bound to self:
             note: Notebook
-            highpage: self.create_page_highlight
+            highpage: HighPage
             fontpage: FontPage
             keyspage: KeysPage
             genpage: GenPage
@@ -102,7 +100,7 @@ def create_widgets(self):
             activate_config_changes: Tell editors to reload.
         """
         self.note = note = Notebook(self, width=450, height=450)
-        self.highpage = self.create_page_highlight()
+        self.highpage = HighPage(note)
         self.fontpage = FontPage(note, self.highpage)
         self.keyspage = KeysPage(note)
         self.genpage = GenPage(note)
@@ -131,11 +129,10 @@ def load_configs(self):
         """
         #self.load_font_cfg()
         #self.load_tab_cfg()
-        self.load_theme_cfg()
+        # self.load_theme_cfg()
         # self.load_key_cfg()
         # self.load_general_cfg()
         # note: extension page handled separately
-
     def create_action_buttons(self):
         """Return frame of action buttons for dialog.
 
@@ -1477,7 +1474,8 @@ def create_page_highlight(self):
             text.insert(END, texttag[0], texttag[1])
         for element in self.theme_elements:
             def tem(event, elem=element):
-                event.widget.winfo_toplevel().highlight_target.set(elem)
+                # event.widget.winfo_top_level().highlight_target.set(elem)
+                self.highlight_target.set(elem)
             text.tag_bind(
                     self.theme_elements[element][0], '<ButtonPress-1>', tem)
         text['state'] = DISABLED
@@ -1912,7 +1910,7 @@ def delete_custom(self):
         if not tkMessageBox.askyesno(
                 'Delete Theme',  delmsg % theme_name, parent=self):
             return
-        cd.deactivate_current_config()
+        self.cd.deactivate_current_config()
         # Remove theme from changes, config, and file.
         changes.delete_section('highlight', theme_name)
         # Reload user theme list.
@@ -1928,8 +1926,8 @@ def delete_custom(self):
         self.builtin_name.set(idleConf.defaultCfg['main'].Get('Theme', 'name'))
         # User can't back out of these changes, they must be applied now.
         changes.save_all()
-        cd.save_all_changed_extensions()
-        cd.activate_config_changes()
+        self.cd.save_all_changed_extensions()
+        self.cd.activate_config_changes()
         self.set_theme_type()
 
 
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index 966a72b50a9..df801c32b73 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -1,7 +1,7 @@
 """Test idlelib.configdialog.
 
 Half the class creates dialog, half works with user customizations.
-Coverage: 81%.
+Coverage: 95%.
 """
 from idlelib import configdialog
 from test.support import requires
@@ -226,7 +226,7 @@ def test_indent_scale(self):
         self.assertEqual(mainpage, {'Indent': {'num-spaces': '16'}})
 
 
-class HighlightTest(unittest.TestCase):
+class HighPageTest(unittest.TestCase):
     """Test that highlight tab widgets enable users to make changes.
 
     Test that widget actions set vars, that var changes add
@@ -235,21 +235,21 @@ class HighlightTest(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        d = dialog
-        dialog.note.select(d.highpage)
-        d.set_theme_type = Func()
-        d.paint_theme_sample = Func()
-        d.set_highlight_target = Func()
-        d.set_color_sample = Func()
+        page = cls.page = dialog.highpage
+        dialog.note.select(page)
+        page.set_theme_type = Func()
+        page.paint_theme_sample = Func()
+        page.set_highlight_target = Func()
+        page.set_color_sample = Func()
 
     @classmethod
     def tearDownClass(cls):
-        d = dialog
+        d = cls.page
         del d.set_theme_type, d.paint_theme_sample
         del d.set_highlight_target, d.set_color_sample
 
     def setUp(self):
-        d = dialog
+        d = self.page
         # The following is needed for test_load_key_cfg, _delete_custom_keys.
         # This may indicate a defect in some test or function.
         for section in idleConf.GetSectionList('user', 'highlight'):
@@ -262,7 +262,7 @@ def setUp(self):
 
     def test_load_theme_cfg(self):
         tracers.detach()
-        d = dialog
+        d = self.page
         eq = self.assertEqual
 
         # Use builtin theme with no user themes created.
@@ -303,7 +303,7 @@ def test_load_theme_cfg(self):
 
     def test_theme_source(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         # Test these separately.
         d.var_changed_builtin_name = Func()
         d.var_changed_custom_name = Func()
@@ -324,7 +324,7 @@ def test_theme_source(self):
 
     def test_builtin_name(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         item_list = ['IDLE Classic', 'IDLE Dark', 'IDLE New']
 
         # Not in old_themes, defaults name to first item.
@@ -351,7 +351,7 @@ def test_builtin_name(self):
         eq(d.paint_theme_sample.called, 3)
 
     def test_custom_name(self):
-        d = dialog
+        d = self.page
 
         # If no selections, doesn't get added.
         d.customlist.SetMenu([], '- no custom themes -')
@@ -365,7 +365,7 @@ def test_custom_name(self):
         self.assertEqual(d.paint_theme_sample.called, 1)
 
     def test_color(self):
-        d = dialog
+        d = self.page
         d.on_new_color_set = Func()
         # self.color is only set in get_color through ColorChooser.
         d.color.set('green')
@@ -375,7 +375,7 @@ def test_color(self):
     def test_highlight_target_list_mouse(self):
         # Set highlight_target through targetlist.
         eq = self.assertEqual
-        d = dialog
+        d = self.page
 
         d.targetlist.SetMenu(['a', 'b', 'c'], 'c')
         eq(d.highlight_target.get(), 'c')
@@ -384,7 +384,7 @@ def test_highlight_target_list_mouse(self):
     def test_highlight_target_text_mouse(self):
         # Set highlight_target through clicking highlight_sample.
         eq = self.assertEqual
-        d = dialog
+        d = self.page
 
         elem = {}
         count = 0
@@ -420,7 +420,7 @@ def click_it(start):
 
     def test_set_theme_type(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         del d.set_theme_type
 
         # Builtin theme selected.
@@ -441,7 +441,7 @@ def test_set_theme_type(self):
 
     def test_get_color(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         orig_chooser = configdialog.tkColorChooser.askcolor
         chooser = configdialog.tkColorChooser.askcolor = Func()
         gntn = d.get_new_theme_name = Func()
@@ -487,7 +487,7 @@ def test_get_color(self):
         configdialog.tkColorChooser.askcolor = orig_chooser
 
     def test_on_new_color_set(self):
-        d = dialog
+        d = self.page
         color = '#3f7cae'
         d.custom_name.set('Python')
         d.highlight_target.set('Selected Text')
@@ -502,7 +502,7 @@ def test_on_new_color_set(self):
     def test_get_new_theme_name(self):
         orig_sectionname = configdialog.SectionName
         sn = configdialog.SectionName = Func(return_self=True)
-        d = dialog
+        d = self.page
 
         sn.result = 'New Theme'
         self.assertEqual(d.get_new_theme_name(''), 'New Theme')
@@ -510,7 +510,7 @@ def test_get_new_theme_name(self):
         configdialog.SectionName = orig_sectionname
 
     def test_save_as_new_theme(self):
-        d = dialog
+        d = self.page
         gntn = d.get_new_theme_name = Func()
         d.theme_source.set(True)
 
@@ -530,7 +530,7 @@ def test_save_as_new_theme(self):
 
     def test_create_new_and_save_new(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
 
         # Use default as previously active theme.
         d.theme_source.set(True)
@@ -562,7 +562,7 @@ def test_create_new_and_save_new(self):
 
     def test_set_highlight_target(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         del d.set_highlight_target
 
         # Target is cursor.
@@ -582,7 +582,7 @@ def test_set_highlight_target(self):
         d.set_highlight_target = Func()
 
     def test_set_color_sample_binding(self):
-        d = dialog
+        d = self.page
         scs = d.set_color_sample
 
         d.fg_on.invoke()
@@ -592,7 +592,7 @@ def test_set_color_sample_binding(self):
         self.assertEqual(scs.called, 2)
 
     def test_set_color_sample(self):
-        d = dialog
+        d = self.page
         del d.set_color_sample
         d.highlight_target.set('Selected Text')
         d.fg_bg_toggle.set(True)
@@ -603,7 +603,7 @@ def test_set_color_sample(self):
 
     def test_paint_theme_sample(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         del d.paint_theme_sample
         hs_tag = d.highlight_sample.tag_cget
         gh = idleConf.GetHighlight
@@ -640,7 +640,7 @@ def test_paint_theme_sample(self):
 
     def test_delete_custom(self):
         eq = self.assertEqual
-        d = dialog
+        d = self.page
         d.button_delete_custom['state'] = NORMAL
         yesno = configdialog.tkMessageBox.askyesno = Func()
         dialog.deactivate_current_config = Func()


From webhook-mailer at python.org  Sun Aug 20 08:07:24 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 20 Aug 2017 12:07:24 -0000
Subject: [Python-checkins] bpo-31206: IDLE: Factor HighPage class from
 ConfigDialog (#3160)
Message-ID: <mailman.68.1503230847.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/4bfebc63012f0f4e00f6a98c3d96e1c0ebe93408
commit: 4bfebc63012f0f4e00f6a98c3d96e1c0ebe93408
branch: master
author: Cheryl Sabella <cheryl.sabella at gmail.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-08-20T08:07:22-04:00
summary:

bpo-31206: IDLE: Factor HighPage class from ConfigDialog (#3160)

Part 3 of 3.  Remove old highlight functions and load_config as this functionality is now contained within classes. Patch by Cheryl Sabella.

files:
M Lib/idlelib/configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index a9863023a76..81ea8afbbcd 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -114,25 +114,6 @@ def create_widgets(self):
         note.pack(side=TOP, expand=TRUE, fill=BOTH)
         self.create_action_buttons().pack(side=BOTTOM)
 
-    def load_configs(self):
-        """Load configuration for each page.
-
-        Load configuration from default and user config files and populate
-        the widgets on the config dialog pages.
-
-        Methods:
-            load_font_cfg
-            load_tab_cfg
-            load_theme_cfg
-            load_key_cfg
-            load_general_cfg
-        """
-        #self.load_font_cfg()
-        #self.load_tab_cfg()
-        # self.load_theme_cfg()
-        # self.load_key_cfg()
-        # self.load_general_cfg()
-        # note: extension page handled separately
     def create_action_buttons(self):
         """Return frame of action buttons for dialog.
 
@@ -215,644 +196,6 @@ def help(self):
         view_text(self, title='Help for IDLE preferences',
                  text=help_common+help_pages.get(page, ''))
 
-
-    def create_page_highlight(self):
-        """Return frame of widgets for Highlighting tab.
-
-        Enable users to provisionally change foreground and background
-        colors applied to textual tags.  Color mappings are stored in
-        complete listings called themes.  Built-in themes in
-        idlelib/config-highlight.def are fixed as far as the dialog is
-        concerned. Any theme can be used as the base for a new custom
-        theme, stored in .idlerc/config-highlight.cfg.
-
-        Function load_theme_cfg() initializes tk variables and theme
-        lists and calls paint_theme_sample() and set_highlight_target()
-        for the current theme.  Radiobuttons builtin_theme_on and
-        custom_theme_on toggle var theme_source, which controls if the
-        current set of colors are from a builtin or custom theme.
-        DynOptionMenus builtinlist and customlist contain lists of the
-        builtin and custom themes, respectively, and the current item
-        from each list is stored in vars builtin_name and custom_name.
-
-        Function paint_theme_sample() applies the colors from the theme
-        to the tags in text widget highlight_sample and then invokes
-        set_color_sample().  Function set_highlight_target() sets the state
-        of the radiobuttons fg_on and bg_on based on the tag and it also
-        invokes set_color_sample().
-
-        Function set_color_sample() sets the background color for the frame
-        holding the color selector.  This provides a larger visual of the
-        color for the current tag and plane (foreground/background).
-
-        Note: set_color_sample() is called from many places and is often
-        called more than once when a change is made.  It is invoked when
-        foreground or background is selected (radiobuttons), from
-        paint_theme_sample() (theme is changed or load_cfg is called), and
-        from set_highlight_target() (target tag is changed or load_cfg called).
-
-        Button delete_custom invokes delete_custom() to delete
-        a custom theme from idleConf.userCfg['highlight'] and changes.
-        Button save_custom invokes save_as_new_theme() which calls
-        get_new_theme_name() and create_new() to save a custom theme
-        and its colors to idleConf.userCfg['highlight'].
-
-        Radiobuttons fg_on and bg_on toggle var fg_bg_toggle to control
-        if the current selected color for a tag is for the foreground or
-        background.
-
-        DynOptionMenu targetlist contains a readable description of the
-        tags applied to Python source within IDLE.  Selecting one of the
-        tags from this list populates highlight_target, which has a callback
-        function set_highlight_target().
-
-        Text widget highlight_sample displays a block of text (which is
-        mock Python code) in which is embedded the defined tags and reflects
-        the color attributes of the current theme and changes for those tags.
-        Mouse button 1 allows for selection of a tag and updates
-        highlight_target with that tag value.
-
-        Note: The font in highlight_sample is set through the config in
-        the fonts tab.
-
-        In other words, a tag can be selected either from targetlist or
-        by clicking on the sample text within highlight_sample.  The
-        plane (foreground/background) is selected via the radiobutton.
-        Together, these two (tag and plane) control what color is
-        shown in set_color_sample() for the current theme.  Button set_color
-        invokes get_color() which displays a ColorChooser to change the
-        color for the selected tag/plane.  If a new color is picked,
-        it will be saved to changes and the highlight_sample and
-        frame background will be updated.
-
-        Tk Variables:
-            color: Color of selected target.
-            builtin_name: Menu variable for built-in theme.
-            custom_name: Menu variable for custom theme.
-            fg_bg_toggle: Toggle for foreground/background color.
-                Note: this has no callback.
-            theme_source: Selector for built-in or custom theme.
-            highlight_target: Menu variable for the highlight tag target.
-
-        Instance Data Attributes:
-            theme_elements: Dictionary of tags for text highlighting.
-                The key is the display name and the value is a tuple of
-                (tag name, display sort order).
-
-        Methods [attachment]:
-            load_theme_cfg: Load current highlight colors.
-            get_color: Invoke colorchooser [button_set_color].
-            set_color_sample_binding: Call set_color_sample [fg_bg_toggle].
-            set_highlight_target: set fg_bg_toggle, set_color_sample().
-            set_color_sample: Set frame background to target.
-            on_new_color_set: Set new color and add option.
-            paint_theme_sample: Recolor sample.
-            get_new_theme_name: Get from popup.
-            create_new: Combine theme with changes and save.
-            save_as_new_theme: Save [button_save_custom].
-            set_theme_type: Command for [theme_source].
-            delete_custom: Activate default [button_delete_custom].
-            save_new: Save to userCfg['theme'] (is function).
-
-        Widgets of highlights page frame:  (*) widgets bound to self
-            frame_custom: LabelFrame
-                (*)highlight_sample: Text
-                (*)frame_color_set: Frame
-                    (*)button_set_color: Button
-                    (*)targetlist: DynOptionMenu - highlight_target
-                frame_fg_bg_toggle: Frame
-                    (*)fg_on: Radiobutton - fg_bg_toggle
-                    (*)bg_on: Radiobutton - fg_bg_toggle
-                (*)button_save_custom: Button
-            frame_theme: LabelFrame
-                theme_type_title: Label
-                (*)builtin_theme_on: Radiobutton - theme_source
-                (*)custom_theme_on: Radiobutton - theme_source
-                (*)builtinlist: DynOptionMenu - builtin_name
-                (*)customlist: DynOptionMenu - custom_name
-                (*)button_delete_custom: Button
-                (*)theme_message: Label
-        """
-        self.theme_elements={
-            'Normal Text': ('normal', '00'),
-            'Python Keywords': ('keyword', '01'),
-            'Python Definitions': ('definition', '02'),
-            'Python Builtins': ('builtin', '03'),
-            'Python Comments': ('comment', '04'),
-            'Python Strings': ('string', '05'),
-            'Selected Text': ('hilite', '06'),
-            'Found Text': ('hit', '07'),
-            'Cursor': ('cursor', '08'),
-            'Editor Breakpoint': ('break', '09'),
-            'Shell Normal Text': ('console', '10'),
-            'Shell Error Text': ('error', '11'),
-            'Shell Stdout Text': ('stdout', '12'),
-            'Shell Stderr Text': ('stderr', '13'),
-            }
-        parent = self.parent
-        self.builtin_name = tracers.add(
-                StringVar(parent), self.var_changed_builtin_name)
-        self.custom_name = tracers.add(
-                StringVar(parent), self.var_changed_custom_name)
-        self.fg_bg_toggle = BooleanVar(parent)
-        self.color = tracers.add(
-                StringVar(parent), self.var_changed_color)
-        self.theme_source = tracers.add(
-                BooleanVar(parent), self.var_changed_theme_source)
-        self.highlight_target = tracers.add(
-                StringVar(parent), self.var_changed_highlight_target)
-
-        # Create widgets:
-        # body frame and section frames.
-        frame = Frame(self.note)
-        frame_custom = LabelFrame(frame, borderwidth=2, relief=GROOVE,
-                                 text=' Custom Highlighting ')
-        frame_theme = LabelFrame(frame, borderwidth=2, relief=GROOVE,
-                                text=' Highlighting Theme ')
-        # frame_custom.
-        text = self.highlight_sample = frame.highlight_sample = Text(
-                frame_custom, relief=SOLID, borderwidth=1,
-                font=('courier', 12, ''), cursor='hand2', width=21, height=13,
-                takefocus=FALSE, highlightthickness=0, wrap=NONE)
-        text.bind('<Double-Button-1>', lambda e: 'break')
-        text.bind('<B1-Motion>', lambda e: 'break')
-        text_and_tags=(('\n', 'normal'),
-            ('#you can click here', 'comment'), ('\n', 'normal'),
-            ('#to choose items', 'comment'), ('\n', 'normal'),
-            ('def', 'keyword'), (' ', 'normal'),
-            ('func', 'definition'), ('(param):\n  ', 'normal'),
-            ('"""string"""', 'string'), ('\n  var0 = ', 'normal'),
-            ("'string'", 'string'), ('\n  var1 = ', 'normal'),
-            ("'selected'", 'hilite'), ('\n  var2 = ', 'normal'),
-            ("'found'", 'hit'), ('\n  var3 = ', 'normal'),
-            ('list', 'builtin'), ('(', 'normal'),
-            ('None', 'keyword'), (')\n', 'normal'),
-            ('  breakpoint("line")', 'break'), ('\n\n', 'normal'),
-            (' error ', 'error'), (' ', 'normal'),
-            ('cursor |', 'cursor'), ('\n ', 'normal'),
-            ('shell', 'console'), (' ', 'normal'),
-            ('stdout', 'stdout'), (' ', 'normal'),
-            ('stderr', 'stderr'), ('\n\n', 'normal'))
-        for texttag in text_and_tags:
-            text.insert(END, texttag[0], texttag[1])
-        for element in self.theme_elements:
-            def tem(event, elem=element):
-                event.widget.winfo_toplevel().highlight_target.set(elem)
-            text.tag_bind(
-                    self.theme_elements[element][0], '<ButtonPress-1>', tem)
-        text['state'] = DISABLED
-        self.frame_color_set = Frame(frame_custom, relief=SOLID, borderwidth=1)
-        frame_fg_bg_toggle = Frame(frame_custom)
-        self.button_set_color = Button(
-                self.frame_color_set, text='Choose Color for :',
-                command=self.get_color, highlightthickness=0)
-        self.targetlist = DynOptionMenu(
-                self.frame_color_set, self.highlight_target, None,
-                highlightthickness=0) #, command=self.set_highlight_targetBinding
-        self.fg_on = Radiobutton(
-                frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=1,
-                text='Foreground', command=self.set_color_sample_binding)
-        self.bg_on = Radiobutton(
-                frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=0,
-                text='Background', command=self.set_color_sample_binding)
-        self.fg_bg_toggle.set(1)
-        self.button_save_custom = Button(
-                frame_custom, text='Save as New Custom Theme',
-                command=self.save_as_new_theme)
-        # frame_theme.
-        theme_type_title = Label(frame_theme, text='Select : ')
-        self.builtin_theme_on = Radiobutton(
-                frame_theme, variable=self.theme_source, value=1,
-                command=self.set_theme_type, text='a Built-in Theme')
-        self.custom_theme_on = Radiobutton(
-                frame_theme, variable=self.theme_source, value=0,
-                command=self.set_theme_type, text='a Custom Theme')
-        self.builtinlist = DynOptionMenu(
-                frame_theme, self.builtin_name, None, command=None)
-        self.customlist = DynOptionMenu(
-                frame_theme, self.custom_name, None, command=None)
-        self.button_delete_custom = Button(
-                frame_theme, text='Delete Custom Theme',
-                command=self.delete_custom)
-        self.theme_message = Label(frame_theme, bd=2)
-
-        # Pack widgets:
-        # body.
-        frame_custom.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
-        frame_theme.pack(side=LEFT, padx=5, pady=5, fill=Y)
-        # frame_custom.
-        self.frame_color_set.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=X)
-        frame_fg_bg_toggle.pack(side=TOP, padx=5, pady=0)
-        self.highlight_sample.pack(
-                side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
-        self.button_set_color.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=4)
-        self.targetlist.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=3)
-        self.fg_on.pack(side=LEFT, anchor=E)
-        self.bg_on.pack(side=RIGHT, anchor=W)
-        self.button_save_custom.pack(side=BOTTOM, fill=X, padx=5, pady=5)
-        # frame_theme.
-        theme_type_title.pack(side=TOP, anchor=W, padx=5, pady=5)
-        self.builtin_theme_on.pack(side=TOP, anchor=W, padx=5)
-        self.custom_theme_on.pack(side=TOP, anchor=W, padx=5, pady=2)
-        self.builtinlist.pack(side=TOP, fill=X, padx=5, pady=5)
-        self.customlist.pack(side=TOP, fill=X, anchor=W, padx=5, pady=5)
-        self.button_delete_custom.pack(side=TOP, fill=X, padx=5, pady=5)
-        self.theme_message.pack(side=TOP, fill=X, pady=5)
-        return frame
-
-    def load_theme_cfg(self):
-        """Load current configuration settings for the theme options.
-
-        Based on the theme_source toggle, the theme is set as
-        either builtin or custom and the initial widget values
-        reflect the current settings from idleConf.
-
-        Attributes updated:
-            theme_source: Set from idleConf.
-            builtinlist: List of default themes from idleConf.
-            customlist: List of custom themes from idleConf.
-            custom_theme_on: Disabled if there are no custom themes.
-            custom_theme: Message with additional information.
-            targetlist: Create menu from self.theme_elements.
-
-        Methods:
-            set_theme_type
-            paint_theme_sample
-            set_highlight_target
-        """
-        # Set current theme type radiobutton.
-        self.theme_source.set(idleConf.GetOption(
-                'main', 'Theme', 'default', type='bool', default=1))
-        # Set current theme.
-        current_option = idleConf.CurrentTheme()
-        # Load available theme option menus.
-        if self.theme_source.get():  # Default theme selected.
-            item_list = idleConf.GetSectionList('default', 'highlight')
-            item_list.sort()
-            self.builtinlist.SetMenu(item_list, current_option)
-            item_list = idleConf.GetSectionList('user', 'highlight')
-            item_list.sort()
-            if not item_list:
-                self.custom_theme_on['state'] = DISABLED
-                self.custom_name.set('- no custom themes -')
-            else:
-                self.customlist.SetMenu(item_list, item_list[0])
-        else:  # User theme selected.
-            item_list = idleConf.GetSectionList('user', 'highlight')
-            item_list.sort()
-            self.customlist.SetMenu(item_list, current_option)
-            item_list = idleConf.GetSectionList('default', 'highlight')
-            item_list.sort()
-            self.builtinlist.SetMenu(item_list, item_list[0])
-        self.set_theme_type()
-        # Load theme element option menu.
-        theme_names = list(self.theme_elements.keys())
-        theme_names.sort(key=lambda x: self.theme_elements[x][1])
-        self.targetlist.SetMenu(theme_names, theme_names[0])
-        self.paint_theme_sample()
-        self.set_highlight_target()
-
-    def var_changed_builtin_name(self, *params):
-        """Process new builtin theme selection.
-
-        Add the changed theme's name to the changed_items and recreate
-        the sample with the values from the selected theme.
-        """
-        old_themes = ('IDLE Classic', 'IDLE New')
-        value = self.builtin_name.get()
-        if value not in old_themes:
-            if idleConf.GetOption('main', 'Theme', 'name') not in old_themes:
-                changes.add_option('main', 'Theme', 'name', old_themes[0])
-            changes.add_option('main', 'Theme', 'name2', value)
-            self.theme_message['text'] = 'New theme, see Help'
-            self.theme_message['fg'] = '#500000'
-        else:
-            changes.add_option('main', 'Theme', 'name', value)
-            changes.add_option('main', 'Theme', 'name2', '')
-            self.theme_message['text'] = ''
-            self.theme_message['fg'] = 'black'
-        self.paint_theme_sample()
-
-    def var_changed_custom_name(self, *params):
-        """Process new custom theme selection.
-
-        If a new custom theme is selected, add the name to the
-        changed_items and apply the theme to the sample.
-        """
-        value = self.custom_name.get()
-        if value != '- no custom themes -':
-            changes.add_option('main', 'Theme', 'name', value)
-            self.paint_theme_sample()
-
-    def var_changed_theme_source(self, *params):
-        """Process toggle between builtin and custom theme.
-
-        Update the default toggle value and apply the newly
-        selected theme type.
-        """
-        value = self.theme_source.get()
-        changes.add_option('main', 'Theme', 'default', value)
-        if value:
-            self.var_changed_builtin_name()
-        else:
-            self.var_changed_custom_name()
-
-    def var_changed_color(self, *params):
-        "Process change to color choice."
-        self.on_new_color_set()
-
-    def var_changed_highlight_target(self, *params):
-        "Process selection of new target tag for highlighting."
-        self.set_highlight_target()
-
-    def set_theme_type(self):
-        """Set available screen options based on builtin or custom theme.
-
-        Attributes accessed:
-            theme_source
-
-        Attributes updated:
-            builtinlist
-            customlist
-            button_delete_custom
-            custom_theme_on
-
-        Called from:
-            handler for builtin_theme_on and custom_theme_on
-            delete_custom
-            create_new
-            load_theme_cfg
-        """
-        if self.theme_source.get():
-            self.builtinlist['state'] = NORMAL
-            self.customlist['state'] = DISABLED
-            self.button_delete_custom['state'] = DISABLED
-        else:
-            self.builtinlist['state'] = DISABLED
-            self.custom_theme_on['state'] = NORMAL
-            self.customlist['state'] = NORMAL
-            self.button_delete_custom['state'] = NORMAL
-
-    def get_color(self):
-        """Handle button to select a new color for the target tag.
-
-        If a new color is selected while using a builtin theme, a
-        name must be supplied to create a custom theme.
-
-        Attributes accessed:
-            highlight_target
-            frame_color_set
-            theme_source
-
-        Attributes updated:
-            color
-
-        Methods:
-            get_new_theme_name
-            create_new
-        """
-        target = self.highlight_target.get()
-        prev_color = self.frame_color_set.cget('bg')
-        rgbTuplet, color_string = tkColorChooser.askcolor(
-                parent=self, title='Pick new color for : '+target,
-                initialcolor=prev_color)
-        if color_string and (color_string != prev_color):
-            # User didn't cancel and they chose a new color.
-            if self.theme_source.get():  # Current theme is a built-in.
-                message = ('Your changes will be saved as a new Custom Theme. '
-                           'Enter a name for your new Custom Theme below.')
-                new_theme = self.get_new_theme_name(message)
-                if not new_theme:  # User cancelled custom theme creation.
-                    return
-                else:  # Create new custom theme based on previously active theme.
-                    self.create_new(new_theme)
-                    self.color.set(color_string)
-            else:  # Current theme is user defined.
-                self.color.set(color_string)
-
-    def on_new_color_set(self):
-        "Display sample of new color selection on the dialog."
-        new_color = self.color.get()
-        self.frame_color_set['bg'] = new_color  # Set sample.
-        plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
-        sample_element = self.theme_elements[self.highlight_target.get()][0]
-        self.highlight_sample.tag_config(sample_element, **{plane: new_color})
-        theme = self.custom_name.get()
-        theme_element = sample_element + '-' + plane
-        changes.add_option('highlight', theme, theme_element, new_color)
-
-    def get_new_theme_name(self, message):
-        "Return name of new theme from query popup."
-        used_names = (idleConf.GetSectionList('user', 'highlight') +
-                idleConf.GetSectionList('default', 'highlight'))
-        new_theme = SectionName(
-                self, 'New Custom Theme', message, used_names).result
-        return new_theme
-
-    def save_as_new_theme(self):
-        """Prompt for new theme name and create the theme.
-
-        Methods:
-            get_new_theme_name
-            create_new
-        """
-        new_theme_name = self.get_new_theme_name('New Theme Name:')
-        if new_theme_name:
-            self.create_new(new_theme_name)
-
-    def create_new(self, new_theme_name):
-        """Create a new custom theme with the given name.
-
-        Create the new theme based on the previously active theme
-        with the current changes applied.  Once it is saved, then
-        activate the new theme.
-
-        Attributes accessed:
-            builtin_name
-            custom_name
-
-        Attributes updated:
-            customlist
-            theme_source
-
-        Method:
-            save_new
-            set_theme_type
-        """
-        if self.theme_source.get():
-            theme_type = 'default'
-            theme_name = self.builtin_name.get()
-        else:
-            theme_type = 'user'
-            theme_name = self.custom_name.get()
-        new_theme = idleConf.GetThemeDict(theme_type, theme_name)
-        # Apply any of the old theme's unsaved changes to the new theme.
-        if theme_name in changes['highlight']:
-            theme_changes = changes['highlight'][theme_name]
-            for element in theme_changes:
-                new_theme[element] = theme_changes[element]
-        # Save the new theme.
-        self.save_new(new_theme_name, new_theme)
-        # Change GUI over to the new theme.
-        custom_theme_list = idleConf.GetSectionList('user', 'highlight')
-        custom_theme_list.sort()
-        self.customlist.SetMenu(custom_theme_list, new_theme_name)
-        self.theme_source.set(0)
-        self.set_theme_type()
-
-    def set_highlight_target(self):
-        """Set fg/bg toggle and color based on highlight tag target.
-
-        Instance variables accessed:
-            highlight_target
-
-        Attributes updated:
-            fg_on
-            bg_on
-            fg_bg_toggle
-
-        Methods:
-            set_color_sample
-
-        Called from:
-            var_changed_highlight_target
-            load_theme_cfg
-        """
-        if self.highlight_target.get() == 'Cursor':  # bg not possible
-            self.fg_on['state'] = DISABLED
-            self.bg_on['state'] = DISABLED
-            self.fg_bg_toggle.set(1)
-        else:  # Both fg and bg can be set.
-            self.fg_on['state'] = NORMAL
-            self.bg_on['state'] = NORMAL
-            self.fg_bg_toggle.set(1)
-        self.set_color_sample()
-
-    def set_color_sample_binding(self, *args):
-        """Change color sample based on foreground/background toggle.
-
-        Methods:
-            set_color_sample
-        """
-        self.set_color_sample()
-
-    def set_color_sample(self):
-        """Set the color of the frame background to reflect the selected target.
-
-        Instance variables accessed:
-            theme_elements
-            highlight_target
-            fg_bg_toggle
-            highlight_sample
-
-        Attributes updated:
-            frame_color_set
-        """
-        # Set the color sample area.
-        tag = self.theme_elements[self.highlight_target.get()][0]
-        plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
-        color = self.highlight_sample.tag_cget(tag, plane)
-        self.frame_color_set['bg'] = color
-
-    def paint_theme_sample(self):
-        """Apply the theme colors to each element tag in the sample text.
-
-        Instance attributes accessed:
-            theme_elements
-            theme_source
-            builtin_name
-            custom_name
-
-        Attributes updated:
-            highlight_sample: Set the tag elements to the theme.
-
-        Methods:
-            set_color_sample
-
-        Called from:
-            var_changed_builtin_name
-            var_changed_custom_name
-            load_theme_cfg
-        """
-        if self.theme_source.get():  # Default theme
-            theme = self.builtin_name.get()
-        else:  # User theme
-            theme = self.custom_name.get()
-        for element_title in self.theme_elements:
-            element = self.theme_elements[element_title][0]
-            colors = idleConf.GetHighlight(theme, element)
-            if element == 'cursor':  # Cursor sample needs special painting.
-                colors['background'] = idleConf.GetHighlight(
-                        theme, 'normal', fgBg='bg')
-            # Handle any unsaved changes to this theme.
-            if theme in changes['highlight']:
-                theme_dict = changes['highlight'][theme]
-                if element + '-foreground' in theme_dict:
-                    colors['foreground'] = theme_dict[element + '-foreground']
-                if element + '-background' in theme_dict:
-                    colors['background'] = theme_dict[element + '-background']
-            self.highlight_sample.tag_config(element, **colors)
-        self.set_color_sample()
-
-    def save_new(self, theme_name, theme):
-        """Save a newly created theme to idleConf.
-
-        theme_name - string, the name of the new theme
-        theme - dictionary containing the new theme
-        """
-        if not idleConf.userCfg['highlight'].has_section(theme_name):
-            idleConf.userCfg['highlight'].add_section(theme_name)
-        for element in theme:
-            value = theme[element]
-            idleConf.userCfg['highlight'].SetOption(theme_name, element, value)
-
-    def delete_custom(self):
-        """Handle event to delete custom theme.
-
-        The current theme is deactivated and the default theme is
-        activated.  The custom theme is permanently removed from
-        the config file.
-
-        Attributes accessed:
-            custom_name
-
-        Attributes updated:
-            custom_theme_on
-            customlist
-            theme_source
-            builtin_name
-
-        Methods:
-            deactivate_current_config
-            save_all_changed_extensions
-            activate_config_changes
-            set_theme_type
-        """
-        theme_name = self.custom_name.get()
-        delmsg = 'Are you sure you wish to delete the theme %r ?'
-        if not tkMessageBox.askyesno(
-                'Delete Theme',  delmsg % theme_name, parent=self):
-            return
-        self.deactivate_current_config()
-        # Remove theme from changes, config, and file.
-        changes.delete_section('highlight', theme_name)
-        # Reload user theme list.
-        item_list = idleConf.GetSectionList('user', 'highlight')
-        item_list.sort()
-        if not item_list:
-            self.custom_theme_on['state'] = DISABLED
-            self.customlist.SetMenu(item_list, '- no custom themes -')
-        else:
-            self.customlist.SetMenu(item_list, item_list[0])
-        # Revert to default theme.
-        self.theme_source.set(idleConf.defaultCfg['main'].Get('Theme', 'default'))
-        self.builtin_name.set(idleConf.defaultCfg['main'].Get('Theme', 'name'))
-        # User can't back out of these changes, they must be applied now.
-        changes.save_all()
-        self.save_all_changed_extensions()
-        self.activate_config_changes()
-        self.set_theme_type()
-
     def deactivate_current_config(self):
         """Remove current key bindings.
 


From webhook-mailer at python.org  Sun Aug 20 11:35:39 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sun, 20 Aug 2017 15:35:39 -0000
Subject: [Python-checkins] bpo-28261: Fixed err msgs where PyArg_ParseTuple
 is used to parse normal tuples. (#3119)
Message-ID: <mailman.69.1503243341.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/1d1d3e9db882d78433f5bc8dbe7df929f4b6b5e1
commit: 1d1d3e9db882d78433f5bc8dbe7df929f4b6b5e1
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-20T18:35:36+03:00
summary:

bpo-28261: Fixed err msgs where PyArg_ParseTuple is used to parse normal tuples. (#3119)

files:
M Lib/test/test_audioop.py
M Lib/test/test_io.py
M Modules/_ctypes/_ctypes.c
M Modules/_io/textio.c
M Modules/audioop.c
M Modules/overlapped.c
M Modules/socketmodule.c
M Modules/timemodule.c

diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py
index 8f34d72427e..9baa62ad45c 100644
--- a/Lib/test/test_audioop.py
+++ b/Lib/test/test_audioop.py
@@ -405,6 +405,10 @@ def test_ratecv(self):
             self.assertEqual(audioop.ratecv(datas[w], w, 1, 8000, 8000, None, 30, 10)[0],
                              expected[w])
 
+        self.assertRaises(TypeError, audioop.ratecv, b'', 1, 1, 8000, 8000, 42)
+        self.assertRaises(TypeError, audioop.ratecv,
+                          b'', 1, 1, 8000, 8000, (1, (42,)))
+
     def test_reverse(self):
         for w in 1, 2, 3, 4:
             self.assertEqual(audioop.reverse(b'', w), b'')
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 83d6c4e57ec..ab0cbe16361 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -3472,6 +3472,7 @@ def test_newline_decoder(self):
         decoder = codecs.getincrementaldecoder("utf-8")()
         decoder = self.IncrementalNewlineDecoder(decoder, translate=True)
         self.check_newline_decoding_utf8(decoder)
+        self.assertRaises(TypeError, decoder.setstate, 42)
 
     def test_newline_bytes(self):
         # Issue 5433: Excessive optimization in IncrementalNewlineDecoder
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index fe39567374d..010658ebcd4 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -3262,7 +3262,9 @@ PyCFuncPtr_FromDll(PyTypeObject *type, PyObject *args, PyObject *kwds)
         /* Here ftuple is a borrowed reference */
         return NULL;
 
-    if (!PyArg_ParseTuple(ftuple, "O&O", _get_name, &name, &dll)) {
+    if (!PyArg_ParseTuple(ftuple, "O&O;illegal func_spec argument",
+                          _get_name, &name, &dll))
+    {
         Py_DECREF(ftuple);
         return NULL;
     }
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index b5d368a175c..57b66d66c33 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -562,8 +562,15 @@ _io_IncrementalNewlineDecoder_setstate(nldecoder_object *self,
     PyObject *buffer;
     unsigned long long flag;
 
-    if (!PyArg_ParseTuple(state, "OK", &buffer, &flag))
+    if (!PyTuple_Check(state)) {
+        PyErr_SetString(PyExc_TypeError, "state argument must be a tuple");
         return NULL;
+    }
+    if (!PyArg_ParseTuple(state, "OK;setstate(): illegal state argument",
+                          &buffer, &flag))
+    {
+        return NULL;
+    }
 
     self->pendingcr = (int) (flag & 1);
     flag >>= 1;
diff --git a/Modules/audioop.c b/Modules/audioop.c
index dcd7788d621..80c8a2a8e52 100644
--- a/Modules/audioop.c
+++ b/Modules/audioop.c
@@ -1293,7 +1293,7 @@ audioop_ratecv_impl(PyObject *module, Py_buffer *fragment, int width,
     char *cp, *ncp;
     Py_ssize_t len;
     int chan, d, *prev_i, *cur_i, cur_o;
-    PyObject *samps, *str, *rv = NULL;
+    PyObject *samps, *str, *rv = NULL, *channel;
     int bytes_per_frame;
 
     if (!audioop_check_size(width))
@@ -1354,8 +1354,12 @@ audioop_ratecv_impl(PyObject *module, Py_buffer *fragment, int width,
             prev_i[chan] = cur_i[chan] = 0;
     }
     else {
+        if (!PyTuple_Check(state)) {
+            PyErr_SetString(PyExc_TypeError, "state must be a tuple or None");
+            goto exit;
+        }
         if (!PyArg_ParseTuple(state,
-                        "iO!;audioop.ratecv: illegal state argument",
+                        "iO!;ratecv(): illegal state argument",
                         &d, &PyTuple_Type, &samps))
             goto exit;
         if (PyTuple_Size(samps) != nchannels) {
@@ -1364,10 +1368,18 @@ audioop_ratecv_impl(PyObject *module, Py_buffer *fragment, int width,
             goto exit;
         }
         for (chan = 0; chan < nchannels; chan++) {
-            if (!PyArg_ParseTuple(PyTuple_GetItem(samps, chan),
-                                  "ii:ratecv", &prev_i[chan],
-                                               &cur_i[chan]))
+            channel = PyTuple_GetItem(samps, chan);
+            if (!PyTuple_Check(channel)) {
+                PyErr_SetString(PyExc_TypeError,
+                                "ratecv(): illegal state argument");
                 goto exit;
+            }
+            if (!PyArg_ParseTuple(channel,
+                                  "ii;ratecv(): illegal state argument",
+                                  &prev_i[chan], &cur_i[chan]))
+            {
+                goto exit;
+            }
         }
     }
 
@@ -1638,7 +1650,9 @@ audioop_lin2adpcm_impl(PyObject *module, Py_buffer *fragment, int width,
         PyErr_SetString(PyExc_TypeError, "state must be a tuple or None");
         return NULL;
     }
-    else if (!PyArg_ParseTuple(state, "ii", &valpred, &index)) {
+    else if (!PyArg_ParseTuple(state, "ii;lin2adpcm(): illegal state argument",
+                               &valpred, &index))
+    {
         return NULL;
     }
     else if (valpred >= 0x8000 || valpred < -0x8000 ||
@@ -1766,7 +1780,9 @@ audioop_adpcm2lin_impl(PyObject *module, Py_buffer *fragment, int width,
         PyErr_SetString(PyExc_TypeError, "state must be a tuple or None");
         return NULL;
     }
-    else if (!PyArg_ParseTuple(state, "ii", &valpred, &index)) {
+    else if (!PyArg_ParseTuple(state, "ii;adpcm2lin(): illegal state argument",
+                               &valpred, &index))
+    {
         return NULL;
     }
     else if (valpred >= 0x8000 || valpred < -0x8000 ||
diff --git a/Modules/overlapped.c b/Modules/overlapped.c
index 4390e9ae93c..6099d46643f 100644
--- a/Modules/overlapped.c
+++ b/Modules/overlapped.c
@@ -990,7 +990,9 @@ parse_address(PyObject *obj, SOCKADDR *Address, int Length)
         ((SOCKADDR_IN*)Address)->sin_port = htons(Port);
         return Length;
     }
-    else if (PyArg_ParseTuple(obj, "uHkk", &Host, &Port, &FlowInfo, &ScopeId))
+    else if (PyArg_ParseTuple(obj,
+                              "uHkk;ConnectEx(): illegal address_as_bytes "
+                              "argument", &Host, &Port, &FlowInfo, &ScopeId))
     {
         PyErr_Clear();
         Address->sa_family = AF_INET6;
@@ -1024,8 +1026,11 @@ Overlapped_ConnectEx(OverlappedObject *self, PyObject *args)
     BOOL ret;
     DWORD err;
 
-    if (!PyArg_ParseTuple(args, F_HANDLE "O", &ConnectSocket, &AddressObj))
+    if (!PyArg_ParseTuple(args, F_HANDLE "O!:ConnectEx",
+                          &ConnectSocket, &PyTuple_Type, &AddressObj))
+    {
         return NULL;
+    }
 
     if (self->type != TYPE_NONE) {
         PyErr_SetString(PyExc_ValueError, "operation already attempted");
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index e18dd32d900..bf8d19fe2f4 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -5972,12 +5972,14 @@ socket_getnameinfo(PyObject *self, PyObject *args)
                         "getnameinfo() argument 1 must be a tuple");
         return NULL;
     }
-    if (!PyArg_ParseTuple(sa, "si|II",
+    if (!PyArg_ParseTuple(sa, "si|II;getnameinfo(): illegal sockaddr argument",
                           &hostp, &port, &flowinfo, &scope_id))
+    {
         return NULL;
+    }
     if (flowinfo > 0xfffff) {
         PyErr_SetString(PyExc_OverflowError,
-                        "getsockaddrarg: flowinfo must be 0-1048575.");
+                        "getnameinfo(): flowinfo must be 0-1048575.");
         return NULL;
     }
     PyOS_snprintf(pbuf, sizeof(pbuf), "%d", port);
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 15c467b9b40..36a95bbcedd 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -415,7 +415,7 @@ When 'seconds' is not passed in, convert the current time instead.");
  * an exception and return 0 on error.
  */
 static int
-gettmarg(PyObject *args, struct tm *p)
+gettmarg(PyObject *args, struct tm *p, const char *format)
 {
     int y;
 
@@ -427,7 +427,7 @@ gettmarg(PyObject *args, struct tm *p)
         return 0;
     }
 
-    if (!PyArg_ParseTuple(args, "iiiiiiiii",
+    if (!PyArg_ParseTuple(args, format,
                           &y, &p->tm_mon, &p->tm_mday,
                           &p->tm_hour, &p->tm_min, &p->tm_sec,
                           &p->tm_wday, &p->tm_yday, &p->tm_isdst))
@@ -586,8 +586,12 @@ time_strftime(PyObject *self, PyObject *args)
         if (_PyTime_localtime(tt, &buf) != 0)
             return NULL;
     }
-    else if (!gettmarg(tup, &buf) || !checktm(&buf))
+    else if (!gettmarg(tup, &buf,
+                       "iiiiiiiii;strftime(): illegal time tuple argument") ||
+             !checktm(&buf))
+    {
         return NULL;
+    }
 
 #if defined(_MSC_VER) || defined(sun) || defined(_AIX)
     if (buf.tm_year + 1900 < 1 || 9999 < buf.tm_year + 1900) {
@@ -776,9 +780,13 @@ time_asctime(PyObject *self, PyObject *args)
         time_t tt = time(NULL);
         if (_PyTime_localtime(tt, &buf) != 0)
             return NULL;
-
-    } else if (!gettmarg(tup, &buf) || !checktm(&buf))
+    }
+    else if (!gettmarg(tup, &buf,
+                       "iiiiiiiii;asctime(): illegal time tuple argument") ||
+             !checktm(&buf))
+    {
         return NULL;
+    }
     return _asctime(&buf);
 }
 
@@ -814,8 +822,11 @@ time_mktime(PyObject *self, PyObject *tup)
 {
     struct tm buf;
     time_t tt;
-    if (!gettmarg(tup, &buf))
+    if (!gettmarg(tup, &buf,
+                  "iiiiiiiii;mktime(): illegal time tuple argument"))
+    {
         return NULL;
+    }
 #ifdef _AIX
     /* year < 1902 or year > 2037 */
     if (buf.tm_year < 2 || buf.tm_year > 137) {


From webhook-mailer at python.org  Sun Aug 20 18:45:50 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Sun, 20 Aug 2017 22:45:50 -0000
Subject: [Python-checkins] bpo-9566 & bpo-30747: Silence warnings from
 pyatomic.h macros (#3140)
Message-ID: <mailman.70.1503269153.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/0267128aa4dc7c383c341c19833c5d506eae9c93
commit: 0267128aa4dc7c383c341c19833c5d506eae9c93
branch: master
author: Segev Finer <segev208 at gmail.com>
committer: Antoine Pitrou <pitrou at free.fr>
date: 2017-08-21T00:45:46+02:00
summary:

bpo-9566 & bpo-30747: Silence warnings from pyatomic.h macros (#3140)

* bpo-9566: Silence warnings from pyatomic.h macros

Apparently MSVC is too stupid to understand that the alternate branch is
not taken and emits a warning for it.

Warnings added in https://github.com/python/cpython/pull/2383

* bpo-9566: A better fix for the pyatomic.h warning

* bpo-9566: Remove a slash

files:
M Include/pyatomic.h

diff --git a/Include/pyatomic.h b/Include/pyatomic.h
index 832d951f843..4cbc529c0d1 100644
--- a/Include/pyatomic.h
+++ b/Include/pyatomic.h
@@ -352,14 +352,14 @@ inline int _Py_atomic_load_32bit(volatile int* value, int order) {
 
 #define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
   if (sizeof(*ATOMIC_VAL._value) == 8) { \
-    _Py_atomic_store_64bit(ATOMIC_VAL._value, NEW_VAL, ORDER) } else { \
-    _Py_atomic_store_32bit(ATOMIC_VAL._value, NEW_VAL, ORDER) } 
+    _Py_atomic_store_64bit((volatile long long*)ATOMIC_VAL._value, NEW_VAL, ORDER) } else { \
+    _Py_atomic_store_32bit((volatile long*)ATOMIC_VAL._value, NEW_VAL, ORDER) }
 
 #define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
   ( \
     sizeof(*(ATOMIC_VAL._value)) == 8 ? \
-    _Py_atomic_load_64bit(ATOMIC_VAL._value, ORDER) : \
-    _Py_atomic_load_32bit(ATOMIC_VAL._value, ORDER) \
+    _Py_atomic_load_64bit((volatile long long*)ATOMIC_VAL._value, ORDER) : \
+    _Py_atomic_load_32bit((volatile long*)ATOMIC_VAL._value, ORDER) \
   )
 #elif defined(_M_ARM) || defined(_M_ARM64)
 typedef enum _Py_memory_order {


From webhook-mailer at python.org  Sun Aug 20 19:21:54 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 20 Aug 2017 23:21:54 -0000
Subject: [Python-checkins] [3.6] bpo-31206: IDLE: Factor HighPage class from
 ConfigDialog (GH-3160) (#3162)
Message-ID: <mailman.71.1503271317.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/24c0c5b48cb996c3ec1800640edff2bfecc36275
commit: 24c0c5b48cb996c3ec1800640edff2bfecc36275
branch: 3.6
author: Cheryl Sabella <cheryl.sabella at gmail.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-08-20T19:21:51-04:00
summary:

[3.6] bpo-31206: IDLE: Factor HighPage class from ConfigDialog (GH-3160) (#3162)

Part 3 of 3.  Remove old highlight functions and load_config as this functionality is now contained within classes. Patch by Cheryl Sabella.
(cherry picked from commit 4bfebc63012f0f4e00f6a98c3d96e1c0ebe93408)

files:
M Lib/idlelib/configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index a9863023a76..81ea8afbbcd 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -114,25 +114,6 @@ def create_widgets(self):
         note.pack(side=TOP, expand=TRUE, fill=BOTH)
         self.create_action_buttons().pack(side=BOTTOM)
 
-    def load_configs(self):
-        """Load configuration for each page.
-
-        Load configuration from default and user config files and populate
-        the widgets on the config dialog pages.
-
-        Methods:
-            load_font_cfg
-            load_tab_cfg
-            load_theme_cfg
-            load_key_cfg
-            load_general_cfg
-        """
-        #self.load_font_cfg()
-        #self.load_tab_cfg()
-        # self.load_theme_cfg()
-        # self.load_key_cfg()
-        # self.load_general_cfg()
-        # note: extension page handled separately
     def create_action_buttons(self):
         """Return frame of action buttons for dialog.
 
@@ -215,644 +196,6 @@ def help(self):
         view_text(self, title='Help for IDLE preferences',
                  text=help_common+help_pages.get(page, ''))
 
-
-    def create_page_highlight(self):
-        """Return frame of widgets for Highlighting tab.
-
-        Enable users to provisionally change foreground and background
-        colors applied to textual tags.  Color mappings are stored in
-        complete listings called themes.  Built-in themes in
-        idlelib/config-highlight.def are fixed as far as the dialog is
-        concerned. Any theme can be used as the base for a new custom
-        theme, stored in .idlerc/config-highlight.cfg.
-
-        Function load_theme_cfg() initializes tk variables and theme
-        lists and calls paint_theme_sample() and set_highlight_target()
-        for the current theme.  Radiobuttons builtin_theme_on and
-        custom_theme_on toggle var theme_source, which controls if the
-        current set of colors are from a builtin or custom theme.
-        DynOptionMenus builtinlist and customlist contain lists of the
-        builtin and custom themes, respectively, and the current item
-        from each list is stored in vars builtin_name and custom_name.
-
-        Function paint_theme_sample() applies the colors from the theme
-        to the tags in text widget highlight_sample and then invokes
-        set_color_sample().  Function set_highlight_target() sets the state
-        of the radiobuttons fg_on and bg_on based on the tag and it also
-        invokes set_color_sample().
-
-        Function set_color_sample() sets the background color for the frame
-        holding the color selector.  This provides a larger visual of the
-        color for the current tag and plane (foreground/background).
-
-        Note: set_color_sample() is called from many places and is often
-        called more than once when a change is made.  It is invoked when
-        foreground or background is selected (radiobuttons), from
-        paint_theme_sample() (theme is changed or load_cfg is called), and
-        from set_highlight_target() (target tag is changed or load_cfg called).
-
-        Button delete_custom invokes delete_custom() to delete
-        a custom theme from idleConf.userCfg['highlight'] and changes.
-        Button save_custom invokes save_as_new_theme() which calls
-        get_new_theme_name() and create_new() to save a custom theme
-        and its colors to idleConf.userCfg['highlight'].
-
-        Radiobuttons fg_on and bg_on toggle var fg_bg_toggle to control
-        if the current selected color for a tag is for the foreground or
-        background.
-
-        DynOptionMenu targetlist contains a readable description of the
-        tags applied to Python source within IDLE.  Selecting one of the
-        tags from this list populates highlight_target, which has a callback
-        function set_highlight_target().
-
-        Text widget highlight_sample displays a block of text (which is
-        mock Python code) in which is embedded the defined tags and reflects
-        the color attributes of the current theme and changes for those tags.
-        Mouse button 1 allows for selection of a tag and updates
-        highlight_target with that tag value.
-
-        Note: The font in highlight_sample is set through the config in
-        the fonts tab.
-
-        In other words, a tag can be selected either from targetlist or
-        by clicking on the sample text within highlight_sample.  The
-        plane (foreground/background) is selected via the radiobutton.
-        Together, these two (tag and plane) control what color is
-        shown in set_color_sample() for the current theme.  Button set_color
-        invokes get_color() which displays a ColorChooser to change the
-        color for the selected tag/plane.  If a new color is picked,
-        it will be saved to changes and the highlight_sample and
-        frame background will be updated.
-
-        Tk Variables:
-            color: Color of selected target.
-            builtin_name: Menu variable for built-in theme.
-            custom_name: Menu variable for custom theme.
-            fg_bg_toggle: Toggle for foreground/background color.
-                Note: this has no callback.
-            theme_source: Selector for built-in or custom theme.
-            highlight_target: Menu variable for the highlight tag target.
-
-        Instance Data Attributes:
-            theme_elements: Dictionary of tags for text highlighting.
-                The key is the display name and the value is a tuple of
-                (tag name, display sort order).
-
-        Methods [attachment]:
-            load_theme_cfg: Load current highlight colors.
-            get_color: Invoke colorchooser [button_set_color].
-            set_color_sample_binding: Call set_color_sample [fg_bg_toggle].
-            set_highlight_target: set fg_bg_toggle, set_color_sample().
-            set_color_sample: Set frame background to target.
-            on_new_color_set: Set new color and add option.
-            paint_theme_sample: Recolor sample.
-            get_new_theme_name: Get from popup.
-            create_new: Combine theme with changes and save.
-            save_as_new_theme: Save [button_save_custom].
-            set_theme_type: Command for [theme_source].
-            delete_custom: Activate default [button_delete_custom].
-            save_new: Save to userCfg['theme'] (is function).
-
-        Widgets of highlights page frame:  (*) widgets bound to self
-            frame_custom: LabelFrame
-                (*)highlight_sample: Text
-                (*)frame_color_set: Frame
-                    (*)button_set_color: Button
-                    (*)targetlist: DynOptionMenu - highlight_target
-                frame_fg_bg_toggle: Frame
-                    (*)fg_on: Radiobutton - fg_bg_toggle
-                    (*)bg_on: Radiobutton - fg_bg_toggle
-                (*)button_save_custom: Button
-            frame_theme: LabelFrame
-                theme_type_title: Label
-                (*)builtin_theme_on: Radiobutton - theme_source
-                (*)custom_theme_on: Radiobutton - theme_source
-                (*)builtinlist: DynOptionMenu - builtin_name
-                (*)customlist: DynOptionMenu - custom_name
-                (*)button_delete_custom: Button
-                (*)theme_message: Label
-        """
-        self.theme_elements={
-            'Normal Text': ('normal', '00'),
-            'Python Keywords': ('keyword', '01'),
-            'Python Definitions': ('definition', '02'),
-            'Python Builtins': ('builtin', '03'),
-            'Python Comments': ('comment', '04'),
-            'Python Strings': ('string', '05'),
-            'Selected Text': ('hilite', '06'),
-            'Found Text': ('hit', '07'),
-            'Cursor': ('cursor', '08'),
-            'Editor Breakpoint': ('break', '09'),
-            'Shell Normal Text': ('console', '10'),
-            'Shell Error Text': ('error', '11'),
-            'Shell Stdout Text': ('stdout', '12'),
-            'Shell Stderr Text': ('stderr', '13'),
-            }
-        parent = self.parent
-        self.builtin_name = tracers.add(
-                StringVar(parent), self.var_changed_builtin_name)
-        self.custom_name = tracers.add(
-                StringVar(parent), self.var_changed_custom_name)
-        self.fg_bg_toggle = BooleanVar(parent)
-        self.color = tracers.add(
-                StringVar(parent), self.var_changed_color)
-        self.theme_source = tracers.add(
-                BooleanVar(parent), self.var_changed_theme_source)
-        self.highlight_target = tracers.add(
-                StringVar(parent), self.var_changed_highlight_target)
-
-        # Create widgets:
-        # body frame and section frames.
-        frame = Frame(self.note)
-        frame_custom = LabelFrame(frame, borderwidth=2, relief=GROOVE,
-                                 text=' Custom Highlighting ')
-        frame_theme = LabelFrame(frame, borderwidth=2, relief=GROOVE,
-                                text=' Highlighting Theme ')
-        # frame_custom.
-        text = self.highlight_sample = frame.highlight_sample = Text(
-                frame_custom, relief=SOLID, borderwidth=1,
-                font=('courier', 12, ''), cursor='hand2', width=21, height=13,
-                takefocus=FALSE, highlightthickness=0, wrap=NONE)
-        text.bind('<Double-Button-1>', lambda e: 'break')
-        text.bind('<B1-Motion>', lambda e: 'break')
-        text_and_tags=(('\n', 'normal'),
-            ('#you can click here', 'comment'), ('\n', 'normal'),
-            ('#to choose items', 'comment'), ('\n', 'normal'),
-            ('def', 'keyword'), (' ', 'normal'),
-            ('func', 'definition'), ('(param):\n  ', 'normal'),
-            ('"""string"""', 'string'), ('\n  var0 = ', 'normal'),
-            ("'string'", 'string'), ('\n  var1 = ', 'normal'),
-            ("'selected'", 'hilite'), ('\n  var2 = ', 'normal'),
-            ("'found'", 'hit'), ('\n  var3 = ', 'normal'),
-            ('list', 'builtin'), ('(', 'normal'),
-            ('None', 'keyword'), (')\n', 'normal'),
-            ('  breakpoint("line")', 'break'), ('\n\n', 'normal'),
-            (' error ', 'error'), (' ', 'normal'),
-            ('cursor |', 'cursor'), ('\n ', 'normal'),
-            ('shell', 'console'), (' ', 'normal'),
-            ('stdout', 'stdout'), (' ', 'normal'),
-            ('stderr', 'stderr'), ('\n\n', 'normal'))
-        for texttag in text_and_tags:
-            text.insert(END, texttag[0], texttag[1])
-        for element in self.theme_elements:
-            def tem(event, elem=element):
-                event.widget.winfo_toplevel().highlight_target.set(elem)
-            text.tag_bind(
-                    self.theme_elements[element][0], '<ButtonPress-1>', tem)
-        text['state'] = DISABLED
-        self.frame_color_set = Frame(frame_custom, relief=SOLID, borderwidth=1)
-        frame_fg_bg_toggle = Frame(frame_custom)
-        self.button_set_color = Button(
-                self.frame_color_set, text='Choose Color for :',
-                command=self.get_color, highlightthickness=0)
-        self.targetlist = DynOptionMenu(
-                self.frame_color_set, self.highlight_target, None,
-                highlightthickness=0) #, command=self.set_highlight_targetBinding
-        self.fg_on = Radiobutton(
-                frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=1,
-                text='Foreground', command=self.set_color_sample_binding)
-        self.bg_on = Radiobutton(
-                frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=0,
-                text='Background', command=self.set_color_sample_binding)
-        self.fg_bg_toggle.set(1)
-        self.button_save_custom = Button(
-                frame_custom, text='Save as New Custom Theme',
-                command=self.save_as_new_theme)
-        # frame_theme.
-        theme_type_title = Label(frame_theme, text='Select : ')
-        self.builtin_theme_on = Radiobutton(
-                frame_theme, variable=self.theme_source, value=1,
-                command=self.set_theme_type, text='a Built-in Theme')
-        self.custom_theme_on = Radiobutton(
-                frame_theme, variable=self.theme_source, value=0,
-                command=self.set_theme_type, text='a Custom Theme')
-        self.builtinlist = DynOptionMenu(
-                frame_theme, self.builtin_name, None, command=None)
-        self.customlist = DynOptionMenu(
-                frame_theme, self.custom_name, None, command=None)
-        self.button_delete_custom = Button(
-                frame_theme, text='Delete Custom Theme',
-                command=self.delete_custom)
-        self.theme_message = Label(frame_theme, bd=2)
-
-        # Pack widgets:
-        # body.
-        frame_custom.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
-        frame_theme.pack(side=LEFT, padx=5, pady=5, fill=Y)
-        # frame_custom.
-        self.frame_color_set.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=X)
-        frame_fg_bg_toggle.pack(side=TOP, padx=5, pady=0)
-        self.highlight_sample.pack(
-                side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
-        self.button_set_color.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=4)
-        self.targetlist.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=3)
-        self.fg_on.pack(side=LEFT, anchor=E)
-        self.bg_on.pack(side=RIGHT, anchor=W)
-        self.button_save_custom.pack(side=BOTTOM, fill=X, padx=5, pady=5)
-        # frame_theme.
-        theme_type_title.pack(side=TOP, anchor=W, padx=5, pady=5)
-        self.builtin_theme_on.pack(side=TOP, anchor=W, padx=5)
-        self.custom_theme_on.pack(side=TOP, anchor=W, padx=5, pady=2)
-        self.builtinlist.pack(side=TOP, fill=X, padx=5, pady=5)
-        self.customlist.pack(side=TOP, fill=X, anchor=W, padx=5, pady=5)
-        self.button_delete_custom.pack(side=TOP, fill=X, padx=5, pady=5)
-        self.theme_message.pack(side=TOP, fill=X, pady=5)
-        return frame
-
-    def load_theme_cfg(self):
-        """Load current configuration settings for the theme options.
-
-        Based on the theme_source toggle, the theme is set as
-        either builtin or custom and the initial widget values
-        reflect the current settings from idleConf.
-
-        Attributes updated:
-            theme_source: Set from idleConf.
-            builtinlist: List of default themes from idleConf.
-            customlist: List of custom themes from idleConf.
-            custom_theme_on: Disabled if there are no custom themes.
-            custom_theme: Message with additional information.
-            targetlist: Create menu from self.theme_elements.
-
-        Methods:
-            set_theme_type
-            paint_theme_sample
-            set_highlight_target
-        """
-        # Set current theme type radiobutton.
-        self.theme_source.set(idleConf.GetOption(
-                'main', 'Theme', 'default', type='bool', default=1))
-        # Set current theme.
-        current_option = idleConf.CurrentTheme()
-        # Load available theme option menus.
-        if self.theme_source.get():  # Default theme selected.
-            item_list = idleConf.GetSectionList('default', 'highlight')
-            item_list.sort()
-            self.builtinlist.SetMenu(item_list, current_option)
-            item_list = idleConf.GetSectionList('user', 'highlight')
-            item_list.sort()
-            if not item_list:
-                self.custom_theme_on['state'] = DISABLED
-                self.custom_name.set('- no custom themes -')
-            else:
-                self.customlist.SetMenu(item_list, item_list[0])
-        else:  # User theme selected.
-            item_list = idleConf.GetSectionList('user', 'highlight')
-            item_list.sort()
-            self.customlist.SetMenu(item_list, current_option)
-            item_list = idleConf.GetSectionList('default', 'highlight')
-            item_list.sort()
-            self.builtinlist.SetMenu(item_list, item_list[0])
-        self.set_theme_type()
-        # Load theme element option menu.
-        theme_names = list(self.theme_elements.keys())
-        theme_names.sort(key=lambda x: self.theme_elements[x][1])
-        self.targetlist.SetMenu(theme_names, theme_names[0])
-        self.paint_theme_sample()
-        self.set_highlight_target()
-
-    def var_changed_builtin_name(self, *params):
-        """Process new builtin theme selection.
-
-        Add the changed theme's name to the changed_items and recreate
-        the sample with the values from the selected theme.
-        """
-        old_themes = ('IDLE Classic', 'IDLE New')
-        value = self.builtin_name.get()
-        if value not in old_themes:
-            if idleConf.GetOption('main', 'Theme', 'name') not in old_themes:
-                changes.add_option('main', 'Theme', 'name', old_themes[0])
-            changes.add_option('main', 'Theme', 'name2', value)
-            self.theme_message['text'] = 'New theme, see Help'
-            self.theme_message['fg'] = '#500000'
-        else:
-            changes.add_option('main', 'Theme', 'name', value)
-            changes.add_option('main', 'Theme', 'name2', '')
-            self.theme_message['text'] = ''
-            self.theme_message['fg'] = 'black'
-        self.paint_theme_sample()
-
-    def var_changed_custom_name(self, *params):
-        """Process new custom theme selection.
-
-        If a new custom theme is selected, add the name to the
-        changed_items and apply the theme to the sample.
-        """
-        value = self.custom_name.get()
-        if value != '- no custom themes -':
-            changes.add_option('main', 'Theme', 'name', value)
-            self.paint_theme_sample()
-
-    def var_changed_theme_source(self, *params):
-        """Process toggle between builtin and custom theme.
-
-        Update the default toggle value and apply the newly
-        selected theme type.
-        """
-        value = self.theme_source.get()
-        changes.add_option('main', 'Theme', 'default', value)
-        if value:
-            self.var_changed_builtin_name()
-        else:
-            self.var_changed_custom_name()
-
-    def var_changed_color(self, *params):
-        "Process change to color choice."
-        self.on_new_color_set()
-
-    def var_changed_highlight_target(self, *params):
-        "Process selection of new target tag for highlighting."
-        self.set_highlight_target()
-
-    def set_theme_type(self):
-        """Set available screen options based on builtin or custom theme.
-
-        Attributes accessed:
-            theme_source
-
-        Attributes updated:
-            builtinlist
-            customlist
-            button_delete_custom
-            custom_theme_on
-
-        Called from:
-            handler for builtin_theme_on and custom_theme_on
-            delete_custom
-            create_new
-            load_theme_cfg
-        """
-        if self.theme_source.get():
-            self.builtinlist['state'] = NORMAL
-            self.customlist['state'] = DISABLED
-            self.button_delete_custom['state'] = DISABLED
-        else:
-            self.builtinlist['state'] = DISABLED
-            self.custom_theme_on['state'] = NORMAL
-            self.customlist['state'] = NORMAL
-            self.button_delete_custom['state'] = NORMAL
-
-    def get_color(self):
-        """Handle button to select a new color for the target tag.
-
-        If a new color is selected while using a builtin theme, a
-        name must be supplied to create a custom theme.
-
-        Attributes accessed:
-            highlight_target
-            frame_color_set
-            theme_source
-
-        Attributes updated:
-            color
-
-        Methods:
-            get_new_theme_name
-            create_new
-        """
-        target = self.highlight_target.get()
-        prev_color = self.frame_color_set.cget('bg')
-        rgbTuplet, color_string = tkColorChooser.askcolor(
-                parent=self, title='Pick new color for : '+target,
-                initialcolor=prev_color)
-        if color_string and (color_string != prev_color):
-            # User didn't cancel and they chose a new color.
-            if self.theme_source.get():  # Current theme is a built-in.
-                message = ('Your changes will be saved as a new Custom Theme. '
-                           'Enter a name for your new Custom Theme below.')
-                new_theme = self.get_new_theme_name(message)
-                if not new_theme:  # User cancelled custom theme creation.
-                    return
-                else:  # Create new custom theme based on previously active theme.
-                    self.create_new(new_theme)
-                    self.color.set(color_string)
-            else:  # Current theme is user defined.
-                self.color.set(color_string)
-
-    def on_new_color_set(self):
-        "Display sample of new color selection on the dialog."
-        new_color = self.color.get()
-        self.frame_color_set['bg'] = new_color  # Set sample.
-        plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
-        sample_element = self.theme_elements[self.highlight_target.get()][0]
-        self.highlight_sample.tag_config(sample_element, **{plane: new_color})
-        theme = self.custom_name.get()
-        theme_element = sample_element + '-' + plane
-        changes.add_option('highlight', theme, theme_element, new_color)
-
-    def get_new_theme_name(self, message):
-        "Return name of new theme from query popup."
-        used_names = (idleConf.GetSectionList('user', 'highlight') +
-                idleConf.GetSectionList('default', 'highlight'))
-        new_theme = SectionName(
-                self, 'New Custom Theme', message, used_names).result
-        return new_theme
-
-    def save_as_new_theme(self):
-        """Prompt for new theme name and create the theme.
-
-        Methods:
-            get_new_theme_name
-            create_new
-        """
-        new_theme_name = self.get_new_theme_name('New Theme Name:')
-        if new_theme_name:
-            self.create_new(new_theme_name)
-
-    def create_new(self, new_theme_name):
-        """Create a new custom theme with the given name.
-
-        Create the new theme based on the previously active theme
-        with the current changes applied.  Once it is saved, then
-        activate the new theme.
-
-        Attributes accessed:
-            builtin_name
-            custom_name
-
-        Attributes updated:
-            customlist
-            theme_source
-
-        Method:
-            save_new
-            set_theme_type
-        """
-        if self.theme_source.get():
-            theme_type = 'default'
-            theme_name = self.builtin_name.get()
-        else:
-            theme_type = 'user'
-            theme_name = self.custom_name.get()
-        new_theme = idleConf.GetThemeDict(theme_type, theme_name)
-        # Apply any of the old theme's unsaved changes to the new theme.
-        if theme_name in changes['highlight']:
-            theme_changes = changes['highlight'][theme_name]
-            for element in theme_changes:
-                new_theme[element] = theme_changes[element]
-        # Save the new theme.
-        self.save_new(new_theme_name, new_theme)
-        # Change GUI over to the new theme.
-        custom_theme_list = idleConf.GetSectionList('user', 'highlight')
-        custom_theme_list.sort()
-        self.customlist.SetMenu(custom_theme_list, new_theme_name)
-        self.theme_source.set(0)
-        self.set_theme_type()
-
-    def set_highlight_target(self):
-        """Set fg/bg toggle and color based on highlight tag target.
-
-        Instance variables accessed:
-            highlight_target
-
-        Attributes updated:
-            fg_on
-            bg_on
-            fg_bg_toggle
-
-        Methods:
-            set_color_sample
-
-        Called from:
-            var_changed_highlight_target
-            load_theme_cfg
-        """
-        if self.highlight_target.get() == 'Cursor':  # bg not possible
-            self.fg_on['state'] = DISABLED
-            self.bg_on['state'] = DISABLED
-            self.fg_bg_toggle.set(1)
-        else:  # Both fg and bg can be set.
-            self.fg_on['state'] = NORMAL
-            self.bg_on['state'] = NORMAL
-            self.fg_bg_toggle.set(1)
-        self.set_color_sample()
-
-    def set_color_sample_binding(self, *args):
-        """Change color sample based on foreground/background toggle.
-
-        Methods:
-            set_color_sample
-        """
-        self.set_color_sample()
-
-    def set_color_sample(self):
-        """Set the color of the frame background to reflect the selected target.
-
-        Instance variables accessed:
-            theme_elements
-            highlight_target
-            fg_bg_toggle
-            highlight_sample
-
-        Attributes updated:
-            frame_color_set
-        """
-        # Set the color sample area.
-        tag = self.theme_elements[self.highlight_target.get()][0]
-        plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
-        color = self.highlight_sample.tag_cget(tag, plane)
-        self.frame_color_set['bg'] = color
-
-    def paint_theme_sample(self):
-        """Apply the theme colors to each element tag in the sample text.
-
-        Instance attributes accessed:
-            theme_elements
-            theme_source
-            builtin_name
-            custom_name
-
-        Attributes updated:
-            highlight_sample: Set the tag elements to the theme.
-
-        Methods:
-            set_color_sample
-
-        Called from:
-            var_changed_builtin_name
-            var_changed_custom_name
-            load_theme_cfg
-        """
-        if self.theme_source.get():  # Default theme
-            theme = self.builtin_name.get()
-        else:  # User theme
-            theme = self.custom_name.get()
-        for element_title in self.theme_elements:
-            element = self.theme_elements[element_title][0]
-            colors = idleConf.GetHighlight(theme, element)
-            if element == 'cursor':  # Cursor sample needs special painting.
-                colors['background'] = idleConf.GetHighlight(
-                        theme, 'normal', fgBg='bg')
-            # Handle any unsaved changes to this theme.
-            if theme in changes['highlight']:
-                theme_dict = changes['highlight'][theme]
-                if element + '-foreground' in theme_dict:
-                    colors['foreground'] = theme_dict[element + '-foreground']
-                if element + '-background' in theme_dict:
-                    colors['background'] = theme_dict[element + '-background']
-            self.highlight_sample.tag_config(element, **colors)
-        self.set_color_sample()
-
-    def save_new(self, theme_name, theme):
-        """Save a newly created theme to idleConf.
-
-        theme_name - string, the name of the new theme
-        theme - dictionary containing the new theme
-        """
-        if not idleConf.userCfg['highlight'].has_section(theme_name):
-            idleConf.userCfg['highlight'].add_section(theme_name)
-        for element in theme:
-            value = theme[element]
-            idleConf.userCfg['highlight'].SetOption(theme_name, element, value)
-
-    def delete_custom(self):
-        """Handle event to delete custom theme.
-
-        The current theme is deactivated and the default theme is
-        activated.  The custom theme is permanently removed from
-        the config file.
-
-        Attributes accessed:
-            custom_name
-
-        Attributes updated:
-            custom_theme_on
-            customlist
-            theme_source
-            builtin_name
-
-        Methods:
-            deactivate_current_config
-            save_all_changed_extensions
-            activate_config_changes
-            set_theme_type
-        """
-        theme_name = self.custom_name.get()
-        delmsg = 'Are you sure you wish to delete the theme %r ?'
-        if not tkMessageBox.askyesno(
-                'Delete Theme',  delmsg % theme_name, parent=self):
-            return
-        self.deactivate_current_config()
-        # Remove theme from changes, config, and file.
-        changes.delete_section('highlight', theme_name)
-        # Reload user theme list.
-        item_list = idleConf.GetSectionList('user', 'highlight')
-        item_list.sort()
-        if not item_list:
-            self.custom_theme_on['state'] = DISABLED
-            self.customlist.SetMenu(item_list, '- no custom themes -')
-        else:
-            self.customlist.SetMenu(item_list, item_list[0])
-        # Revert to default theme.
-        self.theme_source.set(idleConf.defaultCfg['main'].Get('Theme', 'default'))
-        self.builtin_name.set(idleConf.defaultCfg['main'].Get('Theme', 'name'))
-        # User can't back out of these changes, they must be applied now.
-        changes.save_all()
-        self.save_all_changed_extensions()
-        self.activate_config_changes()
-        self.set_theme_type()
-
     def deactivate_current_config(self):
         """Remove current key bindings.
 


From solipsis at pitrou.net  Mon Aug 21 05:06:09 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 21 Aug 2017 09:06:09 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=4
Message-ID: <20170821090608.123870.3051FAA636CB5A10@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_spawn leaked [0, -2, 2] memory blocks, sum=0


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflog_k_z1s', '--timeout', '7200']

From webhook-mailer at python.org  Mon Aug 21 07:10:03 2017
From: webhook-mailer at python.org (Stefan Krah)
Date: Mon, 21 Aug 2017 11:10:03 -0000
Subject: [Python-checkins] bpo-30923: Silence fall-through warnings included
 in -Wextra since gcc-7.0. (#3157)
Message-ID: <mailman.72.1503313805.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/f432a3234f9f2ee09bd40be03e06bf72865ee375
commit: f432a3234f9f2ee09bd40be03e06bf72865ee375
branch: master
author: Stefan Krah <skrah at bytereef.org>
committer: GitHub <noreply at github.com>
date: 2017-08-21T13:09:59+02:00
summary:

bpo-30923: Silence fall-through warnings included in -Wextra since gcc-7.0. (#3157)

files:
M Modules/_ctypes/_ctypes.c
M Objects/call.c
M Objects/stringlib/codecs.h
M Objects/unicodeobject.c
M Python/ast.c
M Python/ceval.c
M Python/compile.c
M Python/dtoa.c
M Python/formatter_unicode.c
M Python/getargs.c
M Python/marshal.c
M Python/pyhash.c
M Python/wordcode_helpers.h

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 010658ebcd4..0bcfc13ad02 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -3616,7 +3616,7 @@ _build_callargs(PyCFuncPtrObject *self, PyObject *argtypes,
         case (PARAMFLAG_FIN | PARAMFLAG_FOUT):
             *pinoutmask |= (1 << i); /* mark as inout arg */
             (*pnumretvals)++;
-            /* fall through to PARAMFLAG_FIN... */
+            /* fall through */
         case 0:
         case PARAMFLAG_FIN:
             /* 'in' parameter.  Copy it from inargs. */
diff --git a/Objects/call.c b/Objects/call.c
index 3b08cb25926..4294a9beb0a 100644
--- a/Objects/call.c
+++ b/Objects/call.c
@@ -499,7 +499,7 @@ _PyMethodDef_RawFastCallDict(PyMethodDef *method, PyObject *self, PyObject **arg
         if (kwargs != NULL && PyDict_GET_SIZE(kwargs) != 0) {
             goto no_keyword_error;
         }
-        /* fall through next case */
+        /* fall through */
 
     case METH_VARARGS | METH_KEYWORDS:
     {
@@ -656,7 +656,7 @@ _PyMethodDef_RawFastCallKeywords(PyMethodDef *method, PyObject *self, PyObject *
         if (nkwargs) {
             goto no_keyword_error;
         }
-        /* fall through next case */
+        /* fall through */
 
     case METH_VARARGS | METH_KEYWORDS:
     {
diff --git a/Objects/stringlib/codecs.h b/Objects/stringlib/codecs.h
index 43f2f3266fd..f019d9a96bf 100644
--- a/Objects/stringlib/codecs.h
+++ b/Objects/stringlib/codecs.h
@@ -330,7 +330,7 @@ STRINGLIB(utf8_encoder)(PyObject *unicode,
             case _Py_ERROR_REPLACE:
                 memset(p, '?', endpos - startpos);
                 p += (endpos - startpos);
-                /* fall through the ignore handler */
+                /* fall through */
             case _Py_ERROR_IGNORE:
                 i += (endpos - startpos - 1);
                 break;
@@ -378,7 +378,7 @@ STRINGLIB(utf8_encoder)(PyObject *unicode,
                 }
                 startpos = k;
                 assert(startpos < endpos);
-                /* fall through the default handler */
+                /* fall through */
             default:
                 rep = unicode_encode_call_errorhandler(
                       errors, &error_handler_obj, "utf-8", "surrogates not allowed",
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 0e6cb7f2a5e..f7b2aa6c3df 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1794,6 +1794,7 @@ unicode_dealloc(PyObject *unicode)
 
     case SSTATE_INTERNED_IMMORTAL:
         Py_FatalError("Immortal interned string died.");
+        /* fall through */
 
     default:
         Py_FatalError("Inconsistent interned string state.");
@@ -6778,7 +6779,7 @@ unicode_encode_ucs1(PyObject *unicode,
             case _Py_ERROR_REPLACE:
                 memset(str, '?', collend - collstart);
                 str += (collend - collstart);
-                /* fall through ignore error handler */
+                /* fall through */
             case _Py_ERROR_IGNORE:
                 pos = collend;
                 break;
@@ -6817,7 +6818,7 @@ unicode_encode_ucs1(PyObject *unicode,
                     break;
                 collstart = pos;
                 assert(collstart != collend);
-                /* fallback to general error handling */
+                /* fall through */
 
             default:
                 rep = unicode_encode_call_errorhandler(errors, &error_handler_obj,
diff --git a/Python/ast.c b/Python/ast.c
index becf0addef2..89206c3464f 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -1182,6 +1182,7 @@ ast_for_comp_op(struct compiling *c, const node *n)
                     return In;
                 if (strcmp(STR(n), "is") == 0)
                     return Is;
+                /* fall through */
             default:
                 PyErr_Format(PyExc_SystemError, "invalid comp_op: %s",
                              STR(n));
@@ -1196,6 +1197,7 @@ ast_for_comp_op(struct compiling *c, const node *n)
                     return NotIn;
                 if (strcmp(STR(CHILD(n, 0)), "is") == 0)
                     return IsNot;
+                /* fall through */
             default:
                 PyErr_Format(PyExc_SystemError, "invalid comp_op: %s %s",
                              STR(CHILD(n, 0)), STR(CHILD(n, 1)));
@@ -3147,6 +3149,7 @@ ast_for_flow_stmt(struct compiling *c, const node *n)
                 }
                 return Raise(expression, cause, LINENO(n), n->n_col_offset, c->c_arena);
             }
+            /* fall through */
         default:
             PyErr_Format(PyExc_SystemError,
                          "unexpected flow_stmt: %d", TYPE(ch));
diff --git a/Python/ceval.c b/Python/ceval.c
index 9f732f56ba8..92b13311355 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1807,9 +1807,11 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
             switch (oparg) {
             case 2:
                 cause = POP(); /* cause */
+                /* fall through */
             case 1:
                 exc = POP(); /* exc */
-            case 0: /* Fallthrough */
+                /* fall through */
+            case 0:
                 if (do_raise(exc, cause)) {
                     why = WHY_EXCEPTION;
                     goto fast_block_end;
diff --git a/Python/compile.c b/Python/compile.c
index 280ddc39e31..78e797a2c33 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -4154,6 +4154,7 @@ expr_constant(struct compiler *c, expr_ty e)
         else if (o == Py_False)
             return 0;
     }
+    /* fall through */
     default:
         return -1;
     }
@@ -4446,13 +4447,13 @@ compiler_visit_expr(struct compiler *c, expr_ty e)
         switch (e->v.Attribute.ctx) {
         case AugLoad:
             ADDOP(c, DUP_TOP);
-            /* Fall through to load */
+            /* Fall through */
         case Load:
             ADDOP_NAME(c, LOAD_ATTR, e->v.Attribute.attr, names);
             break;
         case AugStore:
             ADDOP(c, ROT_TWO);
-            /* Fall through to save */
+            /* Fall through */
         case Store:
             ADDOP_NAME(c, STORE_ATTR, e->v.Attribute.attr, names);
             break;
diff --git a/Python/dtoa.c b/Python/dtoa.c
index efcadc31e9c..01ca9b0b22f 100644
--- a/Python/dtoa.c
+++ b/Python/dtoa.c
@@ -1454,7 +1454,7 @@ _Py_dg_strtod(const char *s00, char **se)
     switch (c) {
     case '-':
         sign = 1;
-        /* no break */
+        /* fall through */
     case '+':
         c = *++s;
     }
@@ -1523,7 +1523,7 @@ _Py_dg_strtod(const char *s00, char **se)
         switch (c) {
         case '-':
             esign = 1;
-            /* no break */
+            /* fall through */
         case '+':
             c = *++s;
         }
@@ -2441,7 +2441,7 @@ _Py_dg_dtoa(double dd, int mode, int ndigits,
         break;
     case 2:
         leftright = 0;
-        /* no break */
+        /* fall through */
     case 4:
         if (ndigits <= 0)
             ndigits = 1;
@@ -2449,7 +2449,7 @@ _Py_dg_dtoa(double dd, int mode, int ndigits,
         break;
     case 3:
         leftright = 0;
-        /* no break */
+        /* fall through */
     case 5:
         i = ndigits + k + 1;
         ilim = i;
diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
index a2c2b3627c9..9192bfd6a67 100644
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -312,6 +312,7 @@ parse_internal_render_format_spec(PyObject *format_spec,
                 format->thousands_separators = LT_UNDER_FOUR_LOCALE;
                 break;
             }
+            /* fall through */
         default:
             invalid_comma_type(format->type);
             return 0;
diff --git a/Python/getargs.c b/Python/getargs.c
index 471f72924f6..4645b0f2006 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -2304,8 +2304,8 @@ skipitem(const char **p_format, va_list *p_va, int flags)
                 /* after 'e', only 's' and 't' is allowed */
                 goto err;
             format++;
-            /* explicit fallthrough to string cases */
         }
+        /* fall through */
 
     case 's': /* string */
     case 'z': /* string or None */
diff --git a/Python/marshal.c b/Python/marshal.c
index b2c00a0b6c5..b6337e1450f 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -1112,6 +1112,7 @@ r_object(RFILE *p)
 
     case TYPE_ASCII_INTERNED:
         is_interned = 1;
+        /* fall through */
     case TYPE_ASCII:
         n = r_long(p);
         if (PyErr_Occurred())
@@ -1124,6 +1125,7 @@ r_object(RFILE *p)
 
     case TYPE_SHORT_ASCII_INTERNED:
         is_interned = 1;
+        /* fall through */
     case TYPE_SHORT_ASCII:
         n = r_byte(p);
         if (n == EOF) {
@@ -1149,6 +1151,7 @@ r_object(RFILE *p)
 
     case TYPE_INTERNED:
         is_interned = 1;
+        /* fall through */
     case TYPE_UNICODE:
         {
         const char *buffer;
diff --git a/Python/pyhash.c b/Python/pyhash.c
index 57a2da715e1..a2ec2309c70 100644
--- a/Python/pyhash.c
+++ b/Python/pyhash.c
@@ -393,13 +393,13 @@ siphash24(const void *src, Py_ssize_t src_sz) {
     pt = (uint8_t *)&t;
     m = (uint8_t *)in;
     switch (src_sz) {
-        case 7: pt[6] = m[6];
-        case 6: pt[5] = m[5];
-        case 5: pt[4] = m[4];
+        case 7: pt[6] = m[6]; /* fall through */
+        case 6: pt[5] = m[5]; /* fall through */
+        case 5: pt[4] = m[4]; /* fall through */
         case 4: memcpy(pt, m, sizeof(uint32_t)); break;
-        case 3: pt[2] = m[2];
-        case 2: pt[1] = m[1];
-        case 1: pt[0] = m[0];
+        case 3: pt[2] = m[2]; /* fall through */
+        case 2: pt[1] = m[1]; /* fall through */
+        case 1: pt[0] = m[0]; /* fall through */
     }
     b |= _le64toh(t);
 
diff --git a/Python/wordcode_helpers.h b/Python/wordcode_helpers.h
index b0e3a917767..cce81c1d24e 100644
--- a/Python/wordcode_helpers.h
+++ b/Python/wordcode_helpers.h
@@ -28,10 +28,13 @@ write_op_arg(_Py_CODEUNIT *codestr, unsigned char opcode,
     switch (ilen) {
         case 4:
             *codestr++ = PACKOPARG(EXTENDED_ARG, (oparg >> 24) & 0xff);
+            /* fall through */
         case 3:
             *codestr++ = PACKOPARG(EXTENDED_ARG, (oparg >> 16) & 0xff);
+            /* fall through */
         case 2:
             *codestr++ = PACKOPARG(EXTENDED_ARG, (oparg >> 8) & 0xff);
+            /* fall through */
         case 1:
             *codestr++ = PACKOPARG(opcode, oparg & 0xff);
             break;


From webhook-mailer at python.org  Mon Aug 21 12:01:15 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 21 Aug 2017 16:01:15 -0000
Subject: [Python-checkins] bpo-30263: regrtest: add system load average
 (#3165)
Message-ID: <mailman.73.1503331277.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/02d4292df4bbd7a2cbf2716c9e6c22cae76e2093
commit: 02d4292df4bbd7a2cbf2716c9e6c22cae76e2093
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-21T18:01:11+02:00
summary:

bpo-30263: regrtest: add system load average (#3165)

Add the CPU count in the header.

files:
M Lib/test/regrtest.py
M Lib/test/test_regrtest.py

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 7096de8469a..cd8cc159364 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -295,6 +295,24 @@ def format_test_result(test_name, result):
     return fmt % test_name
 
 
+def cpu_count():
+    # first try os.sysconf() to prevent loading the big multiprocessing module
+    try:
+        return os.sysconf('SC_NPROCESSORS_ONLN')
+    except (AttributeError, ValueError):
+        pass
+
+    # try multiprocessing.cpu_count()
+    try:
+        import multiprocessing
+    except ImportError:
+        pass
+    else:
+        return multiprocessing.cpu_count()
+
+    return None
+
+
 def unload_test_modules(save_modules):
     # Unload the newly imported modules (best effort finalization)
     for module in sys.modules.keys():
@@ -617,15 +635,24 @@ def test_forever(tests=list(selected)):
 
     def display_progress(test_index, test):
         # "[ 51/405/1] test_tcl"
-        fmt = "[{1:{0}}{2}/{3}] {4}" if bad else "[{1:{0}}{2}] {4}"
-        line = fmt.format(test_count_width, test_index, test_count,
-                          len(bad), test)
+        line = "{1:{0}}{2}".format(test_count_width, test_index, test_count)
+        if bad and not pgo:
+            line = '{}/{}'.format(line, len(bad))
+        line = '[{}]'.format(line)
+
+        # add the system load prefix: "load avg: 1.80 "
+        if hasattr(os, 'getloadavg'):
+            load_avg_1min = os.getloadavg()[0]
+            line = "load avg: {:.2f} {}".format(load_avg_1min, line)
 
         # add the timestamp prefix:  "0:01:05 "
         test_time = time.time() - regrtest_start_time
         test_time = datetime.timedelta(seconds=int(test_time))
         line = "%s %s" % (test_time, line)
 
+        # add the test name
+        line = "{} {}".format(line, test)
+
         print(line)
         sys.stdout.flush()
 
@@ -638,6 +665,9 @@ def display_progress(test_index, test):
             print "==  ", platform.platform(aliased=True), \
                           "%s-endian" % sys.byteorder
             print "==  ", os.getcwd()
+            ncpu = cpu_count()
+            if ncpu:
+                print "== CPU count:", ncpu
             print "Testing with flags:", sys.flags
 
     if randomize:
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
index 400463c4263..264c74d22ba 100644
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -85,7 +85,7 @@ def check_line(self, output, regex):
         self.assertRegexpMatches(output, regex)
 
     def parse_executed_tests(self, output):
-        regex = (r'^[0-9]+:[0-9]+:[0-9]+ \[ *[0-9]+(?:/ *[0-9]+)*\] (%s)'
+        regex = (r'^[0-9]+:[0-9]+:[0-9]+ (?:load avg: [0-9]+\.[0-9]{2} )?\[ *[0-9]+(?:/ *[0-9]+)*\] (%s)'
                  % self.TESTNAME_REGEX)
         parser = re.finditer(regex, output, re.MULTILINE)
         return list(match.group(1) for match in parser)


From webhook-mailer at python.org  Mon Aug 21 12:13:00 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 21 Aug 2017 16:13:00 -0000
Subject: [Python-checkins] bpo-31247: xmlrpc.server: break reference cycle
 (#3166)
Message-ID: <mailman.74.1503331981.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/84524454d0ba77d299741c47bd0f5841ac3f66ce
commit: 84524454d0ba77d299741c47bd0f5841ac3f66ce
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-21T18:12:58+02:00
summary:

bpo-31247: xmlrpc.server: break reference cycle (#3166)

xmlrpc.server now explicitly breaks reference cycles when using
sys.exc_info() in code handling exceptions.

files:
A Misc/NEWS.d/next/Library/2017-08-21-17-50-27.bpo-31247.8S3zJp.rst
M Lib/xmlrpc/server.py

diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py
index bb86fe6872a..88d0eec786b 100644
--- a/Lib/xmlrpc/server.py
+++ b/Lib/xmlrpc/server.py
@@ -270,10 +270,14 @@ def _marshaled_dispatch(self, data, dispatch_method = None, path = None):
         except:
             # report exception back to server
             exc_type, exc_value, exc_tb = sys.exc_info()
-            response = dumps(
-                Fault(1, "%s:%s" % (exc_type, exc_value)),
-                encoding=self.encoding, allow_none=self.allow_none,
-                )
+            try:
+                response = dumps(
+                    Fault(1, "%s:%s" % (exc_type, exc_value)),
+                    encoding=self.encoding, allow_none=self.allow_none,
+                    )
+            finally:
+                # Break reference cycle
+                exc_type = exc_value = exc_tb = None
 
         return response.encode(self.encoding, 'xmlcharrefreplace')
 
@@ -365,10 +369,14 @@ def system_multicall(self, call_list):
                     )
             except:
                 exc_type, exc_value, exc_tb = sys.exc_info()
-                results.append(
-                    {'faultCode' : 1,
-                     'faultString' : "%s:%s" % (exc_type, exc_value)}
-                    )
+                try:
+                    results.append(
+                        {'faultCode' : 1,
+                         'faultString' : "%s:%s" % (exc_type, exc_value)}
+                        )
+                finally:
+                    # Break reference cycle
+                    exc_type = exc_value = exc_tb = None
         return results
 
     def _dispatch(self, method, params):
@@ -630,10 +638,14 @@ def _marshaled_dispatch(self, data, dispatch_method = None, path = None):
             # (each dispatcher should have handled their own
             # exceptions)
             exc_type, exc_value = sys.exc_info()[:2]
-            response = dumps(
-                Fault(1, "%s:%s" % (exc_type, exc_value)),
-                encoding=self.encoding, allow_none=self.allow_none)
-            response = response.encode(self.encoding, 'xmlcharrefreplace')
+            try:
+                response = dumps(
+                    Fault(1, "%s:%s" % (exc_type, exc_value)),
+                    encoding=self.encoding, allow_none=self.allow_none)
+                response = response.encode(self.encoding, 'xmlcharrefreplace')
+            finally:
+                # Break reference cycle
+                exc_type = exc_value = None
         return response
 
 class CGIXMLRPCRequestHandler(SimpleXMLRPCDispatcher):
diff --git a/Misc/NEWS.d/next/Library/2017-08-21-17-50-27.bpo-31247.8S3zJp.rst b/Misc/NEWS.d/next/Library/2017-08-21-17-50-27.bpo-31247.8S3zJp.rst
new file mode 100644
index 00000000000..6879384eb8f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-21-17-50-27.bpo-31247.8S3zJp.rst
@@ -0,0 +1,2 @@
+xmlrpc.server now explicitly breaks reference cycles when using
+sys.exc_info() in code handling exceptions.


From webhook-mailer at python.org  Mon Aug 21 12:35:06 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 21 Aug 2017 16:35:06 -0000
Subject: [Python-checkins] bpo-31247: xmlrpc.server: break reference cycle
 (#3166) (#3168)
Message-ID: <mailman.75.1503333308.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/12a3e343e1667f91c0095a9a7dc15048cb620e41
commit: 12a3e343e1667f91c0095a9a7dc15048cb620e41
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-21T18:35:04+02:00
summary:

bpo-31247: xmlrpc.server: break reference cycle (#3166) (#3168)

xmlrpc.server now explicitly breaks reference cycles when using
sys.exc_info() in code handling exceptions.
(cherry picked from commit 84524454d0ba77d299741c47bd0f5841ac3f66ce)

files:
A Misc/NEWS.d/next/Library/2017-08-21-17-50-27.bpo-31247.8S3zJp.rst
M Lib/xmlrpc/server.py

diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py
index 6faa2d6f8fa..3e0dca027f0 100644
--- a/Lib/xmlrpc/server.py
+++ b/Lib/xmlrpc/server.py
@@ -264,10 +264,14 @@ def _marshaled_dispatch(self, data, dispatch_method = None, path = None):
         except:
             # report exception back to server
             exc_type, exc_value, exc_tb = sys.exc_info()
-            response = dumps(
-                Fault(1, "%s:%s" % (exc_type, exc_value)),
-                encoding=self.encoding, allow_none=self.allow_none,
-                )
+            try:
+                response = dumps(
+                    Fault(1, "%s:%s" % (exc_type, exc_value)),
+                    encoding=self.encoding, allow_none=self.allow_none,
+                    )
+            finally:
+                # Break reference cycle
+                exc_type = exc_value = exc_tb = None
 
         return response.encode(self.encoding, 'xmlcharrefreplace')
 
@@ -359,10 +363,14 @@ def system_multicall(self, call_list):
                     )
             except:
                 exc_type, exc_value, exc_tb = sys.exc_info()
-                results.append(
-                    {'faultCode' : 1,
-                     'faultString' : "%s:%s" % (exc_type, exc_value)}
-                    )
+                try:
+                    results.append(
+                        {'faultCode' : 1,
+                         'faultString' : "%s:%s" % (exc_type, exc_value)}
+                        )
+                finally:
+                    # Break reference cycle
+                    exc_type = exc_value = exc_tb = None
         return results
 
     def _dispatch(self, method, params):
@@ -624,10 +632,14 @@ def _marshaled_dispatch(self, data, dispatch_method = None, path = None):
             # (each dispatcher should have handled their own
             # exceptions)
             exc_type, exc_value = sys.exc_info()[:2]
-            response = dumps(
-                Fault(1, "%s:%s" % (exc_type, exc_value)),
-                encoding=self.encoding, allow_none=self.allow_none)
-            response = response.encode(self.encoding, 'xmlcharrefreplace')
+            try:
+                response = dumps(
+                    Fault(1, "%s:%s" % (exc_type, exc_value)),
+                    encoding=self.encoding, allow_none=self.allow_none)
+                response = response.encode(self.encoding, 'xmlcharrefreplace')
+            finally:
+                # Break reference cycle
+                exc_type = exc_value = None
         return response
 
 class CGIXMLRPCRequestHandler(SimpleXMLRPCDispatcher):
diff --git a/Misc/NEWS.d/next/Library/2017-08-21-17-50-27.bpo-31247.8S3zJp.rst b/Misc/NEWS.d/next/Library/2017-08-21-17-50-27.bpo-31247.8S3zJp.rst
new file mode 100644
index 00000000000..6879384eb8f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-21-17-50-27.bpo-31247.8S3zJp.rst
@@ -0,0 +1,2 @@
+xmlrpc.server now explicitly breaks reference cycles when using
+sys.exc_info() in code handling exceptions.


From webhook-mailer at python.org  Mon Aug 21 13:19:11 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Mon, 21 Aug 2017 17:19:11 -0000
Subject: [Python-checkins] bpo-31236: Improved some error messages of min()
 and max().
Message-ID: <mailman.76.1503335955.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/58cf7488d5dcc8f47151d09fc1fa057b4dda563b
commit: 58cf7488d5dcc8f47151d09fc1fa057b4dda563b
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-21T20:19:07+03:00
summary:

bpo-31236: Improved some error messages of min() and max().

files:
M Python/bltinmodule.c

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 85f207b68ee..5e1f1d3854f 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1519,8 +1519,9 @@ min_max(PyObject *args, PyObject *kwds, int op)
     emptytuple = PyTuple_New(0);
     if (emptytuple == NULL)
         return NULL;
-    ret = PyArg_ParseTupleAndKeywords(emptytuple, kwds, "|$OO", kwlist,
-                                      &keyfunc, &defaultval);
+    ret = PyArg_ParseTupleAndKeywords(emptytuple, kwds,
+                                      (op == Py_LT) ? "|$OO:min" : "|$OO:max",
+                                      kwlist, &keyfunc, &defaultval);
     Py_DECREF(emptytuple);
     if (!ret)
         return NULL;


From lp_benchmark_robot at intel.com  Mon Aug 21 14:50:20 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Mon, 21 Aug 2017 11:50:20 -0700
Subject: [Python-checkins] [1 down,
 64 flat] Results for Python (master branch) 2017-08-21
Message-ID: <faa33843-14ae-44e0-abdd-2a445734f0ab@orsmsx155.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-21 03:04:11-07:00.
  - commit:		0267128
  - previous commit:	a3a01a2
  - revision date:	2017-08-21 00:45:46+02:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.119% |  +0.716%   |  +4.748%   |  +7.520%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.399% |  -0.148%   |  +20.718%  |  +13.541%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 1.470% |  -2.525%   |  +21.721%  |  +12.534%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.644% |  -0.747%   |  +20.490%  |  +9.853%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 1.882% |  +0.041%   |  +1.968%   |  +15.784%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.581% |  +0.029%   |  +11.712%  |  +10.055%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 2.940% |  -0.143%   |  +5.634%   |  +11.109%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.554% |  -0.468%   |  +4.039%   |  +5.865%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.145% |  -2.840%   |  +3.250%   |  +21.670%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.054% |  +1.680%   |  +10.327%  |  +12.272%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.298% |  -1.323%   |  +3.516%   |  +6.795%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.496% |  +1.149%   |  +5.539%   |  +4.482%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 1.366% |  -1.478%   |  +1.719%   |  +7.040%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.590% |  +0.346%   |  +9.205%   |  +11.370%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 3.150% |  -2.051%   |  +5.623%   |  +11.859%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.706% |  +0.332%   |  +6.653%   |  +10.753%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 1.161% |  +0.519%   |  +9.275%   |  +11.615%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.398% |  +0.141%   |  +8.340%   |  +10.672%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.912% |  -0.338%   |  +3.831%   |  +10.269%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 5.211% |  -2.004%   |  +1.195%   |  +12.692%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.504% |  +0.352%   |  +8.386%   |  +13.199%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.430% |  +0.030%   |  +46.794%  |  +12.644%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.642% |  +0.258%   |  +9.273%   |  +14.811%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.561% |  -1.362%   |  +17.662%  |  +12.127%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 4.616% |  +2.628%   |  +7.646%   |  +10.221%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.111% |  -0.770%   |  +2.952%   |  +5.881%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 1.318% |  -0.382%   |  -2.383%   |  +4.553%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.573% |  -0.207%   |  +2.511%   |  +7.025%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.443% |  -1.545%   |  +3.426%   |  +11.853%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.325% |  +0.096%   |  +1.426%   |  +21.790%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.309% |  +0.913%   |  +3.453%   |  +20.185%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.725% |  +2.017%   |  +7.504%   |  +17.846%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 5.406% |  -0.992%   |  +11.320%  |  +10.735%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.190% |  -0.068%   |  +0.254%   |  +9.931%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.130% |  +0.134%   |  +9.060%   |  +4.220%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.101% |  -0.109%   |  +0.961%   |  +4.299%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.169% |  -0.535%   |  +8.506%   |  +13.523%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 3.733% |  +5.416%   |  -5.545%   |  +7.680%   |
+-----+------------------------+--------+------------+------------+------------+
| :-( |               regex_dna| 0.470% |  -3.565%   |  -1.968%   |  +11.813%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.392% |  -4.600%   |  -4.154%   |  +7.284%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 0.711% |  -0.926%   |  +10.803%  |  +5.440%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.902% |  -0.935%   |  +7.165%   |  +15.684%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.647% |  +0.509%   |  +0.482%   |  +3.544%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.476% |  +0.997%   |  +27.622%  |  +8.678%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.839% |  +1.578%   |  +4.090%   |  +6.525%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 1.286% |  +1.493%   |  +13.990%  |  +8.024%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 1.479% |  +0.322%   |  +0.791%   |  +1.930%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 1.733% |  +0.243%   |  +5.976%   |  +2.029%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.645% |  -0.576%   |  +5.981%   |  +6.849%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.138% |  -0.718%   |  +5.718%   |  +5.860%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.867% |  -1.884%   |  +0.415%   |  +11.050%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.613% |  -0.164%   |  +12.640%  |  +8.236%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.943% |  -0.083%   |  +10.211%  |  +6.950%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.678% |  -0.060%   |  +11.571%  |  +9.268%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.540% |  -0.282%   |  +13.840%  |  +9.069%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 3.988% |  -1.021%   |  +23.060%  |  +11.152%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.169% |  -0.039%   |  +6.107%   |  +7.369%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 0.978% |  +1.597%   |  +2.304%   |  -0.547%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 8.169% |  +0.873%   |  +6.866%   |  +21.841%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 1.812% |  +2.561%   |  -0.303%   |  +16.717%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 2.888% |  -0.266%   |  +7.077%   |  +7.534%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 0.809% |  +0.637%   |  +6.634%   |  +7.484%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.262% |  +0.260%   |  +2.409%   |  +5.941%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 1.744% |  -0.967%   |  -6.301%   |  +11.374%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.056% |  +1.581%   |  +7.810%   |  +7.468%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/1-down-64-flat-results-for-python-master-branch-2017-08-21

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Mon Aug 21 17:24:27 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 21 Aug 2017 21:24:27 -0000
Subject: [Python-checkins] bpo-31249: test_concurrent_futures checks
 dangling threads (#3167)
Message-ID: <mailman.77.1503350669.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/489d91c61d02f401551966f1558ee2dc87fc0ad9
commit: 489d91c61d02f401551966f1558ee2dc87fc0ad9
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-21T23:24:24+02:00
summary:

bpo-31249: test_concurrent_futures checks dangling threads (#3167)

Add a BaseTestCase class to test_concurrent_futures to check for
dangling threads and processes on all tests, not only tests using
ExecutorMixin.

files:
M Lib/test/test_concurrent_futures.py

diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index c649555f39c..ebc30a49e5e 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -59,11 +59,20 @@ def my_method(self):
         pass
 
 
+class BaseTestCase(unittest.TestCase):
+    def setUp(self):
+        self._thread_key = test.support.threading_setup()
+
+    def tearDown(self):
+        test.support.reap_children()
+        test.support.threading_cleanup(*self._thread_key)
+
+
 class ExecutorMixin:
     worker_count = 5
 
     def setUp(self):
-        self._thread_cleanup = test.support.threading_setup()
+        super().setUp()
 
         self.t1 = time.time()
         try:
@@ -81,8 +90,7 @@ def tearDown(self):
             print("%.2fs" % dt, end=' ')
         self.assertLess(dt, 60, "synchronization issue: test lasted too long")
 
-        test.support.threading_cleanup(*self._thread_cleanup)
-        test.support.reap_children()
+        super().tearDown()
 
     def _prime_executor(self):
         # Make sure that the executor is ready to do work before running the
@@ -130,7 +138,7 @@ def test_hang_issue12364(self):
             f.result()
 
 
-class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, unittest.TestCase):
+class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase):
     def _prime_executor(self):
         pass
 
@@ -185,7 +193,7 @@ def test_thread_names_default(self):
             t.join()
 
 
-class ProcessPoolShutdownTest(ProcessPoolMixin, ExecutorShutdownTest, unittest.TestCase):
+class ProcessPoolShutdownTest(ProcessPoolMixin, ExecutorShutdownTest, BaseTestCase):
     def _prime_executor(self):
         pass
 
@@ -322,7 +330,7 @@ def test_timeout(self):
         self.assertEqual(set([future2]), pending)
 
 
-class ThreadPoolWaitTests(ThreadPoolMixin, WaitTests, unittest.TestCase):
+class ThreadPoolWaitTests(ThreadPoolMixin, WaitTests, BaseTestCase):
 
     def test_pending_calls_race(self):
         # Issue #14406: multi-threaded race condition when waiting on all
@@ -340,7 +348,7 @@ def future_func():
             sys.setswitchinterval(oldswitchinterval)
 
 
-class ProcessPoolWaitTests(ProcessPoolMixin, WaitTests, unittest.TestCase):
+class ProcessPoolWaitTests(ProcessPoolMixin, WaitTests, BaseTestCase):
     pass
 
 
@@ -389,11 +397,11 @@ def test_duplicate_futures(self):
         self.assertEqual(len(completed), 1)
 
 
-class ThreadPoolAsCompletedTests(ThreadPoolMixin, AsCompletedTests, unittest.TestCase):
+class ThreadPoolAsCompletedTests(ThreadPoolMixin, AsCompletedTests, BaseTestCase):
     pass
 
 
-class ProcessPoolAsCompletedTests(ProcessPoolMixin, AsCompletedTests, unittest.TestCase):
+class ProcessPoolAsCompletedTests(ProcessPoolMixin, AsCompletedTests, BaseTestCase):
     pass
 
 
@@ -464,7 +472,7 @@ def test_max_workers_negative(self):
                 self.executor_type(max_workers=number)
 
 
-class ThreadPoolExecutorTest(ThreadPoolMixin, ExecutorTest, unittest.TestCase):
+class ThreadPoolExecutorTest(ThreadPoolMixin, ExecutorTest, BaseTestCase):
     def test_map_submits_without_iteration(self):
         """Tests verifying issue 11777."""
         finished = []
@@ -481,7 +489,7 @@ def test_default_workers(self):
                          (os.cpu_count() or 1) * 5)
 
 
-class ProcessPoolExecutorTest(ProcessPoolMixin, ExecutorTest, unittest.TestCase):
+class ProcessPoolExecutorTest(ProcessPoolMixin, ExecutorTest, BaseTestCase):
     def test_killed_child(self):
         # When a child process is abruptly terminated, the whole pool gets
         # "broken".
@@ -537,7 +545,7 @@ def test_traceback(self):
                       f1.getvalue())
 
 
-class FutureTests(unittest.TestCase):
+class FutureTests(BaseTestCase):
     def test_done_callback_with_result(self):
         callback_result = None
         def fn(callback_future):


From webhook-mailer at python.org  Mon Aug 21 17:24:43 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 21 Aug 2017 21:24:43 -0000
Subject: [Python-checkins] bpo-31238: pydoc ServerThread.stop() now joins
 itself (#3151)
Message-ID: <mailman.78.1503350683.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/4cab2cd0c05fcda5fcb128c9eb230253fff88c21
commit: 4cab2cd0c05fcda5fcb128c9eb230253fff88c21
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-21T23:24:40+02:00
summary:

bpo-31238: pydoc ServerThread.stop() now joins itself (#3151)

* bpo-31238: pydoc ServerThread.stop() now joins itself

ServerThread.stop() now joins itself to wait until
DocServer.serve_until_quit() completes and then explicitly sets
its docserver attribute to None to break a reference cycle.

* Add NEWS.d entry

files:
A Misc/NEWS.d/next/Library/2017-08-21-12-31-53.bpo-31238.Gg0LRH.rst
M Lib/pydoc.py

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 376c4459fe6..5edc77005a8 100644
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -2297,6 +2297,10 @@ def ready(self, server):
         def stop(self):
             """Stop the server and this thread nicely"""
             self.docserver.quit = True
+            self.join()
+            # explicitly break a reference cycle: DocServer.callback
+            # has indirectly a reference to ServerThread.
+            self.docserver = None
             self.serving = False
             self.url = None
 
diff --git a/Misc/NEWS.d/next/Library/2017-08-21-12-31-53.bpo-31238.Gg0LRH.rst b/Misc/NEWS.d/next/Library/2017-08-21-12-31-53.bpo-31238.Gg0LRH.rst
new file mode 100644
index 00000000000..3e1cd130100
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-21-12-31-53.bpo-31238.Gg0LRH.rst
@@ -0,0 +1,3 @@
+pydoc: the stop() method of the private ServerThread class now waits until
+DocServer.serve_until_quit() completes and then explicitly sets its
+docserver attribute to None to break a reference cycle.


From webhook-mailer at python.org  Mon Aug 21 17:51:34 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 21 Aug 2017 21:51:34 -0000
Subject: [Python-checkins] Add test_subprocess.test_nonexisting_with_pipes()
 (#3133)
Message-ID: <mailman.79.1503352296.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/9a83f651f31b47b3f6c8b210f7807b26e8c373a5
commit: 9a83f651f31b47b3f6c8b210f7807b26e8c373a5
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-21T23:51:31+02:00
summary:

Add test_subprocess.test_nonexisting_with_pipes() (#3133)

bpo-30121: Test the Popen failure when Popen was created with pipes.
Create also NONEXISTING_CMD variable in test_subprocess.py.

files:
M Lib/test/test_subprocess.py

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 8cda1e81c80..c24fd1e2400 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -49,6 +49,8 @@
 else:
     SETBINARY = ''
 
+NONEXISTING_CMD = ('nonexisting_i_hope',)
+
 
 class BaseTestCase(unittest.TestCase):
     def setUp(self):
@@ -1145,13 +1147,54 @@ def test_leaking_fds_on_error(self):
         # 1024 times (each call leaked two fds).
         for i in range(1024):
             with self.assertRaises(OSError) as c:
-                subprocess.Popen(['nonexisting_i_hope'],
+                subprocess.Popen(NONEXISTING_CMD,
                                  stdout=subprocess.PIPE,
                                  stderr=subprocess.PIPE)
             # ignore errors that indicate the command was not found
             if c.exception.errno not in (errno.ENOENT, errno.EACCES):
                 raise c.exception
 
+    def test_nonexisting_with_pipes(self):
+        # bpo-30121: Popen with pipes must close properly pipes on error.
+        # Previously, os.close() was called with a Windows handle which is not
+        # a valid file descriptor.
+        #
+        # Run the test in a subprocess to control how the CRT reports errors
+        # and to get stderr content.
+        try:
+            import msvcrt
+            msvcrt.CrtSetReportMode
+        except (AttributeError, ImportError):
+            self.skipTest("need msvcrt.CrtSetReportMode")
+
+        code = textwrap.dedent(f"""
+            import msvcrt
+            import subprocess
+
+            cmd = {NONEXISTING_CMD!r}
+
+            for report_type in [msvcrt.CRT_WARN,
+                                msvcrt.CRT_ERROR,
+                                msvcrt.CRT_ASSERT]:
+                msvcrt.CrtSetReportMode(report_type, msvcrt.CRTDBG_MODE_FILE)
+                msvcrt.CrtSetReportFile(report_type, msvcrt.CRTDBG_FILE_STDERR)
+
+            try:
+                subprocess.Popen([cmd],
+                                 stdout=subprocess.PIPE,
+                                 stderr=subprocess.PIPE)
+            except OSError:
+                pass
+        """)
+        cmd = [sys.executable, "-c", code]
+        proc = subprocess.Popen(cmd,
+                                stderr=subprocess.PIPE,
+                                universal_newlines=True)
+        with proc:
+            stderr = proc.communicate()[1]
+        self.assertEqual(stderr, "")
+        self.assertEqual(proc.returncode, 0)
+
     @unittest.skipIf(threading is None, "threading required")
     def test_double_close_on_error(self):
         # Issue #18851
@@ -1164,7 +1207,7 @@ def open_fds():
         t.start()
         try:
             with self.assertRaises(EnvironmentError):
-                subprocess.Popen(['nonexisting_i_hope'],
+                subprocess.Popen(NONEXISTING_CMD,
                                  stdin=subprocess.PIPE,
                                  stdout=subprocess.PIPE,
                                  stderr=subprocess.PIPE)
@@ -2430,7 +2473,7 @@ def test_leak_fast_process_del_killed(self):
         # should trigger the wait() of p
         time.sleep(0.2)
         with self.assertRaises(OSError) as c:
-            with subprocess.Popen(['nonexisting_i_hope'],
+            with subprocess.Popen(NONEXISTING_CMD,
                                   stdout=subprocess.PIPE,
                                   stderr=subprocess.PIPE) as proc:
                 pass
@@ -2876,7 +2919,7 @@ def test_communicate_stdin(self):
 
     def test_invalid_args(self):
         with self.assertRaises((FileNotFoundError, PermissionError)) as c:
-            with subprocess.Popen(['nonexisting_i_hope'],
+            with subprocess.Popen(NONEXISTING_CMD,
                                   stdout=subprocess.PIPE,
                                   stderr=subprocess.PIPE) as proc:
                 pass


From webhook-mailer at python.org  Mon Aug 21 17:57:10 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 21 Aug 2017 21:57:10 -0000
Subject: [Python-checkins] regrtest: fix test to choose if header should be
 displayed (#3172)
Message-ID: <mailman.80.1503352630.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/0fbac706f7c798fdeda63e39009c2285dad2c33f
commit: 0fbac706f7c798fdeda63e39009c2285dad2c33f
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-21T23:57:06+02:00
summary:

regrtest: fix test to choose if header should be displayed (#3172)

Check "tests" before its value is replaced.

files:
M Lib/test/regrtest.py

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index cd8cc159364..83434c88024 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -572,6 +572,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
             nottests.add(arg)
         args = []
 
+    display_header = (verbose or header or not (quiet or single or tests or args)) and (not pgo)
     alltests = findtests(testdir, stdtests, nottests)
     selected = tests or args or alltests
     if single:
@@ -657,18 +658,17 @@ def display_progress(test_index, test):
         sys.stdout.flush()
 
     # For a partial run, we do not need to clutter the output.
-    if verbose or header or not (quiet or single or tests or args):
-        if not pgo:
-            # Print basic platform information
-            print "==", platform.python_implementation(), \
-                        " ".join(sys.version.split())
-            print "==  ", platform.platform(aliased=True), \
-                          "%s-endian" % sys.byteorder
-            print "==  ", os.getcwd()
-            ncpu = cpu_count()
-            if ncpu:
-                print "== CPU count:", ncpu
-            print "Testing with flags:", sys.flags
+    if display_header:
+        # Print basic platform information
+        print "==", platform.python_implementation(), \
+                    " ".join(sys.version.split())
+        print "==  ", platform.platform(aliased=True), \
+                      "%s-endian" % sys.byteorder
+        print "==  ", os.getcwd()
+        ncpu = cpu_count()
+        if ncpu:
+            print "== CPU count:", ncpu
+        print "Testing with flags:", sys.flags
 
     if randomize:
         random.seed(random_seed)


From webhook-mailer at python.org  Mon Aug 21 18:15:26 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 21 Aug 2017 22:15:26 -0000
Subject: [Python-checkins] [3.6] bpo-30121: Fix debug assert in subprocess
 on Windows (#1224) (#3173)
Message-ID: <mailman.81.1503353728.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/e76cb435563cd14bb085942dfefbb469b8f40aa9
commit: e76cb435563cd14bb085942dfefbb469b8f40aa9
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-22T00:15:23+02:00
summary:

[3.6] bpo-30121: Fix debug assert in subprocess on Windows (#1224) (#3173)

* bpo-30121: Fix debug assert in subprocess on Windows (#1224)

* bpo-30121: Fix debug assert in subprocess on Windows

This is caused by closing HANDLEs using os.close which is for CRT file
descriptors and not for HANDLEs.

* bpo-30121: Suppress debug assertion in test_subprocess when ran directly

(cherry picked from commit 4d3851727fb82195e4995c6064b0b2d6cbc031c4)

* Add test_subprocess.test_nonexisting_with_pipes() (#3133)

bpo-30121: Test the Popen failure when Popen was created with pipes.
Create also NONEXISTING_CMD variable in test_subprocess.py.
(cherry picked from commit 9a83f651f31b47b3f6c8b210f7807b26e8c373a5)

files:
M Lib/subprocess.py
M Lib/test/test_subprocess.py

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index b790cbd65ba..e0a93c55dc0 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -725,7 +725,10 @@ def __init__(self, args, bufsize=-1, executable=None,
                     to_close.append(self._devnull)
                 for fd in to_close:
                     try:
-                        os.close(fd)
+                        if _mswindows and isinstance(fd, Handle):
+                            fd.Close()
+                        else:
+                            os.close(fd)
                     except OSError:
                         pass
 
@@ -1005,6 +1008,9 @@ def _execute_child(self, args, executable, preexec_fn, close_fds,
                     errwrite.Close()
                 if hasattr(self, '_devnull'):
                     os.close(self._devnull)
+                # Prevent a double close of these handles/fds from __init__
+                # on error.
+                self._closed_child_pipe_fds = True
 
             # Retain the process handle, but close the thread handle
             self._child_created = True
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 004f1f01ab5..ccdd3232700 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -49,6 +49,8 @@
 else:
     SETBINARY = ''
 
+NONEXISTING_CMD = ('nonexisting_i_hope',)
+
 
 class BaseTestCase(unittest.TestCase):
     def setUp(self):
@@ -1120,10 +1122,11 @@ def _test_bufsize_equal_one(self, line, expected, universal_newlines):
             p.stdin.write(line) # expect that it flushes the line in text mode
             os.close(p.stdin.fileno()) # close it without flushing the buffer
             read_line = p.stdout.readline()
-            try:
-                p.stdin.close()
-            except OSError:
-                pass
+            with support.SuppressCrashReport():
+                try:
+                    p.stdin.close()
+                except OSError:
+                    pass
             p.stdin = None
         self.assertEqual(p.returncode, 0)
         self.assertEqual(read_line, expected)
@@ -1148,13 +1151,54 @@ def test_leaking_fds_on_error(self):
         # 1024 times (each call leaked two fds).
         for i in range(1024):
             with self.assertRaises(OSError) as c:
-                subprocess.Popen(['nonexisting_i_hope'],
+                subprocess.Popen(NONEXISTING_CMD,
                                  stdout=subprocess.PIPE,
                                  stderr=subprocess.PIPE)
             # ignore errors that indicate the command was not found
             if c.exception.errno not in (errno.ENOENT, errno.EACCES):
                 raise c.exception
 
+    def test_nonexisting_with_pipes(self):
+        # bpo-30121: Popen with pipes must close properly pipes on error.
+        # Previously, os.close() was called with a Windows handle which is not
+        # a valid file descriptor.
+        #
+        # Run the test in a subprocess to control how the CRT reports errors
+        # and to get stderr content.
+        try:
+            import msvcrt
+            msvcrt.CrtSetReportMode
+        except (AttributeError, ImportError):
+            self.skipTest("need msvcrt.CrtSetReportMode")
+
+        code = textwrap.dedent(f"""
+            import msvcrt
+            import subprocess
+
+            cmd = {NONEXISTING_CMD!r}
+
+            for report_type in [msvcrt.CRT_WARN,
+                                msvcrt.CRT_ERROR,
+                                msvcrt.CRT_ASSERT]:
+                msvcrt.CrtSetReportMode(report_type, msvcrt.CRTDBG_MODE_FILE)
+                msvcrt.CrtSetReportFile(report_type, msvcrt.CRTDBG_FILE_STDERR)
+
+            try:
+                subprocess.Popen([cmd],
+                                 stdout=subprocess.PIPE,
+                                 stderr=subprocess.PIPE)
+            except OSError:
+                pass
+        """)
+        cmd = [sys.executable, "-c", code]
+        proc = subprocess.Popen(cmd,
+                                stderr=subprocess.PIPE,
+                                universal_newlines=True)
+        with proc:
+            stderr = proc.communicate()[1]
+        self.assertEqual(stderr, "")
+        self.assertEqual(proc.returncode, 0)
+
     @unittest.skipIf(threading is None, "threading required")
     def test_double_close_on_error(self):
         # Issue #18851
@@ -1167,7 +1211,7 @@ def open_fds():
         t.start()
         try:
             with self.assertRaises(EnvironmentError):
-                subprocess.Popen(['nonexisting_i_hope'],
+                subprocess.Popen(NONEXISTING_CMD,
                                  stdin=subprocess.PIPE,
                                  stdout=subprocess.PIPE,
                                  stderr=subprocess.PIPE)
@@ -2433,7 +2477,7 @@ def test_leak_fast_process_del_killed(self):
         # should trigger the wait() of p
         time.sleep(0.2)
         with self.assertRaises(OSError) as c:
-            with subprocess.Popen(['nonexisting_i_hope'],
+            with subprocess.Popen(NONEXISTING_CMD,
                                   stdout=subprocess.PIPE,
                                   stderr=subprocess.PIPE) as proc:
                 pass
@@ -2863,7 +2907,7 @@ def test_communicate_stdin(self):
 
     def test_invalid_args(self):
         with self.assertRaises((FileNotFoundError, PermissionError)) as c:
-            with subprocess.Popen(['nonexisting_i_hope'],
+            with subprocess.Popen(NONEXISTING_CMD,
                                   stdout=subprocess.PIPE,
                                   stderr=subprocess.PIPE) as proc:
                 pass


From webhook-mailer at python.org  Mon Aug 21 18:17:18 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 21 Aug 2017 22:17:18 -0000
Subject: [Python-checkins] [3.6] bpo-30871: Add test.pythoninfo (#3174)
Message-ID: <mailman.82.1503353841.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/29d007bb670b486788f73c2d742b0ad0b679ff13
commit: 29d007bb670b486788f73c2d742b0ad0b679ff13
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-22T00:17:15+02:00
summary:

[3.6] bpo-30871: Add test.pythoninfo (#3174)

* bpo-30871: Add test.pythoninfo (#3075)

* Add Lib/test/pythoninfo.py: script collecting various informations
  about Python to help debugging test failures.
* regrtest: remove sys.hash_info and sys.flags from header.
* Travis CI, Appveyor: run pythoninfo before tests
(cherry picked from commit b907abc88589f7bea52c5afe172ececc6edcda70)

* bpo-30871: pythoninfo: add expat and _decimal (#3121)

* bpo-30871: pythoninfo: add expat and _decimal

* Remove _decimal.__version__

The string is hardcoded, not really interesting.

(cherry picked from commit f6ebd838f00b4c211c72d85ee49749e910cd3afe)

* bpo-30871: Add "make pythoninfo" (#3120)

(cherry picked from commit a3a01a2fceab2188b282ab9911f79c99a4c32273)

* bpo-30871: pythoninfo: more sys, os, time data (#3130)

* bpo-30871: pythoninfo: more sys, os, time data

PythonInfo now converts types other than intger to string by default.

* fix typo

(cherry picked from commit ad7eaed54382b346784e51a6f0122ce81e8842b5)

* bpo-31231: Fix pythoninfo in Travis config (#3134)

bpo-31231, bpo-30871: Replace "./python -m test.pythoninfo" with
"make pythoninfo", since macOS uses ./python.exe.
(cherry picked from commit 92b1f90143286385c0ff5be98d3721b90580a912)

files:
A Lib/test/pythoninfo.py
M .github/appveyor.yml
M .travis.yml
M Lib/test/libregrtest/main.py
M Makefile.pre.in

diff --git a/.github/appveyor.yml b/.github/appveyor.yml
index 38ca3c4de15..aa6c3ab88cc 100644
--- a/.github/appveyor.yml
+++ b/.github/appveyor.yml
@@ -7,6 +7,7 @@ branches:
     - buildbot-custom
 build_script:
 - cmd: PCbuild\build.bat -e
+- cmd: PCbuild\win32\python.exe -m test.pythoninfo
 test_script:
 - cmd: PCbuild\rt.bat -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0
 environment:
diff --git a/.travis.yml b/.travis.yml
index cf59d965a87..57b4c08a3e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,6 +59,7 @@ matrix:
             # Need a venv that can parse covered code.
             ./python -m venv venv
             ./venv/bin/python -m pip install -U coverage
+            ./venv/bin/python -m test.pythoninfo
       script:
         # Skip tests that re-run the entire test suite.
         - ./venv/bin/python -m coverage run --pylib -m test -uall,-cpu -x test_multiprocessing_fork -x test_multiprocessing_forkserver -x test_multiprocessing_spawn
@@ -86,6 +87,7 @@ before_script:
         echo "$changes"
         exit 1
       fi
+      make pythoninfo
 
 script:
   # Using the built Python as patchcheck.py is built around the idea of using
diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index bc8155bbff2..d44f69dda2f 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -423,8 +423,6 @@ def display_header(self):
         print("==", platform.python_implementation(), *sys.version.split())
         print("==", platform.platform(aliased=True),
                       "%s-endian" % sys.byteorder)
-        print("== hash algorithm:", sys.hash_info.algorithm,
-              "64bit" if sys.maxsize > 2**32 else "32bit")
         print("== cwd:", os.getcwd())
         cpu_count = os.cpu_count()
         if cpu_count:
@@ -432,7 +430,6 @@ def display_header(self):
         print("== encodings: locale=%s, FS=%s"
               % (locale.getpreferredencoding(False),
                  sys.getfilesystemencoding()))
-        print("Testing with flags:", sys.flags)
 
     def run_tests(self):
         # For a partial run, we do not need to clutter the output.
diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
new file mode 100644
index 00000000000..15cce34e822
--- /dev/null
+++ b/Lib/test/pythoninfo.py
@@ -0,0 +1,471 @@
+"""
+Collect various informations about Python to help debugging test failures.
+"""
+from __future__ import print_function
+import re
+import sys
+import traceback
+
+
+def normalize_text(text):
+    if text is None:
+        return None
+    text = str(text)
+    text = re.sub(r'\s+', ' ', text)
+    return text.strip()
+
+
+class PythonInfo:
+    def __init__(self):
+        self.info = {}
+
+    def add(self, key, value):
+        if key in self.info:
+            raise ValueError("duplicate key: %r" % key)
+
+        if value is None:
+            return
+
+        if not isinstance(value, int):
+            if not isinstance(value, str):
+                # convert other objects like sys.flags to string
+                value = str(value)
+
+            value = value.strip()
+            if not value:
+                return
+
+        self.info[key] = value
+
+    def get_infos(self):
+        """
+        Get informations as a key:value dictionary where values are strings.
+        """
+        return {key: str(value) for key, value in self.info.items()}
+
+
+def copy_attributes(info_add, obj, name_fmt, attributes, *, formatter=None):
+    for attr in attributes:
+        value = getattr(obj, attr, None)
+        if value is None:
+            continue
+        name = name_fmt % attr
+        if formatter is not None:
+            value = formatter(attr, value)
+        info_add(name, value)
+
+
+def call_func(info_add, name, mod, func_name, *, formatter=None):
+    try:
+        func = getattr(mod, func_name)
+    except AttributeError:
+        return
+    value = func()
+    if formatter is not None:
+        value = formatter(value)
+    info_add(name, value)
+
+
+def collect_sys(info_add):
+    attributes = (
+        '_framework',
+        'abiflags',
+        'api_version',
+        'builtin_module_names',
+        'byteorder',
+        'dont_write_bytecode',
+        'executable',
+        'flags',
+        'float_info',
+        'float_repr_style',
+        'hash_info',
+        'hexversion',
+        'implementation',
+        'int_info',
+        'maxsize',
+        'maxunicode',
+        'path',
+        'platform',
+        'prefix',
+        'thread_info',
+        'version',
+        'version_info',
+        'winver',
+    )
+    copy_attributes(info_add, sys, 'sys.%s', attributes)
+
+    call_func(info_add, 'sys.androidapilevel', sys, 'getandroidapilevel')
+    call_func(info_add, 'sys.windowsversion', sys, 'getwindowsversion')
+
+    encoding = sys.getfilesystemencoding()
+    if hasattr(sys, 'getfilesystemencodeerrors'):
+        encoding = '%s/%s' % (encoding, sys.getfilesystemencodeerrors())
+    info_add('sys.filesystem_encoding', encoding)
+
+    for name in ('stdin', 'stdout', 'stderr'):
+        stream = getattr(sys, name)
+        if stream is None:
+            continue
+        encoding = getattr(stream, 'encoding', None)
+        if not encoding:
+            continue
+        errors = getattr(stream, 'errors', None)
+        if errors:
+            encoding = '%s/%s' % (encoding, errors)
+        info_add('sys.%s.encoding' % name, encoding)
+
+
+def collect_platform(info_add):
+    import platform
+
+    arch = platform.architecture()
+    arch = ' '.join(filter(bool, arch))
+    info_add('platform.architecture', arch)
+
+    info_add('platform.python_implementation',
+             platform.python_implementation())
+    info_add('platform.platform',
+             platform.platform(aliased=True))
+
+
+def collect_locale(info_add):
+    import locale
+
+    info_add('locale.encoding', locale.getpreferredencoding(False))
+
+
+def collect_os(info_add):
+    import os
+
+    def format_attr(attr, value):
+        if attr in ('supports_follow_symlinks', 'supports_fd',
+                    'supports_effective_ids'):
+            return str(sorted(func.__name__ for func in value))
+        else:
+            return value
+
+    attributes = (
+        'name',
+        'supports_bytes_environ',
+        'supports_effective_ids',
+        'supports_fd',
+        'supports_follow_symlinks',
+    )
+    copy_attributes(info_add, os, 'os.%s', attributes, formatter=format_attr)
+
+    info_add("os.cwd", os.getcwd())
+
+    call_func(info_add, 'os.uid', os, 'getuid')
+    call_func(info_add, 'os.gid', os, 'getgid')
+    call_func(info_add, 'os.uname', os, 'uname')
+
+    if hasattr(os, 'getgroups'):
+        groups = os.getgroups()
+        groups = map(str, groups)
+        groups = ', '.join(groups)
+        info_add("os.groups", groups)
+
+    if hasattr(os, 'getlogin'):
+        try:
+            login = os.getlogin()
+        except OSError:
+            # getlogin() fails with "OSError: [Errno 25] Inappropriate ioctl
+            # for device" on Travis CI
+            pass
+        else:
+            info_add("os.login", login)
+
+    if hasattr(os, 'cpu_count'):
+        cpu_count = os.cpu_count()
+        if cpu_count:
+            info_add('os.cpu_count', cpu_count)
+
+    call_func(info_add, 'os.loadavg', os, 'getloadavg')
+
+    # Get environment variables: filter to list
+    # to not leak sensitive information
+    ENV_VARS = (
+        "CC",
+        "COMSPEC",
+        "DISPLAY",
+        "DISTUTILS_USE_SDK",
+        "DYLD_LIBRARY_PATH",
+        "HOME",
+        "HOMEDRIVE",
+        "HOMEPATH",
+        "LANG",
+        "LD_LIBRARY_PATH",
+        "MACOSX_DEPLOYMENT_TARGET",
+        "MAKEFLAGS",
+        "MSSDK",
+        "PATH",
+        "SDK_TOOLS_BIN",
+        "SHELL",
+        "TEMP",
+        "TERM",
+        "TMP",
+        "TMPDIR",
+        "USERPROFILE",
+        "WAYLAND_DISPLAY",
+    )
+    for name, value in os.environ.items():
+        uname = name.upper()
+        if (uname in ENV_VARS or uname.startswith(("PYTHON", "LC_"))
+           # Visual Studio: VS140COMNTOOLS
+           or (uname.startswith("VS") and uname.endswith("COMNTOOLS"))):
+            info_add('os.environ[%s]' % name, value)
+
+    if hasattr(os, 'umask'):
+        mask = os.umask(0)
+        os.umask(mask)
+        info_add("os.umask", '%03o' % mask)
+
+    if hasattr(os, 'getrandom'):
+        # PEP 524: Check if system urandom is initialized
+        try:
+            os.getrandom(1, os.GRND_NONBLOCK)
+            state = 'ready (initialized)'
+        except BlockingIOError as exc:
+            state = 'not seeded yet (%s)' % exc
+        info_add('os.getrandom', state)
+
+
+def collect_readline(info_add):
+    try:
+        import readline
+    except ImportError:
+        return
+
+    def format_attr(attr, value):
+        if isinstance(value, int):
+            return "%#x" % value
+        else:
+            return value
+
+    attributes = (
+        "_READLINE_VERSION",
+        "_READLINE_RUNTIME_VERSION",
+        "_READLINE_LIBRARY_VERSION",
+    )
+    copy_attributes(info_add, readline, 'readline.%s', attributes,
+                    formatter=format_attr)
+
+
+def collect_gdb(info_add):
+    import subprocess
+
+    try:
+        proc = subprocess.Popen(["gdb", "-nx", "--version"],
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE,
+                                universal_newlines=True)
+        version = proc.communicate()[0]
+    except OSError:
+        return
+
+    # Only keep the first line
+    version = version.splitlines()[0]
+    info_add('gdb_version', version)
+
+
+def collect_tkinter(info_add):
+    try:
+        import _tkinter
+    except ImportError:
+        pass
+    else:
+        attributes = ('TK_VERSION', 'TCL_VERSION')
+        copy_attributes(info_add, _tkinter, 'tkinter.%s', attributes)
+
+    try:
+        import tkinter
+    except ImportError:
+        pass
+    else:
+        tcl = tkinter.Tcl()
+        patchlevel = tcl.call('info', 'patchlevel')
+        info_add('tkinter.info_patchlevel', patchlevel)
+
+
+def collect_time(info_add):
+    import time
+
+    attributes = (
+        'altzone',
+        'daylight',
+        'timezone',
+        'tzname',
+    )
+    copy_attributes(info_add, time, 'time.%s', attributes)
+
+    if not hasattr(time, 'get_clock_info'):
+        return
+
+    for clock in ('time', 'perf_counter'):
+        tinfo = time.get_clock_info(clock)
+        info_add('time.%s' % clock, tinfo)
+
+
+def collect_sysconfig(info_add):
+    import sysconfig
+
+    for name in (
+        'ABIFLAGS',
+        'ANDROID_API_LEVEL',
+        'CC',
+        'CCSHARED',
+        'CFLAGS',
+        'CFLAGSFORSHARED',
+        'PY_LDFLAGS',
+        'CONFIG_ARGS',
+        'HOST_GNU_TYPE',
+        'MACHDEP',
+        'MULTIARCH',
+        'OPT',
+        'PY_CFLAGS',
+        'PY_CFLAGS_NODIST',
+        'Py_DEBUG',
+        'Py_ENABLE_SHARED',
+        'SHELL',
+        'SOABI',
+        'prefix',
+    ):
+        value = sysconfig.get_config_var(name)
+        if name == 'ANDROID_API_LEVEL' and not value:
+            # skip ANDROID_API_LEVEL=0
+            continue
+        value = normalize_text(value)
+        info_add('sysconfig[%s]' % name, value)
+
+
+def collect_ssl(info_add):
+    try:
+        import ssl
+    except ImportError:
+        return
+
+    def format_attr(attr, value):
+        if attr.startswith('OP_'):
+            return '%#8x' % value
+        else:
+            return value
+
+    attributes = (
+        'OPENSSL_VERSION',
+        'OPENSSL_VERSION_INFO',
+        'HAS_SNI',
+        'OP_ALL',
+        'OP_NO_TLSv1_1',
+    )
+    copy_attributes(info_add, ssl, 'ssl.%s', attributes, formatter=format_attr)
+
+
+def collect_socket(info_add):
+    import socket
+
+    hostname = socket.gethostname()
+    info_add('socket.hostname', hostname)
+
+
+def collect_sqlite(info_add):
+    try:
+        import sqlite3
+    except ImportError:
+        return
+
+    attributes = ('version', 'sqlite_version')
+    copy_attributes(info_add, sqlite3, 'sqlite3.%s', attributes)
+
+
+def collect_zlib(info_add):
+    try:
+        import zlib
+    except ImportError:
+        return
+
+    attributes = ('ZLIB_VERSION', 'ZLIB_RUNTIME_VERSION')
+    copy_attributes(info_add, zlib, 'zlib.%s', attributes)
+
+
+def collect_expat(info_add):
+    try:
+        from xml.parsers import expat
+    except ImportError:
+        return
+
+    attributes = ('EXPAT_VERSION',)
+    copy_attributes(info_add, expat, 'expat.%s', attributes)
+
+
+def collect_decimal(info_add):
+    try:
+        import _decimal
+    except ImportError:
+        return
+
+    attributes = ('__libmpdec_version__',)
+    copy_attributes(info_add, _decimal, '_decimal.%s', attributes)
+
+
+def collect_info(info):
+    error = False
+    info_add = info.add
+
+    for collect_func in (
+        # collect_os() should be the first, to check the getrandom() status
+        collect_os,
+
+        collect_gdb,
+        collect_locale,
+        collect_platform,
+        collect_readline,
+        collect_socket,
+        collect_sqlite,
+        collect_ssl,
+        collect_sys,
+        collect_sysconfig,
+        collect_time,
+        collect_tkinter,
+        collect_zlib,
+        collect_expat,
+        collect_decimal,
+    ):
+        try:
+            collect_func(info_add)
+        except Exception as exc:
+            error = True
+            print("ERROR: %s() failed" % (collect_func.__name__),
+                  file=sys.stderr)
+            traceback.print_exc(file=sys.stderr)
+            print(file=sys.stderr)
+            sys.stderr.flush()
+
+    return error
+
+
+def dump_info(info, file=None):
+    title = "Python debug information"
+    print(title)
+    print("=" * len(title))
+    print()
+
+    infos = info.get_infos()
+    infos = sorted(infos.items())
+    for key, value in infos:
+        value = value.replace("\n", " ")
+        print("%s: %s" % (key, value))
+    print()
+
+
+def main():
+    info = PythonInfo()
+    error = collect_info(info)
+    dump_info(info)
+
+    if error:
+        print("Collection failed: exit with error", file=sys.stderr)
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 93a2bab6d98..0a8ac713017 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1001,6 +1001,8 @@ TESTPYTHON=	$(RUNSHARED) ./$(BUILDPYTHON) $(TESTPYTHONOPTS)
 TESTRUNNER=	$(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py
 TESTTIMEOUT=	1200
 
+.PHONY: test testall testuniversal buildbottest pythoninfo
+
 # Run a basic set of regression tests.
 # This excludes some tests that are particularly resource-intensive.
 test:		@DEF_MAKE_RULE@ platform
@@ -1039,6 +1041,9 @@ buildbottest:	build_all platform
 		fi
 		$(TESTRUNNER) -j 1 -u all -W --slowest --timeout=$(TESTTIMEOUT) $(TESTOPTS)
 
+pythoninfo: build_all
+		$(RUNSHARED) ./$(BUILDPYTHON) -m test.pythoninfo
+
 QUICKTESTOPTS=	$(TESTOPTS) -x test_subprocess test_io test_lib2to3 \
 		test_multibytecodec test_urllib2_localnet test_itertools \
 		test_multiprocessing_fork test_multiprocessing_spawn \


From webhook-mailer at python.org  Mon Aug 21 18:46:36 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Mon, 21 Aug 2017 22:46:36 -0000
Subject: [Python-checkins] bpo-23835: Enforce that configparser defaults are
 strings (#2558)
Message-ID: <mailman.83.1503355600.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/44e6ad87340d50f48daf53b6a61138377d0d0d10
commit: 44e6ad87340d50f48daf53b6a61138377d0d0d10
branch: master
author: James Tocknell <aragilar+github at gmail.com>
committer: ?ukasz Langa <lukasz at langa.pl>
date: 2017-08-21T15:46:30-07:00
summary:

bpo-23835: Enforce that configparser defaults are strings (#2558)

* Enforce that configparser defaults are strings
* Update test_configparser.py

files:
M Lib/configparser.py
M Lib/test/test_configparser.py

diff --git a/Lib/configparser.py b/Lib/configparser.py
index ea971f39338..360924008dc 100644
--- a/Lib/configparser.py
+++ b/Lib/configparser.py
@@ -610,9 +610,6 @@ def __init__(self, defaults=None, dict_type=_default_dict,
         self._converters = ConverterMapping(self)
         self._proxies = self._dict()
         self._proxies[default_section] = SectionProxy(self, default_section)
-        if defaults:
-            for key, value in defaults.items():
-                self._defaults[self.optionxform(key)] = value
         self._delimiters = tuple(delimiters)
         if delimiters == ('=', ':'):
             self._optcre = self.OPTCRE_NV if allow_no_value else self.OPTCRE
@@ -637,6 +634,8 @@ def __init__(self, defaults=None, dict_type=_default_dict,
             self._interpolation = Interpolation()
         if converters is not _UNSET:
             self._converters.update(converters)
+        if defaults:
+            self.read_dict({default_section: defaults})
 
     def defaults(self):
         return self._defaults
diff --git a/Lib/test/test_configparser.py b/Lib/test/test_configparser.py
index 72c3f19fb41..be22fa40310 100644
--- a/Lib/test/test_configparser.py
+++ b/Lib/test/test_configparser.py
@@ -855,6 +855,15 @@ def test_invalid_multiline_value(self):
         self.assertEqual(cf.get('DEFAULT', 'test'), 'test')
         self.assertEqual(cf['DEFAULT']['test'], 'test')
 
+    def test_defaults_keyword(self):
+        # test that bpo-23835 is fixed
+        cf = self.newconfig(defaults={1: 2.4})
+        self.assertEqual(cf[self.default_section]['1'], '2.4')
+        self.assertAlmostEqual(cf[self.default_section].getfloat('1'), 2.4)
+        cf = self.newconfig(defaults={"A": 5.2})
+        self.assertEqual(cf[self.default_section]['a'], '5.2')
+        self.assertAlmostEqual(cf[self.default_section].getfloat('a'), 5.2)
+
 
 class StrictTestCase(BasicTestCase, unittest.TestCase):
     config_class = configparser.RawConfigParser


From webhook-mailer at python.org  Mon Aug 21 19:23:41 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Mon, 21 Aug 2017 23:23:41 -0000
Subject: [Python-checkins] bpo-23835: [docs] configparser converts defaults
 to strings (#3176)
Message-ID: <mailman.84.1503357823.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/ea57923e89aa4a1bde1d4fa1de7d6eacff603683
commit: ea57923e89aa4a1bde1d4fa1de7d6eacff603683
branch: master
author: ?ukasz Langa <lukasz at langa.pl>
committer: GitHub <noreply at github.com>
date: 2017-08-21T16:23:38-07:00
summary:

bpo-23835: [docs] configparser converts defaults to strings (#3176)

Title says all.

files:
A Misc/NEWS.d/next/Library/2017-08-21-16-06-19.bpo-23835.da_4Kz.rst
M Doc/library/configparser.rst
M Misc/ACKS

diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
index 61eab4e6a4b..c31a7e94651 100644
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -944,6 +944,11 @@ ConfigParser Objects
    .. versionchanged:: 3.5
       The *converters* argument was added.
 
+   .. versionchanged:: 3.7
+      The *defaults* argument is read with :meth:`read_dict()`,
+      providing consistent behavior across the parser: non-string
+      keys and values are implicitly converted to strings.
+
 
    .. method:: defaults()
 
@@ -1325,4 +1330,3 @@ Exceptions
 .. [1] Config parsers allow for heavy customization.  If you are interested in
        changing the behaviour outlined by the footnote reference, consult the
        `Customizing Parser Behaviour`_ section.
-
diff --git a/Misc/ACKS b/Misc/ACKS
index 21fc6bbbd3a..e3e02eb6a5f 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1578,6 +1578,7 @@ Jason Tishler
 Christian Tismer
 Jim Tittsler
 Frank J. Tobin
+James Tocknell
 Bennett Todd
 R Lindsay Todd
 Eugene Toder
diff --git a/Misc/NEWS.d/next/Library/2017-08-21-16-06-19.bpo-23835.da_4Kz.rst b/Misc/NEWS.d/next/Library/2017-08-21-16-06-19.bpo-23835.da_4Kz.rst
new file mode 100644
index 00000000000..5e15ed9669e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-21-16-06-19.bpo-23835.da_4Kz.rst
@@ -0,0 +1,4 @@
+configparser: reading defaults in the ``ConfigParser()`` constructor is now
+using ``read_dict()``, making its behavior consistent with the rest of the
+parser.  Non-string keys and values in the defaults dictionary are now being
+implicitly converted to strings.  Patch by James Tocknell.


From webhook-mailer at python.org  Mon Aug 21 19:40:32 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Mon, 21 Aug 2017 23:40:32 -0000
Subject: [Python-checkins] bpo-30983: [gdb] Fix py-bt,
 etc. for non-debug shared builds (#3153)
Message-ID: <mailman.85.1503358836.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/5fe59f8e3a0a56a155c18f9d581205ec533764b6
commit: 5fe59f8e3a0a56a155c18f9d581205ec533764b6
branch: master
author: ?ukasz Langa <lukasz at langa.pl>
committer: GitHub <noreply at github.com>
date: 2017-08-21T16:40:29-07:00
summary:

bpo-30983: [gdb] Fix py-bt, etc. for non-debug shared builds (#3153)

PEP 523 introduced _PyEval_EvalFrameDefault which inlines PyEval_EvalFrameEx on
non-debug shared builds.  This breaks the ability to use py-bt, py-up, and
a few other Python-specific gdb integrations.

This patch fixes the problem by only looking for _PyEval_EvalFrameDefault
frames.

test_gdb passes on both a debug and a non-debug build.

Original patch by Bruno "Polaco" Penteado.

files:
A Misc/NEWS.d/next/Tools-Demos/2017-08-18-17-19-23.bpo-30983.ggGz9z.rst
M Misc/ACKS
M Tools/gdb/libpython.py

diff --git a/Misc/ACKS b/Misc/ACKS
index e3e02eb6a5f..b2e05920489 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1185,6 +1185,7 @@ Berker Peksag
 Andreas Pelme
 Steven Pemberton
 Bo Peng
+Bruno "Polaco" Penteado
 Santiago Peres?n
 George Peristerakis
 Thomas Perl
diff --git a/Misc/NEWS.d/next/Tools-Demos/2017-08-18-17-19-23.bpo-30983.ggGz9z.rst b/Misc/NEWS.d/next/Tools-Demos/2017-08-18-17-19-23.bpo-30983.ggGz9z.rst
new file mode 100644
index 00000000000..404263e9ac8
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2017-08-18-17-19-23.bpo-30983.ggGz9z.rst
@@ -0,0 +1,6 @@
+gdb integration commands (py-bt, etc.) work on optimized shared builds now,
+too.  PEP 523 introduced _PyEval_EvalFrameDefault which inlines
+PyEval_EvalFrameEx on non-debug shared builds.  This broke the ability to
+use py-bt, py-up, and a few other Python-specific gdb integrations. The
+problem is fixed by only looking for _PyEval_EvalFrameDefault frames in
+python-gdb.py.  Original patch by Bruno "Polaco" Penteado.
diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index cc23b8402df..839ce799797 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -99,6 +99,8 @@ def _sizeof_void_p():
 
 ENCODING = locale.getpreferredencoding()
 
+EVALFRAME = '_PyEval_EvalFrameDefault'
+
 class NullPyObjectPtr(RuntimeError):
     pass
 
@@ -1492,18 +1494,18 @@ def get_index(self):
     #   - everything else
 
     def is_python_frame(self):
-        '''Is this a PyEval_EvalFrameEx frame, or some other important
+        '''Is this a _PyEval_EvalFrameDefault frame, or some other important
         frame? (see is_other_python_frame for what "important" means in this
         context)'''
-        if self.is_evalframeex():
+        if self.is_evalframe():
             return True
         if self.is_other_python_frame():
             return True
         return False
 
-    def is_evalframeex(self):
-        '''Is this a PyEval_EvalFrameEx frame?'''
-        if self._gdbframe.name() == 'PyEval_EvalFrameEx':
+    def is_evalframe(self):
+        '''Is this a _PyEval_EvalFrameDefault frame?'''
+        if self._gdbframe.name() == EVALFRAME:
             '''
             I believe we also need to filter on the inline
             struct frame_id.inline_depth, only regarding frames with
@@ -1512,7 +1514,7 @@ def is_evalframeex(self):
             So we reject those with type gdb.INLINE_FRAME
             '''
             if self._gdbframe.type() == gdb.NORMAL_FRAME:
-                # We have a PyEval_EvalFrameEx frame:
+                # We have a _PyEval_EvalFrameDefault frame:
                 return True
 
         return False
@@ -1626,7 +1628,7 @@ def get_selected_bytecode_frame(cls):
         frame = cls.get_selected_frame()
 
         while frame:
-            if frame.is_evalframeex():
+            if frame.is_evalframe():
                 return frame
             frame = frame.older()
 
@@ -1634,7 +1636,7 @@ def get_selected_bytecode_frame(cls):
         return None
 
     def print_summary(self):
-        if self.is_evalframeex():
+        if self.is_evalframe():
             pyop = self.get_pyop()
             if pyop:
                 line = pyop.get_truncated_repr(MAX_OUTPUT_LEN)
@@ -1653,7 +1655,7 @@ def print_summary(self):
                 sys.stdout.write('#%i\n' % self.get_index())
 
     def print_traceback(self):
-        if self.is_evalframeex():
+        if self.is_evalframe():
             pyop = self.get_pyop()
             if pyop:
                 pyop.print_traceback()


From webhook-mailer at python.org  Mon Aug 21 21:40:31 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 22 Aug 2017 01:40:31 -0000
Subject: [Python-checkins] bpo-30871: Add test.pythoninfo (#3174) (#3175)
Message-ID: <mailman.86.1503366032.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/cce1cb9180dd9143c5b2ce094a52c555b42c7aa8
commit: cce1cb9180dd9143c5b2ce094a52c555b42c7aa8
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-22T03:40:26+02:00
summary:

bpo-30871: Add test.pythoninfo (#3174) (#3175)

* bpo-30871: Add test.pythoninfo (#3075)

* Add Lib/test/pythoninfo.py: script collecting various informations
  about Python to help debugging test failures.
* regrtest: remove sys.hash_info and sys.flags from header.
* Travis CI, Appveyor: run pythoninfo before tests
(cherry picked from commit b907abc88589f7bea52c5afe172ececc6edcda70)

* bpo-30871: pythoninfo: add expat and _decimal (#3121)

* bpo-30871: pythoninfo: add expat and _decimal

* Remove _decimal.__version__

The string is hardcoded, not really interesting.

(cherry picked from commit f6ebd838f00b4c211c72d85ee49749e910cd3afe)

* bpo-30871: Add "make pythoninfo" (#3120)

(cherry picked from commit a3a01a2fceab2188b282ab9911f79c99a4c32273)

* bpo-30871: pythoninfo: more sys, os, time data (#3130)

* bpo-30871: pythoninfo: more sys, os, time data

PythonInfo now converts types other than intger to string by default.

* fix typo

(cherry picked from commit ad7eaed54382b346784e51a6f0122ce81e8842b5)

* bpo-31231: Fix pythoninfo in Travis config (#3134)

bpo-31231, bpo-30871: Replace "./python -m test.pythoninfo" with
"make pythoninfo", since macOS uses ./python.exe.
(cherry picked from commit 92b1f90143286385c0ff5be98d3721b90580a912)

(cherry picked from commit 29d007bb670b486788f73c2d742b0ad0b679ff13)

files:
A Lib/test/pythoninfo.py
M .github/appveyor.yml
M .travis.yml
M Lib/test/regrtest.py
M Makefile.pre.in

diff --git a/.github/appveyor.yml b/.github/appveyor.yml
index 2f904cacd94..34c5e8b6843 100644
--- a/.github/appveyor.yml
+++ b/.github/appveyor.yml
@@ -7,6 +7,7 @@ branches:
     - buildbot-custom
 build_script:
 - cmd: PCbuild\build.bat -e
+- cmd: PCbuild\python.exe -m test.pythoninfo
 test_script:
 - cmd: PCbuild\rt.bat -q -uall -u-cpu -rwW --slowest -j2
 
diff --git a/.travis.yml b/.travis.yml
index 929cf647020..d73cb9e3189 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,6 +63,7 @@ before_script:
         echo "$changes"
         exit 1
       fi
+      make pythoninfo
 
 script:
   # `-r -w` implicitly provided through `make buildbottest`.
diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
new file mode 100644
index 00000000000..83b1ec726e4
--- /dev/null
+++ b/Lib/test/pythoninfo.py
@@ -0,0 +1,433 @@
+"""
+Collect various informations about Python to help debugging test failures.
+"""
+from __future__ import print_function
+import re
+import sys
+import traceback
+
+
+def normalize_text(text):
+    if text is None:
+        return None
+    text = str(text)
+    text = re.sub(r'\s+', ' ', text)
+    return text.strip()
+
+
+class PythonInfo:
+    def __init__(self):
+        self.info = {}
+
+    def add(self, key, value):
+        if key in self.info:
+            raise ValueError("duplicate key: %r" % key)
+
+        if value is None:
+            return
+
+        if not isinstance(value, (int, long)):
+            if not isinstance(value, basestring):
+                # convert other objects like sys.flags to string
+                value = str(value)
+
+            value = value.strip()
+            if not value:
+                return
+
+        self.info[key] = value
+
+    def get_infos(self):
+        """
+        Get informations as a key:value dictionary where values are strings.
+        """
+        return {key: str(value) for key, value in self.info.items()}
+
+
+def copy_attributes(info_add, obj, name_fmt, attributes, formatter=None):
+    for attr in attributes:
+        value = getattr(obj, attr, None)
+        if value is None:
+            continue
+        name = name_fmt % attr
+        if formatter is not None:
+            value = formatter(attr, value)
+        info_add(name, value)
+
+
+def call_func(info_add, name, mod, func_name, formatter=None):
+    try:
+        func = getattr(mod, func_name)
+    except AttributeError:
+        return
+    value = func()
+    if formatter is not None:
+        value = formatter(value)
+    info_add(name, value)
+
+
+def collect_sys(info_add):
+    attributes = (
+        'api_version',
+        'builtin_module_names',
+        'byteorder',
+        'dont_write_bytecode',
+        'executable',
+        'flags',
+        'float_info',
+        'float_repr_style',
+        'hexversion',
+        'maxint',
+        'maxsize',
+        'maxunicode',
+        'path',
+        'platform',
+        'prefix',
+        'version',
+        'version_info',
+        'winver',
+    )
+    copy_attributes(info_add, sys, 'sys.%s', attributes)
+
+    encoding = sys.getfilesystemencoding()
+    info_add('sys.filesystem_encoding', encoding)
+
+    for name in ('stdin', 'stdout', 'stderr'):
+        stream = getattr(sys, name)
+        if stream is None:
+            continue
+        encoding = getattr(stream, 'encoding', None)
+        if not encoding:
+            continue
+        errors = getattr(stream, 'errors', None)
+        if errors:
+            encoding = '%s/%s' % (encoding, errors)
+        info_add('sys.%s.encoding' % name, encoding)
+
+
+def collect_platform(info_add):
+    import platform
+
+    arch = platform.architecture()
+    arch = ' '.join(filter(bool, arch))
+    info_add('platform.architecture', arch)
+
+    info_add('platform.python_implementation',
+             platform.python_implementation())
+    info_add('platform.platform',
+             platform.platform(aliased=True))
+
+
+def collect_locale(info_add):
+    import locale
+
+    info_add('locale.encoding', locale.getpreferredencoding(True))
+
+
+def collect_os(info_add):
+    import os
+
+    attributes = ('name',)
+    copy_attributes(info_add, os, 'os.%s', attributes)
+
+    info_add("os.cwd", os.getcwd())
+
+    call_func(info_add, 'os.uid', os, 'getuid')
+    call_func(info_add, 'os.gid', os, 'getgid')
+    call_func(info_add, 'os.uname', os, 'uname')
+
+    if hasattr(os, 'getgroups'):
+        groups = os.getgroups()
+        groups = map(str, groups)
+        groups = ', '.join(groups)
+        info_add("os.groups", groups)
+
+    if hasattr(os, 'getlogin'):
+        try:
+            login = os.getlogin()
+        except OSError:
+            # getlogin() fails with "OSError: [Errno 25] Inappropriate ioctl
+            # for device" on Travis CI
+            pass
+        else:
+            info_add("os.login", login)
+
+    call_func(info_add, 'os.loadavg', os, 'getloadavg')
+
+    # Get environment variables: filter to list
+    # to not leak sensitive information
+    ENV_VARS = (
+        "CC",
+        "COMSPEC",
+        "DISPLAY",
+        "DISTUTILS_USE_SDK",
+        "DYLD_LIBRARY_PATH",
+        "HOME",
+        "HOMEDRIVE",
+        "HOMEPATH",
+        "LANG",
+        "LD_LIBRARY_PATH",
+        "MACOSX_DEPLOYMENT_TARGET",
+        "MAKEFLAGS",
+        "MSSDK",
+        "PATH",
+        "SDK_TOOLS_BIN",
+        "SHELL",
+        "TEMP",
+        "TERM",
+        "TMP",
+        "TMPDIR",
+        "USERPROFILE",
+        "WAYLAND_DISPLAY",
+    )
+    for name, value in os.environ.items():
+        uname = name.upper()
+        if (uname in ENV_VARS or uname.startswith(("PYTHON", "LC_"))
+           # Visual Studio: VS140COMNTOOLS
+           or (uname.startswith("VS") and uname.endswith("COMNTOOLS"))):
+            info_add('os.environ[%s]' % name, value)
+
+    if hasattr(os, 'umask'):
+        mask = os.umask(0)
+        os.umask(mask)
+        info_add("os.umask", '%03o' % mask)
+
+    try:
+        cpu_count = os.sysconf('SC_NPROCESSORS_ONLN')
+    except (AttributeError, ValueError):
+        pass
+    else:
+        if cpu_count:
+            info_add('os.sysconf(SC_NPROCESSORS_ONLN)', cpu_count)
+
+
+def collect_readline(info_add):
+    try:
+        import readline
+    except ImportError:
+        return
+
+    def format_attr(attr, value):
+        if isinstance(value, (int, long)):
+            return "%#x" % value
+        else:
+            return value
+
+    attributes = (
+        "_READLINE_VERSION",
+        "_READLINE_RUNTIME_VERSION",
+    )
+    copy_attributes(info_add, readline, 'readline.%s', attributes,
+                    formatter=format_attr)
+
+
+def collect_gdb(info_add):
+    import subprocess
+
+    try:
+        proc = subprocess.Popen(["gdb", "-nx", "--version"],
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE,
+                                universal_newlines=True)
+        version = proc.communicate()[0]
+    except OSError:
+        return
+
+    # Only keep the first line
+    version = version.splitlines()[0]
+    info_add('gdb_version', version)
+
+
+def collect_tkinter(info_add):
+    try:
+        import _tkinter
+    except ImportError:
+        pass
+    else:
+        attributes = ('TK_VERSION', 'TCL_VERSION')
+        copy_attributes(info_add, _tkinter, 'tkinter.%s', attributes)
+
+    try:
+        import Tkinter
+    except ImportError:
+        pass
+    else:
+        tcl = Tkinter.Tcl()
+        patchlevel = tcl.call('info', 'patchlevel')
+        info_add('tkinter.info_patchlevel', patchlevel)
+
+
+def collect_time(info_add):
+    import time
+
+    attributes = (
+        'altzone',
+        'daylight',
+        'timezone',
+        'tzname',
+    )
+    copy_attributes(info_add, time, 'time.%s', attributes)
+
+
+def collect_sysconfig(info_add):
+    import sysconfig
+
+    for name in (
+        'ABIFLAGS',
+        'ANDROID_API_LEVEL',
+        'CC',
+        'CCSHARED',
+        'CFLAGS',
+        'CFLAGSFORSHARED',
+        'PY_LDFLAGS',
+        'CONFIG_ARGS',
+        'HOST_GNU_TYPE',
+        'MACHDEP',
+        'MULTIARCH',
+        'OPT',
+        'PY_CFLAGS',
+        'PY_CFLAGS_NODIST',
+        'Py_DEBUG',
+        'Py_ENABLE_SHARED',
+        'SHELL',
+        'SOABI',
+        'prefix',
+    ):
+        value = sysconfig.get_config_var(name)
+        if name == 'ANDROID_API_LEVEL' and not value:
+            # skip ANDROID_API_LEVEL=0
+            continue
+        value = normalize_text(value)
+        info_add('sysconfig[%s]' % name, value)
+
+
+def collect_ssl(info_add):
+    try:
+        import ssl
+    except ImportError:
+        return
+
+    def format_attr(attr, value):
+        if attr.startswith('OP_'):
+            return '%#8x' % value
+        else:
+            return value
+
+    attributes = (
+        'OPENSSL_VERSION',
+        'OPENSSL_VERSION_INFO',
+        'HAS_SNI',
+        'OP_ALL',
+        'OP_NO_TLSv1_1',
+    )
+    copy_attributes(info_add, ssl, 'ssl.%s', attributes, formatter=format_attr)
+
+
+def collect_socket(info_add):
+    import socket
+
+    hostname = socket.gethostname()
+    info_add('socket.hostname', hostname)
+
+
+def collect_sqlite(info_add):
+    try:
+        import sqlite3
+    except ImportError:
+        return
+
+    attributes = ('version', 'sqlite_version')
+    copy_attributes(info_add, sqlite3, 'sqlite3.%s', attributes)
+
+
+def collect_zlib(info_add):
+    try:
+        import zlib
+    except ImportError:
+        return
+
+    attributes = ('ZLIB_VERSION', 'ZLIB_RUNTIME_VERSION')
+    copy_attributes(info_add, zlib, 'zlib.%s', attributes)
+
+
+def collect_expat(info_add):
+    try:
+        from xml.parsers import expat
+    except ImportError:
+        return
+
+    attributes = ('EXPAT_VERSION',)
+    copy_attributes(info_add, expat, 'expat.%s', attributes)
+
+
+def collect_multiprocessing(info_add):
+    try:
+        import multiprocessing
+    except ImportError:
+        return
+
+    cpu_count = multiprocessing.cpu_count()
+    if cpu_count:
+        info_add('multiprocessing.cpu_count', cpu_count)
+
+
+def collect_info(info):
+    error = False
+    info_add = info.add
+
+    for collect_func in (
+        collect_expat,
+        collect_gdb,
+        collect_locale,
+        collect_os,
+        collect_platform,
+        collect_readline,
+        collect_socket,
+        collect_sqlite,
+        collect_ssl,
+        collect_sys,
+        collect_sysconfig,
+        collect_time,
+        collect_tkinter,
+        collect_zlib,
+        collect_multiprocessing,
+    ):
+        try:
+            collect_func(info_add)
+        except Exception as exc:
+            error = True
+            print("ERROR: %s() failed" % (collect_func.__name__),
+                  file=sys.stderr)
+            traceback.print_exc(file=sys.stderr)
+            print(file=sys.stderr)
+            sys.stderr.flush()
+
+    return error
+
+
+def dump_info(info, file=None):
+    title = "Python debug information"
+    print(title)
+    print("=" * len(title))
+    print()
+
+    infos = info.get_infos()
+    infos = sorted(infos.items())
+    for key, value in infos:
+        value = value.replace("\n", " ")
+        print("%s: %s" % (key, value))
+    print()
+
+
+def main():
+    info = PythonInfo()
+    error = collect_info(info)
+    dump_info(info)
+
+    if error:
+        print("Collection failed: exit with error", file=sys.stderr)
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 83434c88024..d836468852f 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -668,7 +668,6 @@ def display_progress(test_index, test):
         ncpu = cpu_count()
         if ncpu:
             print "== CPU count:", ncpu
-        print "Testing with flags:", sys.flags
 
     if randomize:
         random.seed(random_seed)
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 4f9a7bf9b6a..54e9480e215 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -841,6 +841,8 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
 # generated bytecode.  This is sometimes a very shy bug needing a lot of
 # sample data.
 
+.PHONY: test testall testuniversal buildbottest pythoninfo
+
 TESTOPTS=	-l $(EXTRATESTOPTS)
 TESTPROG=	$(srcdir)/Lib/test/regrtest.py
 TESTPYTHON=	$(RUNSHARED) ./$(BUILDPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)
@@ -877,6 +879,9 @@ buildbottest:	build_all platform
 		fi
 		$(TESTPYTHON) -R $(TESTPROG) -uall --slowest -rwW $(TESTOPTS)
 
+pythoninfo: build_all
+		$(RUNSHARED) ./$(BUILDPYTHON) -m test.pythoninfo
+
 QUICKTESTOPTS=	$(TESTOPTS) -x test_subprocess test_io test_lib2to3 \
 		test_multibytecodec test_urllib2_localnet test_itertools \
 		test_multiprocessing test_mailbox test_socket test_poll \


From solipsis at pitrou.net  Tue Aug 22 05:06:00 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 22 Aug 2017 09:06:00 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=11
Message-ID: <20170822090559.92842.0ECDDCEA3A0AB8D0@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [0, 0, 7] memory blocks, sum=7
test_functools leaked [0, 3, 1] memory blocks, sum=4


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogGNaEHp', '--timeout', '7200']

From webhook-mailer at python.org  Tue Aug 22 10:50:46 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 22 Aug 2017 14:50:46 -0000
Subject: [Python-checkins] bpo-31249: Fix ref cycle in ThreadPoolExecutor
 (#3178)
Message-ID: <mailman.87.1503413449.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/bc61315377056fe362b744d9c44e17cd3178ce54
commit: bc61315377056fe362b744d9c44e17cd3178ce54
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-22T16:50:42+02:00
summary:

bpo-31249: Fix ref cycle in ThreadPoolExecutor (#3178)

* bpo-31249: Fix ref cycle in ThreadPoolExecutor

concurrent.futures: WorkItem.run() used by ThreadPoolExecutor now
breaks a reference cycle between an exception object and the WorkItem
object. ThreadPoolExecutor.shutdown() now also clears its threads
set.

* shutdown() now only clears threads if wait is true.

* Revert changes on shutdown()

files:
A Misc/NEWS.d/next/Library/2017-08-22-12-44-48.bpo-31249.STPbb9.rst
M Lib/concurrent/futures/thread.py

diff --git a/Lib/concurrent/futures/thread.py b/Lib/concurrent/futures/thread.py
index 1f0a1d4b977..0b5d5373ffd 100644
--- a/Lib/concurrent/futures/thread.py
+++ b/Lib/concurrent/futures/thread.py
@@ -54,8 +54,10 @@ def run(self):
 
         try:
             result = self.fn(*self.args, **self.kwargs)
-        except BaseException as e:
-            self.future.set_exception(e)
+        except BaseException as exc:
+            self.future.set_exception(exc)
+            # Break a reference cycle with the exception 'exc'
+            self = None
         else:
             self.future.set_result(result)
 
diff --git a/Misc/NEWS.d/next/Library/2017-08-22-12-44-48.bpo-31249.STPbb9.rst b/Misc/NEWS.d/next/Library/2017-08-22-12-44-48.bpo-31249.STPbb9.rst
new file mode 100644
index 00000000000..f11a66802d1
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-22-12-44-48.bpo-31249.STPbb9.rst
@@ -0,0 +1,2 @@
+concurrent.futures: WorkItem.run() used by ThreadPoolExecutor now breaks a
+reference cycle between an exception object and the WorkItem object.


From webhook-mailer at python.org  Tue Aug 22 10:51:12 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 22 Aug 2017 14:51:12 -0000
Subject: [Python-checkins] bpo-31258: test_signal: call waitpid() to prevent
 zombie process (#3183)
Message-ID: <mailman.88.1503413474.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/1460ce5a9325690d8a1913c296a9bba437ff0f39
commit: 1460ce5a9325690d8a1913c296a9bba437ff0f39
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-22T16:51:09+02:00
summary:

bpo-31258: test_signal: call waitpid() to prevent zombie process (#3183)

files:
M Lib/test/test_signal.py

diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 27054f17ba7..5cff13a0dff 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -185,6 +185,9 @@ def test_main(self):
                 self.fail('Test deadlocked after %d seconds.' %
                           self.MAX_DURATION)
 
+            # read the exit status to not leak a zombie process
+            os.waitpid(child, 0)
+
 
 @unittest.skipIf(sys.platform == "win32", "Not valid on Windows")
 class BasicSignalTests(unittest.TestCase):


From webhook-mailer at python.org  Tue Aug 22 10:51:23 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 22 Aug 2017 14:51:23 -0000
Subject: [Python-checkins] bpo-31258: test_urllib2_localnet uses
 addCleanup(server.stop) (#3184)
Message-ID: <mailman.89.1503413484.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/02e03672e6766b1da847b1635982a70346780744
commit: 02e03672e6766b1da847b1635982a70346780744
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-22T16:51:20+02:00
summary:

bpo-31258: test_urllib2_localnet uses addCleanup(server.stop) (#3184)

Use self.addCleanup(self.server.stop) to stop the HTTP server. Some
tests didn't stop the server like test_https().

files:
M Lib/test/test_urllib2_localnet.py

diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py
index 9199cb93100..061233f9f2f 100644
--- a/Lib/test/test_urllib2_localnet.py
+++ b/Lib/test/test_urllib2_localnet.py
@@ -278,6 +278,7 @@ def setUp(self):
         self._threads = test_support.threading_setup()
 
     def tearDown(self):
+        self.doCleanups()
         test_support.threading_cleanup(*self._threads)
 
 
@@ -296,10 +297,7 @@ def http_server_with_basic_auth_handler(*args, **kwargs):
         self.server_url = 'http://127.0.0.1:%s' % self.server.port
         self.server.start()
         self.server.ready.wait()
-
-    def tearDown(self):
-        self.server.stop()
-        super(BasicAuthTests, self).tearDown()
+        self.addCleanup(self.server.stop)
 
     def test_basic_auth_success(self):
         ah = urllib2.HTTPBasicAuthHandler()
@@ -347,15 +345,12 @@ def create_fake_proxy_handler(*args, **kwargs):
         self.server = LoopbackHttpServerThread(create_fake_proxy_handler)
         self.server.start()
         self.server.ready.wait()
+        self.addCleanup(self.server.stop)
         proxy_url = "http://127.0.0.1:%d" % self.server.port
         handler = urllib2.ProxyHandler({"http" : proxy_url})
         self.proxy_digest_handler = urllib2.ProxyDigestAuthHandler()
         self.opener = urllib2.build_opener(handler, self.proxy_digest_handler)
 
-    def tearDown(self):
-        self.server.stop()
-        super(ProxyAuthTests, self).tearDown()
-
     def test_proxy_with_bad_password_raises_httperror(self):
         self.proxy_digest_handler.add_password(self.REALM, self.URL,
                                                self.USER, self.PASSWD+"bad")
@@ -472,6 +467,7 @@ def start_server(self, responses):
         self.server = LoopbackHttpServerThread(handler)
         self.server.start()
         self.server.ready.wait()
+        self.addCleanup(self.server.stop)
         port = self.server.port
         handler.port = port
         return handler
@@ -496,15 +492,12 @@ def test_redirection(self):
 
         handler = self.start_server(responses)
 
-        try:
-            f = urllib2.urlopen('http://localhost:%s/' % handler.port)
-            data = f.read()
-            f.close()
+        f = urllib2.urlopen('http://localhost:%s/' % handler.port)
+        data = f.read()
+        f.close()
 
-            self.assertEqual(data, expected_response)
-            self.assertEqual(handler.requests, ['/', '/somewhere_else'])
-        finally:
-            self.server.stop()
+        self.assertEqual(data, expected_response)
+        self.assertEqual(handler.requests, ['/', '/somewhere_else'])
 
 
     def test_404(self):
@@ -512,49 +505,40 @@ def test_404(self):
         handler = self.start_server([(404, [], expected_response)])
 
         try:
-            try:
-                urllib2.urlopen('http://localhost:%s/weeble' % handler.port)
-            except urllib2.URLError, f:
-                pass
-            else:
-                self.fail('404 should raise URLError')
+            urllib2.urlopen('http://localhost:%s/weeble' % handler.port)
+        except urllib2.URLError, f:
+            pass
+        else:
+            self.fail('404 should raise URLError')
 
-            data = f.read()
-            f.close()
+        data = f.read()
+        f.close()
 
-            self.assertEqual(data, expected_response)
-            self.assertEqual(handler.requests, ['/weeble'])
-        finally:
-            self.server.stop()
+        self.assertEqual(data, expected_response)
+        self.assertEqual(handler.requests, ['/weeble'])
 
 
     def test_200(self):
         expected_response = 'pycon 2008...'
         handler = self.start_server([(200, [], expected_response)])
 
-        try:
-            f = urllib2.urlopen('http://localhost:%s/bizarre' % handler.port)
-            data = f.read()
-            f.close()
+        f = urllib2.urlopen('http://localhost:%s/bizarre' % handler.port)
+        data = f.read()
+        f.close()
 
-            self.assertEqual(data, expected_response)
-            self.assertEqual(handler.requests, ['/bizarre'])
-        finally:
-            self.server.stop()
+        self.assertEqual(data, expected_response)
+        self.assertEqual(handler.requests, ['/bizarre'])
 
     def test_200_with_parameters(self):
         expected_response = 'pycon 2008...'
         handler = self.start_server([(200, [], expected_response)])
 
-        try:
-            f = urllib2.urlopen('http://localhost:%s/bizarre' % handler.port, 'get=with_feeling')
-            data = f.read()
-            f.close()
+        f = urllib2.urlopen('http://localhost:%s/bizarre' % handler.port, 'get=with_feeling')
+        data = f.read()
+        f.close()
 
-            self.assertEqual(data, expected_response)
-            self.assertEqual(handler.requests, ['/bizarre', 'get=with_feeling'])
-        finally:
-            self.server.stop()
+        self.assertEqual(data, expected_response)
+        self.assertEqual(handler.requests, ['/bizarre', 'get=with_feeling'])
 
     def test_https(self):
         handler = self.start_https_server()
@@ -603,52 +587,40 @@ def cb_sni(ssl_sock, server_name, initial_context):
     def test_sending_headers(self):
         handler = self.start_server([(200, [], "we don't care")])
 
-        try:
-            req = urllib2.Request("http://localhost:%s/" % handler.port,
-                                  headers={'Range': 'bytes=20-39'})
-            urllib2.urlopen(req)
-            self.assertEqual(handler.headers_received['Range'], 'bytes=20-39')
-        finally:
-            self.server.stop()
+        req = urllib2.Request("http://localhost:%s/" % handler.port,
+                              headers={'Range': 'bytes=20-39'})
+        urllib2.urlopen(req)
+        self.assertEqual(handler.headers_received['Range'], 'bytes=20-39')
 
     def test_basic(self):
         handler = self.start_server([(200, [], "we don't care")])
 
+        open_url = urllib2.urlopen("http://localhost:%s" % handler.port)
+        for attr in ("read", "close", "info", "geturl"):
+            self.assertTrue(hasattr(open_url, attr), "object returned from "
+                         "urlopen lacks the %s attribute" % attr)
         try:
-            open_url = urllib2.urlopen("http://localhost:%s" % handler.port)
-            for attr in ("read", "close", "info", "geturl"):
-                self.assertTrue(hasattr(open_url, attr), "object returned from "
-                             "urlopen lacks the %s attribute" % attr)
-            try:
-                self.assertTrue(open_url.read(), "calling 'read' failed")
-            finally:
-                open_url.close()
+            self.assertTrue(open_url.read(), "calling 'read' failed")
         finally:
-            self.server.stop()
+            open_url.close()
 
     def test_info(self):
         handler = self.start_server([(200, [], "we don't care")])
 
-        try:
-            open_url = urllib2.urlopen("http://localhost:%s" % handler.port)
-            info_obj = open_url.info()
-            self.assertIsInstance(info_obj, mimetools.Message,
-                                  "object returned by 'info' is not an "
-                                  "instance of mimetools.Message")
-            self.assertEqual(info_obj.getsubtype(), "plain")
-        finally:
-            self.server.stop()
+        open_url = urllib2.urlopen("http://localhost:%s" % handler.port)
+        info_obj = open_url.info()
+        self.assertIsInstance(info_obj, mimetools.Message,
+                              "object returned by 'info' is not an "
+                              "instance of mimetools.Message")
+        self.assertEqual(info_obj.getsubtype(), "plain")
 
     def test_geturl(self):
         # Make sure same URL as opened is returned by geturl.
         handler = self.start_server([(200, [], "we don't care")])
 
-        try:
-            open_url = urllib2.urlopen("http://localhost:%s" % handler.port)
-            url = open_url.geturl()
-            self.assertEqual(url, "http://localhost:%s" % handler.port)
-        finally:
-            self.server.stop()
+        open_url = urllib2.urlopen("http://localhost:%s" % handler.port)
+        url = open_url.geturl()
+        self.assertEqual(url, "http://localhost:%s" % handler.port)
 
 
     def test_bad_address(self):
@@ -682,26 +654,21 @@ def test_bad_address(self):
     def test_iteration(self):
         expected_response = "pycon 2008..."
         handler = self.start_server([(200, [], expected_response)])
-        try:
-            data = urllib2.urlopen("http://localhost:%s" % handler.port)
-            for line in data:
-                self.assertEqual(line, expected_response)
-        finally:
-            self.server.stop()
+
+        data = urllib2.urlopen("http://localhost:%s" % handler.port)
+        for line in data:
+            self.assertEqual(line, expected_response)
 
     def ztest_line_iteration(self):
         lines = ["We\n", "got\n", "here\n", "verylong " * 8192 + "\n"]
         expected_response = "".join(lines)
         handler = self.start_server([(200, [], expected_response)])
-        try:
-            data = urllib2.urlopen("http://localhost:%s" % handler.port)
-            for index, line in enumerate(data):
-                self.assertEqual(line, lines[index],
-                                 "Fetched line number %s doesn't match expected:\n"
-                                 "    Expected length was %s, got %s" %
-                                 (index, len(lines[index]), len(line)))
-        finally:
-            self.server.stop()
+        data = urllib2.urlopen("http://localhost:%s" % handler.port)
+        for index, line in enumerate(data):
+            self.assertEqual(line, lines[index],
+                             "Fetched line number %s doesn't match expected:\n"
+                             "    Expected length was %s, got %s" %
+                             (index, len(lines[index]), len(line)))
         self.assertEqual(index + 1, len(lines))
 
 def test_main():


From webhook-mailer at python.org  Tue Aug 22 12:03:08 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 22 Aug 2017 16:03:08 -0000
Subject: [Python-checkins] bpo-31234: fork_wait tests now join threads
 (#3139) (#3187)
Message-ID: <mailman.90.1503417790.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/5f20539ee5c6e3f1da23e8fc31ba519a3d078c79
commit: 5f20539ee5c6e3f1da23e8fc31ba519a3d078c79
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-22T18:03:03+02:00
summary:

bpo-31234: fork_wait tests now join threads (#3139) (#3187)

fork_wait.py tests now joins threads, to not leak running threads in
the background.

(cherry picked from commit c99d41f9c0304fcf06550515c3db55f93a629e9e)

files:
M Lib/test/fork_wait.py

diff --git a/Lib/test/fork_wait.py b/Lib/test/fork_wait.py
index 713039dd826..6af79ad5d4d 100644
--- a/Lib/test/fork_wait.py
+++ b/Lib/test/fork_wait.py
@@ -11,7 +11,8 @@
 
 import os, sys, time, unittest
 import test.support as support
-_thread = support.import_module('_thread')
+
+threading = support.import_module('threading')
 
 LONGSLEEP = 2
 SHORTSLEEP = 0.5
@@ -20,8 +21,19 @@
 class ForkWait(unittest.TestCase):
 
     def setUp(self):
+        self._threading_key = support.threading_setup()
         self.alive = {}
         self.stop = 0
+        self.threads = []
+
+    def tearDown(self):
+        # Stop threads
+        self.stop = 1
+        for thread in self.threads:
+            thread.join()
+        thread = None
+        self.threads.clear()
+        support.threading_cleanup(*self._threading_key)
 
     def f(self, id):
         while not self.stop:
@@ -43,10 +55,11 @@ def wait_impl(self, cpid):
         self.assertEqual(spid, cpid)
         self.assertEqual(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8))
 
-    @support.reap_threads
     def test_wait(self):
         for i in range(NUM_THREADS):
-            _thread.start_new(self.f, (i,))
+            thread = threading.Thread(target=self.f, args=(i,))
+            thread.start()
+            self.threads.append(thread)
 
         # busy-loop to wait for threads
         deadline = time.monotonic() + 10.0
@@ -75,8 +88,4 @@ def test_wait(self):
             os._exit(n)
         else:
             # Parent
-            try:
-                self.wait_impl(cpid)
-            finally:
-                # Tell threads to die
-                self.stop = 1
+            self.wait_impl(cpid)


From webhook-mailer at python.org  Tue Aug 22 12:03:41 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 22 Aug 2017 16:03:41 -0000
Subject: [Python-checkins] bpo-31259: test_urllib2_localnet uses
 addCleanup(server.stop) (#3186)
Message-ID: <mailman.91.1503417822.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/468534d92f6879e925c4cd8a228ea300abfb7e4d
commit: 468534d92f6879e925c4cd8a228ea300abfb7e4d
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-22T18:03:38+02:00
summary:

bpo-31259: test_urllib2_localnet uses addCleanup(server.stop) (#3186)

Use self.addCleanup(self.server.stop) to stop the HTTP server. Some
tests didn't stop the server like test_https().

Fix also the usage of support.threading_cleanup().

files:
M Lib/test/test_urllib2_localnet.py

diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py
index 70c4c013e9c..f83f9ccb786 100644
--- a/Lib/test/test_urllib2_localnet.py
+++ b/Lib/test/test_urllib2_localnet.py
@@ -289,11 +289,15 @@ def setUp(self):
         def http_server_with_basic_auth_handler(*args, **kwargs):
             return BasicAuthHandler(*args, **kwargs)
         self.server = LoopbackHttpServerThread(http_server_with_basic_auth_handler)
-        self.addCleanup(self.server.stop)
+        self.addCleanup(self.stop_server)
         self.server_url = 'http://127.0.0.1:%s' % self.server.port
         self.server.start()
         self.server.ready.wait()
 
+    def stop_server(self):
+        self.server.stop()
+        self.server = None
+
     def tearDown(self):
         super(BasicAuthTests, self).tearDown()
 
@@ -339,6 +343,7 @@ def create_fake_proxy_handler(*args, **kwargs):
             return FakeProxyHandler(self.digest_auth_handler, *args, **kwargs)
 
         self.server = LoopbackHttpServerThread(create_fake_proxy_handler)
+        self.addCleanup(self.stop_server)
         self.server.start()
         self.server.ready.wait()
         proxy_url = "http://127.0.0.1:%d" % self.server.port
@@ -347,9 +352,9 @@ def create_fake_proxy_handler(*args, **kwargs):
         self.opener = urllib.request.build_opener(
             handler, self.proxy_digest_handler)
 
-    def tearDown(self):
+    def stop_server(self):
         self.server.stop()
-        super(ProxyAuthTests, self).tearDown()
+        self.server = None
 
     def test_proxy_with_bad_password_raises_httperror(self):
         self.proxy_digest_handler.add_password(self.REALM, self.URL,
@@ -468,13 +473,17 @@ def urlopen(self, url, data=None, **kwargs):
             f.close()
         return b"".join(l)
 
+    def stop_server(self):
+        self.server.stop()
+        self.server = None
+
     def start_server(self, responses=None):
         if responses is None:
             responses = [(200, [], b"we don't care")]
         handler = GetRequestHandler(responses)
 
         self.server = LoopbackHttpServerThread(handler)
-        self.addCleanup(self.server.stop)
+        self.addCleanup(self.stop_server)
         self.server.start()
         self.server.ready.wait()
         port = self.server.port
@@ -664,7 +673,7 @@ def setUpModule():
 
 def tearDownModule():
     if threads_key:
-        support.threading_cleanup(threads_key)
+        support.threading_cleanup(*threads_key)
 
 if __name__ == "__main__":
     unittest.main()


From webhook-mailer at python.org  Tue Aug 22 12:05:10 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 22 Aug 2017 16:05:10 -0000
Subject: [Python-checkins] bpo-31234: test_httpservers joins the server
 thread (#3188)
Message-ID: <mailman.92.1503417912.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/830d7d2936434ace113822294acce82f62cde41b
commit: 830d7d2936434ace113822294acce82f62cde41b
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-22T18:05:07+02:00
summary:

bpo-31234: test_httpservers joins the server thread (#3188)

files:
M Lib/test/test_httpservers.py

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index fb4ae1928ba..8cddcdc4384 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -56,6 +56,7 @@ def run(self):
 
     def stop(self):
         self.server.shutdown()
+        self.join()
 
 
 class BaseTestCase(unittest.TestCase):


From webhook-mailer at python.org  Tue Aug 22 12:05:35 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 22 Aug 2017 16:05:35 -0000
Subject: [Python-checkins] bpo-31234: test_threaded_import: fix
 test_side_effect_import() (#3189)
Message-ID: <mailman.93.1503417938.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/41bbd82b6b6a887e893974fa5cdaae7782ae6cac
commit: 41bbd82b6b6a887e893974fa5cdaae7782ae6cac
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-22T18:05:32+02:00
summary:

bpo-31234: test_threaded_import: fix test_side_effect_import() (#3189)

* Don't leak the module into sys.modules
* Avoid dangling thread

files:
M Lib/test/test_threaded_import.py

diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py
index a4cf1d70f1d..75c66b0ac75 100644
--- a/Lib/test/test_threaded_import.py
+++ b/Lib/test/test_threaded_import.py
@@ -230,7 +230,8 @@ def target():
                 import random
             t = threading.Thread(target=target)
             t.start()
-            t.join()"""
+            t.join()
+            t = None"""
         sys.path.insert(0, os.curdir)
         self.addCleanup(sys.path.remove, os.curdir)
         filename = TESTFN + ".py"
@@ -241,6 +242,7 @@ def target():
         self.addCleanup(rmtree, '__pycache__')
         importlib.invalidate_caches()
         __import__(TESTFN)
+        del sys.modules[TESTFN]
 
 
 @reap_threads


From webhook-mailer at python.org  Tue Aug 22 16:06:53 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Tue, 22 Aug 2017 20:06:53 -0000
Subject: [Python-checkins] Touch up the contributing notes (#3158)
Message-ID: <mailman.94.1503432414.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/5df8c589f4ec3d8c1ccd115dc030fa7596c1c75d
commit: 5df8c589f4ec3d8c1ccd115dc030fa7596c1c75d
branch: master
author: Brett Cannon <brettcannon at users.noreply.github.com>
committer: ?ukasz Langa <lukasz at langa.pl>
date: 2017-08-22T13:06:50-07:00
summary:

Touch up the contributing notes (#3158)

* Mention how to find out what to do
* Update URL
* Thanks contributors
* Explain there is no timeline

files:
M .github/CONTRIBUTING.rst

diff --git a/.github/CONTRIBUTING.rst b/.github/CONTRIBUTING.rst
index 83cfee34b45..d559bd5e189 100644
--- a/.github/CONTRIBUTING.rst
+++ b/.github/CONTRIBUTING.rst
@@ -12,31 +12,47 @@ Build Status
 
   + `Stable buildbots <http://buildbot.python.org/3.6.stable/>`_
 
-- 3.5
-
-  + `Stable buildbots <http://buildbot.python.org/3.5.stable/>`_
-
 - 2.7
 
   + `Stable buildbots <http://buildbot.python.org/2.7.stable/>`_
 
 
+Thank You
+---------
+First off, thanks for contributing to the maintenance of the Python programming
+language and the CPython interpreter! Even if your contribution is not
+ultimately accepted, the fact you put time and effort into helping out is
+greatly appreciated.
+
+
 Contribution Guidelines
 -----------------------
-Please read the `devguide <https://cpython-devguide.readthedocs.io/>`_ for
+Please read the `devguide <https://devguide.python.org/>`_ for
 guidance on how to contribute to this project. The documentation covers
 everything from how to build the code to submitting a pull request. There are
 also suggestions on how you can most effectively help the project.
 
 Please be aware that our workflow does deviate slightly from the typical GitHub
 project. Details on how to properly submit a pull request are covered in
-`Lifecycle of a Pull Request <https://cpython-devguide.readthedocs.io/pullrequest.html>`_.
-One key point is to keep comments on GitHub to only those related to the reviewing
-the code in the pull request. All other discussions -- e.g. about the issue being
-fixed -- should happen on bugs.python.org.
-
-If you are making a code contribution or large documentation contribution,
-please feel free to add yourself to the ``Misc/ACKS`` file alphabetically.
+`Lifecycle of a Pull Request <https://devguide.python.org/pullrequest/>`_.
+We utilize various bots and status checks to help with this, so do follow the
+comments they leave and their "Details" links, respectively. The key points of
+our workflow that are not covered by a bot or status check are:
+
+- All discussions that are not directly related to the code in the pull request
+  should happen on bugs.python.org
+- Upon your first non-trivial pull request (which includes documentation changes),
+  feel free to add yourself to ``Misc/ACKS``
+
+
+Setting Expectations
+--------------------
+Due to the fact that this project is entirely volunteer-run (i.e. no one is paid
+to work on Python full-time), we unfortunately can make no guarantees as to if
+or when a core developer will get around to reviewing your pull request.
+If no core developer has done a review or responded to changes made because of a
+"changes requested" review, please feel free to email python-dev to ask if
+someone could take a look at your pull request.
 
 
 Code of Conduct


From webhook-mailer at python.org  Tue Aug 22 16:11:12 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Tue, 22 Aug 2017 20:11:12 -0000
Subject: [Python-checkins] bpo-31161: only check for parens error for
 SyntaxError (#3083)
Message-ID: <mailman.95.1503432677.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/680f04a926bce04e4320ba883068c345eba502a6
commit: 680f04a926bce04e4320ba883068c345eba502a6
branch: 3.6
author: Martijn Pieters <github.com at zopatista.com>
committer: ?ukasz Langa <lukasz at langa.pl>
date: 2017-08-22T13:11:09-07:00
summary:

bpo-31161: only check for parens error for SyntaxError (#3083)

Subclasses such as IndentError and TabError should not have this message
applied.

files:
M Lib/test/test_exceptions.py
M Misc/NEWS
M Objects/exceptions.c

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 960fc0f1bf9..53851cb6cfd 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -156,6 +156,34 @@ def ckmsg(src, msg):
         ckmsg(s, "'continue' not properly in loop")
         ckmsg("continue\n", "'continue' not properly in loop")
 
+    def testSyntaxErrorMissingParens(self):
+        def ckmsg(src, msg, exception=SyntaxError):
+            try:
+                compile(src, '<fragment>', 'exec')
+            except exception as e:
+                if e.msg != msg:
+                    self.fail("expected %s, got %s" % (msg, e.msg))
+            else:
+                self.fail("failed to get expected SyntaxError")
+
+        s = '''print "old style"'''
+        ckmsg(s, "Missing parentheses in call to 'print'. "
+                 "Did you mean print(\"old style\")?")
+
+        s = '''print "old style",'''
+        ckmsg(s, "Missing parentheses in call to 'print'. "
+                 "Did you mean print(\"old style\", end=\" \")?")
+
+        s = '''exec "old style"'''
+        ckmsg(s, "Missing parentheses in call to 'exec'")
+
+        # should not apply to subclasses, see issue #31161
+        s = '''if True:\nprint "No indent"'''
+        ckmsg(s, "expected an indented block", IndentationError)
+
+        s = '''if True:\n        print()\n\texec "mixed tabs and spaces"'''
+        ckmsg(s, "inconsistent use of tabs and spaces in indentation", TabError)
+
     def testSyntaxErrorOffset(self):
         def check(src, lineno, offset):
             with self.assertRaises(SyntaxError) as cm:
diff --git a/Misc/NEWS b/Misc/NEWS
index e7e9cb449d3..309b46637e2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.6.3 release candidate 1?
 Core and Builtins
 -----------------
 
+- bpo-31161: Make sure the 'Missing parentheses' syntax error message is
+  only applied to SyntaxError, not to subclasses. Patch by Martijn Pieters.
+
 - bpo-30814: Fixed a race condition when import a submodule from a package.
 
 - bpo-30597: ``print`` now shows expected input in custom error message when
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index f286ec076f8..271e293e325 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -1356,11 +1356,16 @@ SyntaxError_init(PySyntaxErrorObject *self, PyObject *args, PyObject *kwds)
 
         Py_DECREF(info);
 
-        /* Issue #21669: Custom error for 'print' & 'exec' as statements */
-        if (self->text && PyUnicode_Check(self->text)) {
-            if (_report_missing_parentheses(self) < 0) {
-                return -1;
-            }
+        /*
+         * Issue #21669: Custom error for 'print' & 'exec' as statements
+         *
+         * Only applies to SyntaxError instances, not to subclasses such
+         * as TabError or IndentationError (see issue #31161)
+         */
+        if ((PyObject*)Py_TYPE(self) == PyExc_SyntaxError &&
+                self->text && PyUnicode_Check(self->text) &&
+                _report_missing_parentheses(self) < 0) {
+            return -1;
         }
     }
     return 0;


From webhook-mailer at python.org  Tue Aug 22 16:16:26 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Tue, 22 Aug 2017 20:16:26 -0000
Subject: [Python-checkins] bpo-31161: only check for parens error for
 SyntaxError (#3082)
Message-ID: <mailman.96.1503432990.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/772d809a63f40fd35679da3fb115cdf7fa81bd20
commit: 772d809a63f40fd35679da3fb115cdf7fa81bd20
branch: master
author: Martijn Pieters <github.com at zopatista.com>
committer: ?ukasz Langa <lukasz at langa.pl>
date: 2017-08-22T13:16:23-07:00
summary:

bpo-31161: only check for parens error for SyntaxError (#3082)

Subclasses such as IndentError and TabError should not have this message
applied.

files:
M Lib/test/test_exceptions.py
M Misc/NEWS
M Objects/exceptions.c

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 3378ceb701c..a25f3bf03a5 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -156,6 +156,34 @@ def ckmsg(src, msg):
         ckmsg(s, "'continue' not properly in loop")
         ckmsg("continue\n", "'continue' not properly in loop")
 
+    def testSyntaxErrorMissingParens(self):
+        def ckmsg(src, msg, exception=SyntaxError):
+            try:
+                compile(src, '<fragment>', 'exec')
+            except exception as e:
+                if e.msg != msg:
+                    self.fail("expected %s, got %s" % (msg, e.msg))
+            else:
+                self.fail("failed to get expected SyntaxError")
+
+        s = '''print "old style"'''
+        ckmsg(s, "Missing parentheses in call to 'print'. "
+                 "Did you mean print(\"old style\")?")
+
+        s = '''print "old style",'''
+        ckmsg(s, "Missing parentheses in call to 'print'. "
+                 "Did you mean print(\"old style\", end=\" \")?")
+
+        s = '''exec "old style"'''
+        ckmsg(s, "Missing parentheses in call to 'exec'")
+
+        # should not apply to subclasses, see issue #31161
+        s = '''if True:\nprint "No indent"'''
+        ckmsg(s, "expected an indented block", IndentationError)
+
+        s = '''if True:\n        print()\n\texec "mixed tabs and spaces"'''
+        ckmsg(s, "inconsistent use of tabs and spaces in indentation", TabError)
+
     def testSyntaxErrorOffset(self):
         def check(src, lineno, offset):
             with self.assertRaises(SyntaxError) as cm:
diff --git a/Misc/NEWS b/Misc/NEWS
index 1ef28927266..9927e3490f9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.7.0 alpha 1?
 Core and Builtins
 -----------------
 
+- bpo-31161: Make sure the 'Missing parentheses' syntax error message is
+  only applied to SyntaxError, not to subclasses. Patch by Martijn Pieters.
+
 - bpo-30814: Fixed a race condition when import a submodule from a package.
 
 - bpo-30736: The internal unicodedata database has been upgraded to Unicode
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 190ad065402..13c1be90d88 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -1352,11 +1352,16 @@ SyntaxError_init(PySyntaxErrorObject *self, PyObject *args, PyObject *kwds)
 
         Py_DECREF(info);
 
-        /* Issue #21669: Custom error for 'print' & 'exec' as statements */
-        if (self->text && PyUnicode_Check(self->text)) {
-            if (_report_missing_parentheses(self) < 0) {
-                return -1;
-            }
+        /*
+         * Issue #21669: Custom error for 'print' & 'exec' as statements
+         *
+         * Only applies to SyntaxError instances, not to subclasses such
+         * as TabError or IndentationError (see issue #31161)
+         */
+        if ((PyObject*)Py_TYPE(self) == PyExc_SyntaxError &&
+                self->text && PyUnicode_Check(self->text) &&
+                _report_missing_parentheses(self) < 0) {
+            return -1;
         }
     }
     return 0;


From webhook-mailer at python.org  Tue Aug 22 16:20:43 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Tue, 22 Aug 2017 20:20:43 -0000
Subject: [Python-checkins] [3.6] bpo-30983: [gdb] Fix py-bt,
 etc. for non-debug shared builds (GH-3153) (#3192)
Message-ID: <mailman.97.1503433246.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/8e572491b59c2334723bfd7411ab2a9fbd100f70
commit: 8e572491b59c2334723bfd7411ab2a9fbd100f70
branch: 3.6
author: ?ukasz Langa <lukasz at langa.pl>
committer: GitHub <noreply at github.com>
date: 2017-08-22T13:20:40-07:00
summary:

[3.6] bpo-30983: [gdb] Fix py-bt, etc. for non-debug shared builds (GH-3153) (#3192)

PEP 523 introduced _PyEval_EvalFrameDefault which inlines PyEval_EvalFrameEx on
non-debug shared builds.  This breaks the ability to use py-bt, py-up, and
a few other Python-specific gdb integrations.

This patch fixes the problem by only looking for _PyEval_EvalFrameDefault
frames.

test_gdb passes on both a debug and a non-debug build.

Original patch by Bruno "Polaco" Penteado.
(cherry picked from commit 5fe59f8e3a0a56a155c18f9d581205ec533764b6)

files:
A Misc/NEWS.d/next/Tools-Demos/2017-08-18-17-19-23.bpo-30983.ggGz9z.rst
M Misc/ACKS
M Tools/gdb/libpython.py

diff --git a/Misc/ACKS b/Misc/ACKS
index 20e174384ba..a67eb0a557e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1171,6 +1171,7 @@ Berker Peksag
 Andreas Pelme
 Steven Pemberton
 Bo Peng
+Bruno "Polaco" Penteado
 Santiago Peres?n
 George Peristerakis
 Thomas Perl
diff --git a/Misc/NEWS.d/next/Tools-Demos/2017-08-18-17-19-23.bpo-30983.ggGz9z.rst b/Misc/NEWS.d/next/Tools-Demos/2017-08-18-17-19-23.bpo-30983.ggGz9z.rst
new file mode 100644
index 00000000000..404263e9ac8
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2017-08-18-17-19-23.bpo-30983.ggGz9z.rst
@@ -0,0 +1,6 @@
+gdb integration commands (py-bt, etc.) work on optimized shared builds now,
+too.  PEP 523 introduced _PyEval_EvalFrameDefault which inlines
+PyEval_EvalFrameEx on non-debug shared builds.  This broke the ability to
+use py-bt, py-up, and a few other Python-specific gdb integrations. The
+problem is fixed by only looking for _PyEval_EvalFrameDefault frames in
+python-gdb.py.  Original patch by Bruno "Polaco" Penteado.
diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index 31ae8117c78..aac9b5c1b8a 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -99,6 +99,8 @@ def _sizeof_void_p():
 
 ENCODING = locale.getpreferredencoding()
 
+EVALFRAME = '_PyEval_EvalFrameDefault'
+
 class NullPyObjectPtr(RuntimeError):
     pass
 
@@ -1492,18 +1494,18 @@ def get_index(self):
     #   - everything else
 
     def is_python_frame(self):
-        '''Is this a PyEval_EvalFrameEx frame, or some other important
+        '''Is this a _PyEval_EvalFrameDefault frame, or some other important
         frame? (see is_other_python_frame for what "important" means in this
         context)'''
-        if self.is_evalframeex():
+        if self.is_evalframe():
             return True
         if self.is_other_python_frame():
             return True
         return False
 
-    def is_evalframeex(self):
-        '''Is this a PyEval_EvalFrameEx frame?'''
-        if self._gdbframe.name() == 'PyEval_EvalFrameEx':
+    def is_evalframe(self):
+        '''Is this a _PyEval_EvalFrameDefault frame?'''
+        if self._gdbframe.name() == EVALFRAME:
             '''
             I believe we also need to filter on the inline
             struct frame_id.inline_depth, only regarding frames with
@@ -1512,7 +1514,7 @@ def is_evalframeex(self):
             So we reject those with type gdb.INLINE_FRAME
             '''
             if self._gdbframe.type() == gdb.NORMAL_FRAME:
-                # We have a PyEval_EvalFrameEx frame:
+                # We have a _PyEval_EvalFrameDefault frame:
                 return True
 
         return False
@@ -1631,7 +1633,7 @@ def get_selected_bytecode_frame(cls):
         frame = cls.get_selected_frame()
 
         while frame:
-            if frame.is_evalframeex():
+            if frame.is_evalframe():
                 return frame
             frame = frame.older()
 
@@ -1639,7 +1641,7 @@ def get_selected_bytecode_frame(cls):
         return None
 
     def print_summary(self):
-        if self.is_evalframeex():
+        if self.is_evalframe():
             pyop = self.get_pyop()
             if pyop:
                 line = pyop.get_truncated_repr(MAX_OUTPUT_LEN)
@@ -1658,7 +1660,7 @@ def print_summary(self):
                 sys.stdout.write('#%i\n' % self.get_index())
 
     def print_traceback(self):
-        if self.is_evalframeex():
+        if self.is_evalframe():
             pyop = self.get_pyop()
             if pyop:
                 pyop.print_traceback()


From webhook-mailer at python.org  Tue Aug 22 18:58:50 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 22 Aug 2017 22:58:50 -0000
Subject: [Python-checkins] bpo-28667: Fix a compile warning on FreeBSD when
 compare with FD_SETSIZE. (#501) (#3190)
Message-ID: <mailman.98.1503442732.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/cb7fdf69ec9235cb358580f189089eaf575fb9df
commit: cb7fdf69ec9235cb358580f189089eaf575fb9df
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-23T00:58:43+02:00
summary:

bpo-28667: Fix a compile warning on FreeBSD when compare with FD_SETSIZE. (#501) (#3190)

FreeBSD is the only platforms with unsigned FD_SETSIZE.

(cherry picked from commit 783d0c1a1c723733adcdf4249240246fc35a5bcb)

files:
M Include/fileobject.h
M Modules/selectmodule.c

diff --git a/Include/fileobject.h b/Include/fileobject.h
index 6120e51ed00..1dde17e1efc 100644
--- a/Include/fileobject.h
+++ b/Include/fileobject.h
@@ -39,7 +39,7 @@ PyAPI_DATA(PyTypeObject) PyStdPrinter_Type;
 
 /* A routine to check if a file descriptor can be select()-ed. */
 #ifdef HAVE_SELECT
- #define _PyIsSelectable_fd(FD) (((FD) >= 0) && ((FD) < FD_SETSIZE))
+ #define _PyIsSelectable_fd(FD) ((unsigned int)(FD) < (unsigned int)FD_SETSIZE)
 #else
  #define _PyIsSelectable_fd(FD) (1)
 #endif /* HAVE_SELECT */
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 47da49399f7..07a20c85d76 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -68,8 +68,8 @@ typedef struct {
 static void
 reap_obj(pylist fd2obj[FD_SETSIZE + 1])
 {
-    int i;
-    for (i = 0; i < FD_SETSIZE + 1 && fd2obj[i].sentinel >= 0; i++) {
+    unsigned int i;
+    for (i = 0; i < (unsigned int)FD_SETSIZE + 1 && fd2obj[i].sentinel >= 0; i++) {
         Py_CLEAR(fd2obj[i].obj);
     }
     fd2obj[0].sentinel = -1;
@@ -83,7 +83,7 @@ static int
 seq2set(PyObject *seq, fd_set *set, pylist fd2obj[FD_SETSIZE + 1])
 {
     int max = -1;
-    int index = 0;
+    unsigned int index = 0;
     Py_ssize_t i;
     PyObject* fast_seq = NULL;
     PyObject* o = NULL;
@@ -120,7 +120,7 @@ seq2set(PyObject *seq, fd_set *set, pylist fd2obj[FD_SETSIZE + 1])
         FD_SET(v, set);
 
         /* add object and its file descriptor to the list */
-        if (index >= FD_SETSIZE) {
+        if (index >= (unsigned int)FD_SETSIZE) {
             PyErr_SetString(PyExc_ValueError,
                           "too many file descriptors in select()");
             goto finally;


From solipsis at pitrou.net  Wed Aug 23 05:05:33 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 23 Aug 2017 09:05:33 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=4
Message-ID: <20170823090532.91372.D16FF0C52BCC35DF@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_functools leaked [0, 3, 1] memory blocks, sum=4


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogKGaQm_', '--timeout', '7200']

From webhook-mailer at python.org  Wed Aug 23 14:16:57 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 23 Aug 2017 18:16:57 -0000
Subject: [Python-checkins] bpo-31229: Fixed wrong error messages when too
 many keyword arguments are received. (#3180)
Message-ID: <mailman.99.1503512218.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/bf9075a0c55186d2f34df63e6c8512dd6414ff4b
commit: bf9075a0c55186d2f34df63e6c8512dd6414ff4b
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-23T21:16:48+03:00
summary:

bpo-31229: Fixed wrong error messages when too many keyword arguments are received. (#3180)

files:
M Lib/test/test_call.py
M Python/getargs.c

diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
index b004b5803c3..3f9987c9e77 100644
--- a/Lib/test/test_call.py
+++ b/Lib/test/test_call.py
@@ -7,6 +7,7 @@
     _testcapi = None
 import struct
 import collections
+import itertools
 
 # The test cases here cover several paths through the function calling
 # code.  They depend on the METH_XXX flag that is used to define a C
@@ -194,6 +195,26 @@ def test_varargs13_kw(self):
         msg = r"^classmethod\(\) takes no keyword arguments$"
         self.assertRaisesRegex(TypeError, msg, classmethod, func=id)
 
+    def test_varargs14_kw(self):
+        msg = r"^product\(\) takes at most 1 keyword argument \(2 given\)$"
+        self.assertRaisesRegex(TypeError, msg,
+                               itertools.product, 0, repeat=1, foo=2)
+
+    def test_varargs15_kw(self):
+        msg = r"^ImportError\(\) takes at most 2 keyword arguments \(3 given\)$"
+        self.assertRaisesRegex(TypeError, msg,
+                               ImportError, 0, name=1, path=2, foo=3)
+
+    def test_varargs16_kw(self):
+        msg = r"^min\(\) takes at most 2 keyword arguments \(3 given\)$"
+        self.assertRaisesRegex(TypeError, msg,
+                               min, 0, default=1, key=2, foo=3)
+
+    def test_varargs17_kw(self):
+        msg = r"^print\(\) takes at most 4 keyword arguments \(5 given\)$"
+        self.assertRaisesRegex(TypeError, msg,
+                               print, 0, sep=1, end=2, file=3, flush=4, foo=5)
+
     def test_oldargs0_1(self):
         msg = r"keys\(\) takes no arguments \(1 given\)"
         self.assertRaisesRegex(TypeError, msg, {}.keys, 0)
diff --git a/Python/getargs.c b/Python/getargs.c
index 4645b0f2006..4b969d924a9 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1654,11 +1654,14 @@ vgetargskeywords(PyObject *args, PyObject *kwargs, const char *format,
     nargs = PyTuple_GET_SIZE(args);
     nkwargs = (kwargs == NULL) ? 0 : PyDict_GET_SIZE(kwargs);
     if (nargs + nkwargs > len) {
+        /* Adding "keyword" (when nargs == 0) prevents producing wrong error
+           messages in some special cases (see bpo-31229). */
         PyErr_Format(PyExc_TypeError,
-                     "%.200s%s takes at most %d argument%s (%zd given)",
+                     "%.200s%s takes at most %d %sargument%s (%zd given)",
                      (fname == NULL) ? "function" : fname,
                      (fname == NULL) ? "" : "()",
                      len,
+                     (nargs == 0) ? "keyword " : "",
                      (len == 1) ? "" : "s",
                      nargs + nkwargs);
         return cleanreturn(0, &freelist);
@@ -2077,11 +2080,14 @@ vgetargskeywordsfast_impl(PyObject **args, Py_ssize_t nargs,
         nkwargs = 0;
     }
     if (nargs + nkwargs > len) {
+        /* Adding "keyword" (when nargs == 0) prevents producing wrong error
+           messages in some special cases (see bpo-31229). */
         PyErr_Format(PyExc_TypeError,
-                     "%.200s%s takes at most %d argument%s (%zd given)",
+                     "%.200s%s takes at most %d %sargument%s (%zd given)",
                      (parser->fname == NULL) ? "function" : parser->fname,
                      (parser->fname == NULL) ? "" : "()",
                      len,
+                     (nargs == 0) ? "keyword " : "",
                      (len == 1) ? "" : "s",
                      nargs + nkwargs);
         return cleanreturn(0, &freelist);


From lp_benchmark_robot at intel.com  Wed Aug 23 18:57:31 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Wed, 23 Aug 2017 15:57:31 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-23
Message-ID: <13d32712-ef1e-4c9d-beff-25fe4059bcf7@orsmsx109.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-23 03:04:15-07:00.
  - commit:		772d809
  - previous commit:	5fe59f8
  - revision date:	2017-08-22 13:16:23-07:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 0.980% |  +3.260%   |  +3.867%   |  +8.031%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.116% |  +2.551%   |  +20.822%  |  +15.434%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 1.214% |  +1.543%   |  +22.002%  |  +14.847%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.645% |  +5.213%   |  +20.213%  |  +13.180%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.912% |  -0.804%   |  +1.216%   |  +16.782%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 2.718% |  +0.537%   |  +11.541%  |  +8.726%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 1.015% |  +1.851%   |  +6.743%   |  +11.159%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.419% |  -0.201%   |  +3.557%   |  +5.892%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.823% |  +4.577%   |  +7.802%   |  +16.517%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.723% |  +1.223%   |  +10.880%  |  +12.318%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.774% |  +1.319%   |  +3.691%   |  +7.189%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.588% |  +0.654%   |  +4.565%   |  +5.939%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.575% |  +3.405%   |  +1.762%   |  +7.459%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 2.093% |  -0.004%   |  +8.512%   |  +11.769%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.916% |  +3.661%   |  +8.674%   |  +8.908%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.841% |  -0.581%   |  +5.089%   |  +11.525%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.367% |  +3.171%   |  +9.254%   |  +11.398%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.412% |  +1.454%   |  +7.762%   |  +9.932%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 2.268% |  +3.351%   |  +3.644%   |  +10.180%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 4.285% |  +1.795%   |  +2.939%   |  +10.207%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.429% |  +0.962%   |  +9.257%   |  +11.288%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.295% |  +3.503%   |  +46.626%  |  +11.817%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.631% |  +1.032%   |  +10.644%  |  +12.264%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.441% |  +1.128%   |  +17.709%  |  +12.246%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 3.643% |  +6.366%   |  +6.221%   |  +12.839%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.361% |  +4.535%   |  +3.656%   |  +5.750%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.871% |  +6.299%   |  -5.006%   |  +5.256%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.647% |  +8.068%   |  +2.518%   |  +7.283%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 0.895% |  +14.206%  |  +4.485%   |  +9.565%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.615% |  +11.744%  |  +0.356%   |  +23.214%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.409% |  +7.966%   |  +3.694%   |  +21.723%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.900% |  +7.928%   |  +6.401%   |  +20.083%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.388% |  +7.749%   |  +11.623%  |  +8.880%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.267% |  +9.274%   |  +0.250%   |  +10.217%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.914% |  +10.712%  |  +8.027%   |  +6.128%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.546% |  +11.304%  |  +0.448%   |  +5.313%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.197% |  +11.311%  |  +8.934%   |  +13.088%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.031% |  +5.912%   |  -8.536%   |  +10.961%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.634% |  +12.489%  |  +2.170%   |  +8.210%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 0.981% |  +18.971%  |  +1.837%   |  +1.900%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.008% |  +15.147%  |  +11.792%  |  +4.274%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 2.057% |  +6.924%   |  +6.927%   |  +15.171%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.617% |  +6.365%   |  +0.410%   |  +1.059%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 4.020% |  +11.690%  |  +26.629%  |  +8.343%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.669% |  +8.893%   |  +3.317%   |  +7.388%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.768% |  +8.572%   |  +14.255%  |  +7.420%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 3.731% |  +9.781%   |  +0.727%   |  -4.838%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.341% |  +8.062%   |  +5.808%   |  +0.487%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.760% |  +8.558%   |  +5.647%   |  +7.065%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.041% |  +8.432%   |  +5.644%   |  +4.596%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 3.823% |  +13.951%  |  +1.847%   |  +9.322%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.121% |  +6.290%   |  +13.055%  |  +7.292%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 2.038% |  +7.135%   |  +10.191%  |  +6.982%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.291% |  +8.812%   |  +12.879%  |  +8.079%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.769% |  +6.646%   |  +13.290%  |  +10.682%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 3.943% |  +5.144%   |  +20.356%  |  +13.316%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.069% |  +10.191%  |  +5.610%   |  +4.839%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 3.210% |  +7.427%   |  +1.854%   |  +3.003%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 7.650% |  +6.208%   |  +8.895%   |  +19.570%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 1.607% |  +8.251%   |  -2.227%   |  +19.542%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 3.779% |  +9.080%   |  +6.572%   |  +8.024%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 0.860% |  +10.085%  |  +6.106%   |  +8.050%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.597% |  +8.222%   |  +1.907%   |  +6.632%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 2.837% |  +12.767%  |  -5.156%   |  +11.249%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.130% |  +4.729%   |  +7.237%   |  +7.704%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-23

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Thu Aug 24 01:55:20 2017
From: webhook-mailer at python.org (INADA Naoki)
Date: Thu, 24 Aug 2017 05:55:20 -0000
Subject: [Python-checkins] bpo-31095: fix potential crash during GC (GH-2974)
Message-ID: <mailman.100.1503554125.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/a6296d34a478b4f697ea9db798146195075d496c
commit: a6296d34a478b4f697ea9db798146195075d496c
branch: master
author: INADA Naoki <methane at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-08-24T14:55:17+09:00
summary:

bpo-31095: fix potential crash during GC (GH-2974)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-08-01-18-48-30.bpo-31095.bXWZDb.rst
M Doc/extending/newtypes.rst
M Doc/includes/noddy4.c
M Modules/_collectionsmodule.c
M Modules/_elementtree.c
M Modules/_functoolsmodule.c
M Modules/_io/bytesio.c
M Modules/_json.c
M Modules/_ssl.c
M Modules/_struct.c
M Objects/dictobject.c
M Objects/setobject.c
M Parser/asdl_c.py
M Python/Python-ast.c

diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
index bd09aa695d3..f0e8985c615 100644
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -728,8 +728,9 @@ functions.  With :c:func:`Py_VISIT`, :c:func:`Noddy_traverse` can be simplified:
    uniformity across these boring implementations.
 
 We also need to provide a method for clearing any subobjects that can
-participate in cycles.  We implement the method and reimplement the deallocator
-to use it::
+participate in cycles.
+
+::
 
    static int
    Noddy_clear(Noddy *self)
@@ -747,13 +748,6 @@ to use it::
        return 0;
    }
 
-   static void
-   Noddy_dealloc(Noddy* self)
-   {
-       Noddy_clear(self);
-       Py_TYPE(self)->tp_free((PyObject*)self);
-   }
-
 Notice the use of a temporary variable in :c:func:`Noddy_clear`. We use the
 temporary variable so that we can set each member to *NULL* before decrementing
 its reference count.  We do this because, as was discussed earlier, if the
@@ -776,6 +770,23 @@ be simplified::
        return 0;
    }
 
+Note that :c:func:`Noddy_dealloc` may call arbitrary functions through
+``__del__`` method or weakref callback. It means circular GC can be
+triggered inside the function.  Since GC assumes reference count is not zero,
+we need to untrack the object from GC by calling :c:func:`PyObject_GC_UnTrack`
+before clearing members. Here is reimplemented deallocator which uses
+:c:func:`PyObject_GC_UnTrack` and :c:func:`Noddy_clear`.
+
+::
+
+   static void
+   Noddy_dealloc(Noddy* self)
+   {
+       PyObject_GC_UnTrack(self);
+       Noddy_clear(self);
+       Py_TYPE(self)->tp_free((PyObject*)self);
+   }
+
 Finally, we add the :const:`Py_TPFLAGS_HAVE_GC` flag to the class flags::
 
    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /* tp_flags */
diff --git a/Doc/includes/noddy4.c b/Doc/includes/noddy4.c
index eb9622a87d9..08ba4c3d91a 100644
--- a/Doc/includes/noddy4.c
+++ b/Doc/includes/noddy4.c
@@ -46,6 +46,7 @@ Noddy_clear(Noddy *self)
 static void
 Noddy_dealloc(Noddy* self)
 {
+    PyObject_GC_UnTrack(self);
     Noddy_clear(self);
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-01-18-48-30.bpo-31095.bXWZDb.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-01-18-48-30.bpo-31095.bXWZDb.rst
new file mode 100644
index 00000000000..ca1f8bafba6
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-01-18-48-30.bpo-31095.bXWZDb.rst	
@@ -0,0 +1,2 @@
+Fix potential crash during GC caused by ``tp_dealloc`` which doesn't call
+``PyObject_GC_UnTrack()``.
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index aa582ed8dec..adbe7897004 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -1717,6 +1717,8 @@ dequeiter_traverse(dequeiterobject *dio, visitproc visit, void *arg)
 static void
 dequeiter_dealloc(dequeiterobject *dio)
 {
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    PyObject_GC_UnTrack(dio);
     Py_XDECREF(dio->deque);
     PyObject_GC_Del(dio);
 }
@@ -2097,6 +2099,8 @@ static PyMemberDef defdict_members[] = {
 static void
 defdict_dealloc(defdictobject *dd)
 {
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    PyObject_GC_UnTrack(dd);
     Py_CLEAR(dd->default_factory);
     PyDict_Type.tp_dealloc((PyObject *)dd);
 }
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 3537f19b1c7..857005a2a9b 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -627,6 +627,7 @@ element_gc_clear(ElementObject *self)
 static void
 element_dealloc(ElementObject* self)
 {
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
     PyObject_GC_UnTrack(self);
     Py_TRASHCAN_SAFE_BEGIN(self)
 
@@ -2076,6 +2077,8 @@ elementiter_dealloc(ElementIterObject *it)
 {
     Py_ssize_t i = it->parent_stack_used;
     it->parent_stack_used = 0;
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    PyObject_GC_UnTrack(it);
     while (i--)
         Py_XDECREF(it->parent_stack[i].parent);
     PyMem_Free(it->parent_stack);
@@ -2083,7 +2086,6 @@ elementiter_dealloc(ElementIterObject *it)
     Py_XDECREF(it->sought_tag);
     Py_XDECREF(it->root_element);
 
-    PyObject_GC_UnTrack(it);
     PyObject_GC_Del(it);
 }
 
diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
index da1d2e16dba..33761a46667 100644
--- a/Modules/_functoolsmodule.c
+++ b/Modules/_functoolsmodule.c
@@ -113,6 +113,7 @@ partial_new(PyTypeObject *type, PyObject *args, PyObject *kw)
 static void
 partial_dealloc(partialobject *pto)
 {
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
     PyObject_GC_UnTrack(pto);
     if (pto->weakreflist != NULL)
         PyObject_ClearWeakRefs((PyObject *) pto);
@@ -1073,7 +1074,11 @@ lru_cache_clear_list(lru_list_elem *link)
 static void
 lru_cache_dealloc(lru_cache_object *obj)
 {
-    lru_list_elem *list = lru_cache_unlink_list(obj);
+    lru_list_elem *list;
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    PyObject_GC_UnTrack(obj);
+
+    list = lru_cache_unlink_list(obj);
     Py_XDECREF(obj->maxsize_O);
     Py_XDECREF(obj->func);
     Py_XDECREF(obj->cache);
diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
index 42c7f7933e0..ba33f8c50d6 100644
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -1084,6 +1084,8 @@ bytesiobuf_traverse(bytesiobuf *self, visitproc visit, void *arg)
 static void
 bytesiobuf_dealloc(bytesiobuf *self)
 {
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    PyObject_GC_UnTrack(self);
     Py_CLEAR(self->source);
     Py_TYPE(self)->tp_free(self);
 }
diff --git a/Modules/_json.c b/Modules/_json.c
index 6cc31c6e371..54fc90cfece 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -655,7 +655,8 @@ py_encode_basestring(PyObject* self UNUSED, PyObject *pystr)
 static void
 scanner_dealloc(PyObject *self)
 {
-    /* Deallocate scanner object */
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    PyObject_GC_UnTrack(self);
     scanner_clear(self);
     Py_TYPE(self)->tp_free(self);
 }
@@ -1778,7 +1779,8 @@ encoder_listencode_list(PyEncoderObject *s, _PyAccu *acc,
 static void
 encoder_dealloc(PyObject *self)
 {
-    /* Deallocate Encoder */
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    PyObject_GC_UnTrack(self);
     encoder_clear(self);
     Py_TYPE(self)->tp_free(self);
 }
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 1380c575119..e8abcb286f2 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -2778,6 +2778,8 @@ context_clear(PySSLContext *self)
 static void
 context_dealloc(PySSLContext *self)
 {
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    PyObject_GC_UnTrack(self);
     context_clear(self);
     SSL_CTX_free(self->ctx);
 #ifdef OPENSSL_NPN_NEGOTIATED
@@ -4292,6 +4294,7 @@ static PyTypeObject PySSLMemoryBIO_Type = {
 static void
 PySSLSession_dealloc(PySSLSession *self)
 {
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
     PyObject_GC_UnTrack(self);
     Py_XDECREF(self->ctx);
     if (self->session != NULL) {
diff --git a/Modules/_struct.c b/Modules/_struct.c
index b5fbc43564c..69a1e996d05 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -1589,6 +1589,8 @@ typedef struct {
 static void
 unpackiter_dealloc(unpackiterobject *self)
 {
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    PyObject_GC_UnTrack(self);
     Py_XDECREF(self->so);
     PyBuffer_Release(&self->buf);
     PyObject_GC_Del(self);
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index e395f4dabb3..f055170750d 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1847,6 +1847,8 @@ dict_dealloc(PyDictObject *mp)
     PyObject **values = mp->ma_values;
     PyDictKeysObject *keys = mp->ma_keys;
     Py_ssize_t i, n;
+
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
     PyObject_GC_UnTrack(mp);
     Py_TRASHCAN_SAFE_BEGIN(mp)
     if (values != NULL) {
@@ -3270,6 +3272,8 @@ dictiter_new(PyDictObject *dict, PyTypeObject *itertype)
 static void
 dictiter_dealloc(dictiterobject *di)
 {
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    _PyObject_GC_UNTRACK(di);
     Py_XDECREF(di->di_dict);
     Py_XDECREF(di->di_result);
     PyObject_GC_Del(di);
@@ -3629,6 +3633,8 @@ dictiter_reduce(dictiterobject *di)
 static void
 dictview_dealloc(_PyDictViewObject *dv)
 {
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    _PyObject_GC_UNTRACK(dv);
     Py_XDECREF(dv->dv_dict);
     PyObject_GC_Del(dv);
 }
diff --git a/Objects/setobject.c b/Objects/setobject.c
index 2347b9d70ad..5c61bc71795 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -553,6 +553,7 @@ set_dealloc(PySetObject *so)
     setentry *entry;
     Py_ssize_t used = so->used;
 
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
     PyObject_GC_UnTrack(so);
     Py_TRASHCAN_SAFE_BEGIN(so)
     if (so->weakreflist != NULL)
@@ -809,6 +810,8 @@ typedef struct {
 static void
 setiter_dealloc(setiterobject *si)
 {
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    _PyObject_GC_UNTRACK(si);
     Py_XDECREF(si->si_set);
     PyObject_GC_Del(si);
 }
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index b367e10231c..f6c3a661172 100644
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -633,6 +633,8 @@ def visitModule(self, mod):
 static void
 ast_dealloc(AST_object *self)
 {
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    PyObject_GC_UnTrack(self);
     Py_CLEAR(self->dict);
     Py_TYPE(self)->tp_free(self);
 }
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index 77852f923f4..2f1e737ea65 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -520,6 +520,8 @@ typedef struct {
 static void
 ast_dealloc(AST_object *self)
 {
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    PyObject_GC_UnTrack(self);
     Py_CLEAR(self->dict);
     Py_TYPE(self)->tp_free(self);
 }


From solipsis at pitrou.net  Thu Aug 24 05:05:13 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 24 Aug 2017 09:05:13 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=4
Message-ID: <20170824090512.124480.4B365658D11E2F63@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_functools leaked [0, 3, 1] memory blocks, sum=4


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogzToqGS', '--timeout', '7200']

From webhook-mailer at python.org  Thu Aug 24 12:43:59 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Thu, 24 Aug 2017 16:43:59 -0000
Subject: [Python-checkins] bpo-23835: Restore legacy defaults= behavior for
 RawConfigParser (#3191)
Message-ID: <mailman.101.1503593040.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/a5fab17fc11433b2418f626dc51e8a3d07b198ca
commit: a5fab17fc11433b2418f626dc51e8a3d07b198ca
branch: master
author: ?ukasz Langa <lukasz at langa.pl>
committer: GitHub <noreply at github.com>
date: 2017-08-24T09:43:53-07:00
summary:

bpo-23835: Restore legacy defaults= behavior for RawConfigParser (#3191)

The fix for bpo-23835 fixed ConfigParser behavior in defaults= handling.
Unfortunately, it caused a backwards compatibility regression with
RawConfigParser objects which allow for non-string values.

This commit restores the legacy behavior for RawConfigParser only.

files:
M Doc/library/configparser.rst
M Lib/configparser.py
M Lib/test/test_configparser.py

diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
index c31a7e94651..acca6470111 100644
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -1213,8 +1213,10 @@ RawConfigParser Objects
                            default_section=configparser.DEFAULTSECT[, \
                            interpolation])
 
-   Legacy variant of the :class:`ConfigParser` with interpolation disabled
-   by default and unsafe ``add_section`` and ``set`` methods.
+   Legacy variant of the :class:`ConfigParser`.  It has interpolation
+   disabled by default and allows for non-string section names, option
+   names, and values via its unsafe ``add_section`` and ``set`` methods,
+   as well as the legacy ``defaults=`` keyword argument handling.
 
    .. note::
       Consider using :class:`ConfigParser` instead which checks types of
diff --git a/Lib/configparser.py b/Lib/configparser.py
index 360924008dc..e172ac8b36f 100644
--- a/Lib/configparser.py
+++ b/Lib/configparser.py
@@ -635,7 +635,7 @@ def __init__(self, defaults=None, dict_type=_default_dict,
         if converters is not _UNSET:
             self._converters.update(converters)
         if defaults:
-            self.read_dict({default_section: defaults})
+            self._read_defaults(defaults)
 
     def defaults(self):
         return self._defaults
@@ -1121,6 +1121,12 @@ def _join_multiline_values(self):
                                                                 section,
                                                                 name, val)
 
+    def _read_defaults(self, defaults):
+        """Read the defaults passed in the initializer.
+        Note: values can be non-string."""
+        for key, value in defaults.items():
+            self._defaults[self.optionxform(key)] = value
+
     def _handle_error(self, exc, fpname, lineno, line):
         if not exc:
             exc = ParsingError(fpname)
@@ -1198,6 +1204,11 @@ def add_section(self, section):
         self._validate_value_types(section=section)
         super().add_section(section)
 
+    def _read_defaults(self, defaults):
+        """Reads the defaults passed in the initializer, implicitly converting
+        values to strings like the rest of the API."""
+        self.read_dict({self.default_section: defaults})
+
 
 class SafeConfigParser(ConfigParser):
     """ConfigParser alias for backwards compatibility purposes."""
diff --git a/Lib/test/test_configparser.py b/Lib/test/test_configparser.py
index be22fa40310..d8969efc4db 100644
--- a/Lib/test/test_configparser.py
+++ b/Lib/test/test_configparser.py
@@ -855,15 +855,6 @@ def test_invalid_multiline_value(self):
         self.assertEqual(cf.get('DEFAULT', 'test'), 'test')
         self.assertEqual(cf['DEFAULT']['test'], 'test')
 
-    def test_defaults_keyword(self):
-        # test that bpo-23835 is fixed
-        cf = self.newconfig(defaults={1: 2.4})
-        self.assertEqual(cf[self.default_section]['1'], '2.4')
-        self.assertAlmostEqual(cf[self.default_section].getfloat('1'), 2.4)
-        cf = self.newconfig(defaults={"A": 5.2})
-        self.assertEqual(cf[self.default_section]['a'], '5.2')
-        self.assertAlmostEqual(cf[self.default_section].getfloat('a'), 5.2)
-
 
 class StrictTestCase(BasicTestCase, unittest.TestCase):
     config_class = configparser.RawConfigParser
@@ -959,6 +950,15 @@ def test_add_section_default(self):
         cf = self.newconfig()
         self.assertRaises(ValueError, cf.add_section, self.default_section)
 
+    def test_defaults_keyword(self):
+        """bpo-23835 fix for ConfigParser"""
+        cf = self.newconfig(defaults={1: 2.4})
+        self.assertEqual(cf[self.default_section]['1'], '2.4')
+        self.assertAlmostEqual(cf[self.default_section].getfloat('1'), 2.4)
+        cf = self.newconfig(defaults={"A": 5.2})
+        self.assertEqual(cf[self.default_section]['a'], '5.2')
+        self.assertAlmostEqual(cf[self.default_section].getfloat('a'), 5.2)
+
 
 class ConfigParserTestCaseNoInterpolation(BasicTestCase, unittest.TestCase):
     config_class = configparser.ConfigParser
@@ -1099,6 +1099,15 @@ def test_set_nonstring_types(self):
             cf.set('non-string', 1, 1)
             self.assertEqual(cf.get('non-string', 1), 1)
 
+    def test_defaults_keyword(self):
+        """bpo-23835 legacy behavior for RawConfigParser"""
+        with self.assertRaises(AttributeError) as ctx:
+            self.newconfig(defaults={1: 2.4})
+        err = ctx.exception
+        self.assertEqual(str(err), "'int' object has no attribute 'lower'")
+        cf = self.newconfig(defaults={"A": 5.2})
+        self.assertAlmostEqual(cf[self.default_section]['a'], 5.2)
+
 
 class RawConfigParserTestCaseNonStandardDelimiters(RawConfigParserTestCase):
     delimiters = (':=', '$')


From webhook-mailer at python.org  Thu Aug 24 12:51:27 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 24 Aug 2017 16:51:27 -0000
Subject: [Python-checkins] bpo-28261: fix err msgs where PyArg_ParseTuple is
 used to parse normal tuples (leftovers) (#3198)
Message-ID: <mailman.102.1503593489.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/13614e375cc3637cf1311733d453df6107e964ea
commit: 13614e375cc3637cf1311733d453df6107e964ea
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-24T19:51:24+03:00
summary:

bpo-28261: fix err msgs where PyArg_ParseTuple is used to parse normal tuples (leftovers) (#3198)

files:
M Modules/_io/textio.c

diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 57b66d66c33..5103ae659ce 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -531,7 +531,15 @@ _io_IncrementalNewlineDecoder_getstate_impl(nldecoder_object *self)
            _PyIO_str_getstate, NULL);
         if (state == NULL)
             return NULL;
-        if (!PyArg_ParseTuple(state, "OK", &buffer, &flag)) {
+        if (!PyTuple_Check(state)) {
+            PyErr_SetString(PyExc_TypeError,
+                            "illegal decoder state");
+            Py_DECREF(state);
+            return NULL;
+        }
+        if (!PyArg_ParseTuple(state, "OK;illegal decoder state",
+                              &buffer, &flag))
+        {
             Py_DECREF(state);
             return NULL;
         }
@@ -669,7 +677,7 @@ typedef struct
                                       written, or NULL */
     Py_ssize_t pending_bytes_count;
 
-    /* snapshot is either None, or a tuple (dec_flags, next_input) where
+    /* snapshot is either NULL, or a tuple (dec_flags, next_input) where
      * dec_flags is the second (integer) item of the decoder state and
      * next_input is the chunk of input bytes that comes next after the
      * snapshot point.  We use this to reconstruct decoder states in tell().
@@ -2351,6 +2359,7 @@ _io_TextIOWrapper_tell_impl(textio *self)
         goto fail;
 
     /* Skip backward to the snapshot point (see _read_chunk). */
+    assert(PyTuple_Check(self->snapshot));
     if (!PyArg_ParseTuple(self->snapshot, "iO", &cookie.dec_flags, &next_input))
         goto fail;
 
@@ -2378,7 +2387,15 @@ _io_TextIOWrapper_tell_impl(textio *self)
             _PyIO_str_getstate, NULL); \
         if (_state == NULL) \
             goto fail; \
-        if (!PyArg_ParseTuple(_state, "Oi", &dec_buffer, &dec_flags)) { \
+        if (!PyTuple_Check(_state)) { \
+            PyErr_SetString(PyExc_TypeError, \
+                            "illegal decoder state"); \
+            Py_DECREF(_state); \
+            goto fail; \
+        } \
+        if (!PyArg_ParseTuple(_state, "Oi;illegal decoder state", \
+                              &dec_buffer, &dec_flags)) \
+        { \
             Py_DECREF(_state); \
             goto fail; \
         } \


From webhook-mailer at python.org  Thu Aug 24 14:33:45 2017
From: webhook-mailer at python.org (Steve Dower)
Date: Thu, 24 Aug 2017 18:33:45 -0000
Subject: [Python-checkins] bpo-29741: Update some methods in the _pyio
 module to also accept integer types. Patch by Oren Milman. (#560)
Message-ID: <mailman.103.1503599627.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/de50360ac2fec81dbf733f6c3c739b39a8822a39
commit: de50360ac2fec81dbf733f6c3c739b39a8822a39
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Steve Dower <steve.dower at microsoft.com>
date: 2017-08-24T11:33:42-07:00
summary:

bpo-29741: Update some methods in the _pyio module to also accept integer types. Patch by Oren Milman. (#560)

files:
A Misc/NEWS.d/next/Library/2017-08-23-00-31-32.bpo-29741.EBn_DM.rst
M Lib/_pyio.py
M Lib/test/test_memoryio.py

diff --git a/Lib/_pyio.py b/Lib/_pyio.py
index d50230dbfd8..4653847bcb1 100644
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -504,8 +504,13 @@ def nreadahead():
                 return 1
         if size is None:
             size = -1
-        elif not isinstance(size, int):
-            raise TypeError("size must be an integer")
+        else:
+            try:
+                size_index = size.__index__
+            except AttributeError:
+                raise TypeError(f"{size!r} is not an integer")
+            else:
+                size = size_index()
         res = bytearray()
         while size < 0 or len(res) < size:
             b = self.read(nreadahead())
@@ -868,6 +873,13 @@ def read(self, size=-1):
             raise ValueError("read from closed file")
         if size is None:
             size = -1
+        else:
+            try:
+                size_index = size.__index__
+            except AttributeError:
+                raise TypeError(f"{size!r} is not an integer")
+            else:
+                size = size_index()
         if size < 0:
             size = len(self._buffer)
         if len(self._buffer) <= self._pos:
@@ -905,9 +917,11 @@ def seek(self, pos, whence=0):
         if self.closed:
             raise ValueError("seek on closed file")
         try:
-            pos.__index__
-        except AttributeError as err:
-            raise TypeError("an integer is required") from err
+            pos_index = pos.__index__
+        except AttributeError:
+            raise TypeError(f"{pos!r} is not an integer")
+        else:
+            pos = pos_index()
         if whence == 0:
             if pos < 0:
                 raise ValueError("negative seek position %r" % (pos,))
@@ -932,9 +946,11 @@ def truncate(self, pos=None):
             pos = self._pos
         else:
             try:
-                pos.__index__
-            except AttributeError as err:
-                raise TypeError("an integer is required") from err
+                pos_index = pos.__index__
+            except AttributeError:
+                raise TypeError(f"{pos!r} is not an integer")
+            else:
+                pos = pos_index()
             if pos < 0:
                 raise ValueError("negative truncate position %r" % (pos,))
         del self._buffer[pos:]
@@ -2378,11 +2394,14 @@ def read(self, size=None):
         self._checkReadable()
         if size is None:
             size = -1
+        else:
+            try:
+                size_index = size.__index__
+            except AttributeError:
+                raise TypeError(f"{size!r} is not an integer")
+            else:
+                size = size_index()
         decoder = self._decoder or self._get_decoder()
-        try:
-            size.__index__
-        except AttributeError as err:
-            raise TypeError("an integer is required") from err
         if size < 0:
             # Read everything.
             result = (self._get_decoded_chars() +
@@ -2413,8 +2432,13 @@ def readline(self, size=None):
             raise ValueError("read from closed file")
         if size is None:
             size = -1
-        elif not isinstance(size, int):
-            raise TypeError("size must be an integer")
+        else:
+            try:
+                size_index = size.__index__
+            except AttributeError:
+                raise TypeError(f"{size!r} is not an integer")
+            else:
+                size = size_index()
 
         # Grab all the decoded text (we will rewind any extra bits later).
         line = self._get_decoded_chars()
diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py
index 80055ce1e7d..e16c57e9435 100644
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -11,6 +11,13 @@
 import pickle
 import sys
 
+class IntLike:
+    def __init__(self, num):
+        self._num = num
+    def __index__(self):
+        return self._num
+    __int__ = __index__
+
 class MemorySeekTestMixin:
 
     def testInit(self):
@@ -116,7 +123,10 @@ def test_truncate(self):
         memio = self.ioclass(buf)
 
         self.assertRaises(ValueError, memio.truncate, -1)
+        self.assertRaises(ValueError, memio.truncate, IntLike(-1))
         memio.seek(6)
+        self.assertEqual(memio.truncate(IntLike(8)), 8)
+        self.assertEqual(memio.getvalue(), buf[:8])
         self.assertEqual(memio.truncate(), 6)
         self.assertEqual(memio.getvalue(), buf[:6])
         self.assertEqual(memio.truncate(4), 4)
@@ -131,6 +141,7 @@ def test_truncate(self):
         self.assertRaises(TypeError, memio.truncate, '0')
         memio.close()
         self.assertRaises(ValueError, memio.truncate, 0)
+        self.assertRaises(ValueError, memio.truncate, IntLike(0))
 
     def test_init(self):
         buf = self.buftype("1234567890")
@@ -154,12 +165,19 @@ def test_read(self):
         self.assertEqual(memio.read(900), buf[5:])
         self.assertEqual(memio.read(), self.EOF)
         memio.seek(0)
+        self.assertEqual(memio.read(IntLike(0)), self.EOF)
+        self.assertEqual(memio.read(IntLike(1)), buf[:1])
+        self.assertEqual(memio.read(IntLike(4)), buf[1:5])
+        self.assertEqual(memio.read(IntLike(900)), buf[5:])
+        memio.seek(0)
         self.assertEqual(memio.read(), buf)
         self.assertEqual(memio.read(), self.EOF)
         self.assertEqual(memio.tell(), 10)
         memio.seek(0)
         self.assertEqual(memio.read(-1), buf)
         memio.seek(0)
+        self.assertEqual(memio.read(IntLike(-1)), buf)
+        memio.seek(0)
         self.assertEqual(type(memio.read()), type(buf))
         memio.seek(100)
         self.assertEqual(type(memio.read()), type(buf))
@@ -169,6 +187,8 @@ def test_read(self):
         memio.seek(len(buf) + 1)
         self.assertEqual(memio.read(1), self.EOF)
         memio.seek(len(buf) + 1)
+        self.assertEqual(memio.read(IntLike(1)), self.EOF)
+        memio.seek(len(buf) + 1)
         self.assertEqual(memio.read(), self.EOF)
         memio.close()
         self.assertRaises(ValueError, memio.read)
@@ -178,6 +198,7 @@ def test_readline(self):
         memio = self.ioclass(buf * 2)
 
         self.assertEqual(memio.readline(0), self.EOF)
+        self.assertEqual(memio.readline(IntLike(0)), self.EOF)
         self.assertEqual(memio.readline(), buf)
         self.assertEqual(memio.readline(), buf)
         self.assertEqual(memio.readline(), self.EOF)
@@ -186,9 +207,16 @@ def test_readline(self):
         self.assertEqual(memio.readline(5), buf[5:10])
         self.assertEqual(memio.readline(5), buf[10:15])
         memio.seek(0)
+        self.assertEqual(memio.readline(IntLike(5)), buf[:5])
+        self.assertEqual(memio.readline(IntLike(5)), buf[5:10])
+        self.assertEqual(memio.readline(IntLike(5)), buf[10:15])
+        memio.seek(0)
         self.assertEqual(memio.readline(-1), buf)
         memio.seek(0)
+        self.assertEqual(memio.readline(IntLike(-1)), buf)
+        memio.seek(0)
         self.assertEqual(memio.readline(0), self.EOF)
+        self.assertEqual(memio.readline(IntLike(0)), self.EOF)
         # Issue #24989: Buffer overread
         memio.seek(len(buf) * 2 + 1)
         self.assertEqual(memio.readline(), self.EOF)
diff --git a/Misc/NEWS.d/next/Library/2017-08-23-00-31-32.bpo-29741.EBn_DM.rst b/Misc/NEWS.d/next/Library/2017-08-23-00-31-32.bpo-29741.EBn_DM.rst
new file mode 100644
index 00000000000..dce720b193b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-23-00-31-32.bpo-29741.EBn_DM.rst
@@ -0,0 +1,2 @@
+Update some methods in the _pyio module to also accept integer types. Patch
+by Oren Milman.


From lp_benchmark_robot at intel.com  Thu Aug 24 16:43:03 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Thu, 24 Aug 2017 13:43:03 -0700
Subject: [Python-checkins] [1 down, 1 up,
 63 flat] Results for Python (master branch) 2017-08-24
Message-ID: <aa7552c5-3d98-42fa-837c-74c9ed3825a9@orsmsx109.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-24 03:04:17-07:00.
  - commit:		a6296d3
  - previous commit:	772d809
  - revision date:	2017-08-24 14:55:17+09:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.096% |  -0.400%   |  +3.482%   |  +8.582%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 2.083% |  +3.812%   |  +23.841%  |  +7.359%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 2.001% |  +3.477%   |  +24.714%  |  +6.876%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |     call_method_unknown| 0.949% |  +3.544%   |  +23.041%  |  +6.162%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 1.564% |  +1.694%   |  +2.889%   |  +17.139%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 2.164% |  +0.359%   |  +11.858%  |  +8.896%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.590% |  -0.763%   |  +6.032%   |  +12.169%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.462% |  +0.142%   |  +3.693%   |  +5.968%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.437% |  -1.158%   |  +6.734%   |  +18.850%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 1.708% |  -1.453%   |  +9.585%   |  +11.864%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.100% |  +0.464%   |  +4.137%   |  +6.915%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.995% |  +0.577%   |  +5.116%   |  +5.270%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 1.138% |  +1.328%   |  +3.067%   |  +6.772%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.523% |  +0.717%   |  +9.168%   |  +10.593%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.356% |  -3.009%   |  +5.925%   |  +10.038%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.792% |  +1.344%   |  +6.365%   |  +10.887%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.339% |  -0.079%   |  +9.183%   |  +11.232%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.389% |  -1.134%   |  +6.717%   |  +10.085%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.934% |  +1.020%   |  +4.627%   |  +8.074%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 1.458% |  -1.530%   |  +1.454%   |  +11.445%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.298% |  -2.513%   |  +6.977%   |  +11.982%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.821% |  -0.355%   |  +46.437%  |  +11.952%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.655% |  -1.964%   |  +8.889%   |  +11.258%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.953% |  +1.915%   |  +19.285%  |  +11.507%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 4.470% |  -1.096%   |  +5.193%   |  +14.435%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 3.371% |  +1.219%   |  +4.830%   |  +3.264%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.470% |  +0.091%   |  -4.911%   |  +5.910%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.651% |  -0.180%   |  +2.343%   |  +5.941%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.637% |  -0.226%   |  +4.269%   |  +9.073%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.337% |  -0.035%   |  +0.320%   |  +22.688%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( |             pickle_dict| 0.484% |  -2.394%   |  +1.389%   |  +23.214%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.990% |  -0.257%   |  +6.161%   |  +17.924%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 5.588% |  -1.056%   |  +10.690%  |  +10.301%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.339% |  +0.006%   |  +0.256%   |  +10.337%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.130% |  +0.755%   |  +8.721%   |  +4.804%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.094% |  +0.265%   |  +0.712%   |  +4.721%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.741% |  +0.128%   |  +9.051%   |  +13.864%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.751% |  +0.700%   |  -7.775%   |  +9.785%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.360% |  -0.415%   |  +1.764%   |  +3.419%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.733% |  -1.170%   |  +0.688%   |  -3.925%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.364% |  -0.536%   |  +11.320%  |  +4.333%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.360% |  +1.420%   |  +8.248%   |  +14.567%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.644% |  +0.217%   |  +0.625%   |  +3.359%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.427% |  +0.044%   |  +26.661%  |  +8.880%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.608% |  +1.842%   |  +5.098%   |  +5.666%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.413% |  +0.826%   |  +14.963%  |  +7.544%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 4.509% |  -0.450%   |  +0.280%   |  +0.548%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 2.674% |  -0.954%   |  +4.910%   |  +4.784%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.819% |  +0.353%   |  +5.980%   |  +5.958%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.539% |  +0.119%   |  +5.757%   |  +4.162%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 3.494% |  -1.034%   |  +0.832%   |  +10.007%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.110% |  -0.354%   |  +12.747%  |  +6.915%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.577% |  +0.282%   |  +10.445%  |  +5.526%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.269% |  -1.410%   |  +11.650%  |  +8.798%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.316% |  +1.277%   |  +14.398%  |  +6.382%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 3.757% |  +3.569%   |  +23.199%  |  +11.259%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.351% |  +0.353%   |  +5.944%   |  +4.262%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.206% |  +0.435%   |  +2.280%   |  -0.355%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 9.633% |  -1.663%   |  +7.380%   |  +20.251%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 1.465% |  +0.215%   |  -2.007%   |  +21.475%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 2.148% |  +0.059%   |  +6.627%   |  +6.423%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.179% |  -0.323%   |  +5.802%   |  +7.027%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.600% |  +0.244%   |  +2.146%   |  +6.680%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 1.882% |  +0.094%   |  -5.057%   |  +10.429%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.356% |  -0.523%   |  +6.752%   |  +7.229%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/1-down-1-up-63-flat-results-for-python-master-branch-2017-08-24

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Thu Aug 24 17:58:28 2017
From: webhook-mailer at python.org (Gregory P. Smith)
Date: Thu, 24 Aug 2017 21:58:28 -0000
Subject: [Python-checkins] bpo-22536: Set the filename in FileNotFoundError.
 (#3194)
Message-ID: <mailman.104.1503611909.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/8621bb5d93239316f97281826461b85072ff6db7
commit: 8621bb5d93239316f97281826461b85072ff6db7
branch: master
author: Gregory P. Smith <greg at krypto.org>
committer: GitHub <noreply at github.com>
date: 2017-08-24T14:58:25-07:00
summary:

bpo-22536: Set the filename in FileNotFoundError. (#3194)

Have the subprocess module set the filename in the FileNotFoundError
exception raised on POSIX systems when the executable or cwd are missing.

files:
A Misc/NEWS.d/next/Library/2017-08-23.bpo-22536._narf_.rst
M Lib/subprocess.py
M Lib/test/test_subprocess.py

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 2805ec3fa37..bafb501fcf1 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1327,15 +1327,15 @@ def _execute_child(self, args, executable, preexec_fn, close_fds,
                     child_exec_never_called = (err_msg == "noexec")
                     if child_exec_never_called:
                         err_msg = ""
+                        # The error must be from chdir(cwd).
+                        err_filename = cwd
+                    else:
+                        err_filename = orig_executable
                     if errno_num != 0:
                         err_msg = os.strerror(errno_num)
                         if errno_num == errno.ENOENT:
-                            if child_exec_never_called:
-                                # The error must be from chdir(cwd).
-                                err_msg += ': ' + repr(cwd)
-                            else:
-                                err_msg += ': ' + repr(orig_executable)
-                    raise child_exception_type(errno_num, err_msg)
+                            err_msg += ': ' + repr(err_filename)
+                    raise child_exception_type(errno_num, err_msg, err_filename)
                 raise child_exception_type(err_msg)
 
 
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index c24fd1e2400..ac70597ddbd 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1371,6 +1371,16 @@ def test_failed_child_execute_fd_leak(self):
         fds_after_exception = os.listdir(fd_directory)
         self.assertEqual(fds_before_popen, fds_after_exception)
 
+    def test_file_not_found_includes_filename(self):
+        with self.assertRaises(FileNotFoundError) as c:
+            subprocess.call(['/opt/nonexistent_binary', 'with', 'some', 'args'])
+        self.assertEqual(c.exception.filename, '/opt/nonexistent_binary')
+
+    def test_file_not_found_with_bad_cwd(self):
+        with self.assertRaises(FileNotFoundError) as c:
+            subprocess.Popen(['exit', '0'], cwd='/some/nonexistent/directory')
+        self.assertEqual(c.exception.filename, '/some/nonexistent/directory')
+
 
 class RunFuncTestCase(BaseTestCase):
     def run_python(self, code, **kwargs):
diff --git a/Misc/NEWS.d/next/Library/2017-08-23.bpo-22536._narf_.rst b/Misc/NEWS.d/next/Library/2017-08-23.bpo-22536._narf_.rst
new file mode 100644
index 00000000000..bd238f95b8a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-23.bpo-22536._narf_.rst
@@ -0,0 +1,2 @@
+The subprocess module now sets the filename when FileNotFoundError
+is raised on POSIX systems due to the executable or cwd not being found.


From webhook-mailer at python.org  Thu Aug 24 21:15:05 2017
From: webhook-mailer at python.org (Gregory P. Smith)
Date: Fri, 25 Aug 2017 01:15:05 -0000
Subject: [Python-checkins] Skip two tests not intended to pass on Windows.
 (#3202)
Message-ID: <mailman.105.1503623706.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/a3a6df36b6e0d1d560f8fb2a4873d5b97329c454
commit: a3a6df36b6e0d1d560f8fb2a4873d5b97329c454
branch: master
author: Gregory P. Smith <greg at krypto.org>
committer: GitHub <noreply at github.com>
date: 2017-08-24T18:15:02-07:00
summary:

Skip two tests not intended to pass on Windows. (#3202)

files:
M Lib/test/test_subprocess.py

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index ac70597ddbd..7d0708d5f7f 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1371,11 +1371,13 @@ def test_failed_child_execute_fd_leak(self):
         fds_after_exception = os.listdir(fd_directory)
         self.assertEqual(fds_before_popen, fds_after_exception)
 
+    @unittest.skipIf(mswindows, "behavior currently not supported on Windows")
     def test_file_not_found_includes_filename(self):
         with self.assertRaises(FileNotFoundError) as c:
             subprocess.call(['/opt/nonexistent_binary', 'with', 'some', 'args'])
         self.assertEqual(c.exception.filename, '/opt/nonexistent_binary')
 
+    @unittest.skipIf(mswindows, "behavior currently not supported on Windows")
     def test_file_not_found_with_bad_cwd(self):
         with self.assertRaises(FileNotFoundError) as c:
             subprocess.Popen(['exit', '0'], cwd='/some/nonexistent/directory')


From solipsis at pitrou.net  Fri Aug 25 05:06:00 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 25 Aug 2017 09:06:00 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=2
Message-ID: <20170825090559.123743.872B47FF5C2EB686@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [0, 7, -7] memory blocks, sum=0
test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_fork leaked [-2, 1, 1] memory blocks, sum=0
test_multiprocessing_forkserver leaked [-1, 1, -2] memory blocks, sum=-2


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogRu57dw', '--timeout', '7200']

From webhook-mailer at python.org  Fri Aug 25 08:07:52 2017
From: webhook-mailer at python.org (Stefan Krah)
Date: Fri, 25 Aug 2017 12:07:52 -0000
Subject: [Python-checkins] bpo-30923: Silence fall-through warnings in
 libexpat build. (#3205)
Message-ID: <mailman.106.1503662874.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/9e1e6f528f3fec16b9bd99f5ee38048ffec04a81
commit: 9e1e6f528f3fec16b9bd99f5ee38048ffec04a81
branch: master
author: Stefan Krah <skrah at bytereef.org>
committer: GitHub <noreply at github.com>
date: 2017-08-25T14:07:50+02:00
summary:

bpo-30923: Silence fall-through warnings in libexpat build. (#3205)

files:
M setup.py

diff --git a/setup.py b/setup.py
index f3c2538345e..36a52bc6aac 100644
--- a/setup.py
+++ b/setup.py
@@ -1518,6 +1518,7 @@ class db_found(Exception): pass
         if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
             expat_inc = []
             define_macros = []
+            extra_compile_args = []
             expat_lib = ['expat']
             expat_sources = []
             expat_depends = []
@@ -1529,6 +1530,7 @@ class db_found(Exception): pass
                 # call XML_SetHashSalt(), expat entropy sources are not needed
                 ('XML_POOR_ENTROPY', '1'),
             ]
+            extra_compile_args = []
             expat_lib = []
             expat_sources = ['expat/xmlparse.c',
                              'expat/xmlrole.c',
@@ -1546,8 +1548,15 @@ class db_found(Exception): pass
                              'expat/xmltok_impl.h'
                              ]
 
+            cc = sysconfig.get_config_var('CC').split()[0]
+            ret = os.system(
+                      '"%s" -Werror -Wimplicit-fallthrough -E -xc /dev/null >/dev/null 2>&1' % cc)
+            if ret >> 8 == 0:
+                extra_compile_args.append('-Wno-implicit-fallthrough')
+
         exts.append(Extension('pyexpat',
                               define_macros = define_macros,
+                              extra_compile_args = extra_compile_args,
                               include_dirs = expat_inc,
                               libraries = expat_lib,
                               sources = ['pyexpat.c'] + expat_sources,


From webhook-mailer at python.org  Fri Aug 25 12:31:27 2017
From: webhook-mailer at python.org (Stefan Krah)
Date: Fri, 25 Aug 2017 16:31:27 -0000
Subject: [Python-checkins] bpo-31275: Small refactoring to silence a
 fall-through warning. (#3206)
Message-ID: <mailman.107.1503678688.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/138753c1b96b5e06a5c5d409fa4cae5e2fe1108b
commit: 138753c1b96b5e06a5c5d409fa4cae5e2fe1108b
branch: master
author: Stefan Krah <skrah at bytereef.org>
committer: GitHub <noreply at github.com>
date: 2017-08-25T18:31:22+02:00
summary:

bpo-31275: Small refactoring to silence a fall-through warning. (#3206)

files:
M Modules/cjkcodecs/_codecs_iso2022.c

diff --git a/Modules/cjkcodecs/_codecs_iso2022.c b/Modules/cjkcodecs/_codecs_iso2022.c
index 1ce4218f308..7394cf67e0e 100644
--- a/Modules/cjkcodecs/_codecs_iso2022.c
+++ b/Modules/cjkcodecs/_codecs_iso2022.c
@@ -807,15 +807,9 @@ jisx0213_encoder(const Py_UCS4 *data, Py_ssize_t *length, void *config)
     case 2: /* second character of unicode pair */
         coded = find_pairencmap((ucs2_t)data[0], (ucs2_t)data[1],
                                 jisx0213_pair_encmap, JISX0213_ENCPAIRS);
-        if (coded == DBCINV) {
-            *length = 1;
-            coded = find_pairencmap((ucs2_t)data[0], 0,
-                      jisx0213_pair_encmap, JISX0213_ENCPAIRS);
-            if (coded == DBCINV)
-                return MAP_UNMAPPABLE;
-        }
-        else
+        if (coded != DBCINV)
             return coded;
+        /* fall through */
 
     case -1: /* flush unterminated */
         *length = 1;


From webhook-mailer at python.org  Fri Aug 25 14:12:09 2017
From: webhook-mailer at python.org (Stefan Krah)
Date: Fri, 25 Aug 2017 18:12:09 -0000
Subject: [Python-checkins] bpo-31279: Silence -Wstringop-overflow warning.
 (#3207)
Message-ID: <mailman.108.1503684731.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/dce6502059f46a04f90938b9d832394c8215397b
commit: dce6502059f46a04f90938b9d832394c8215397b
branch: master
author: Stefan Krah <skrah at bytereef.org>
committer: GitHub <noreply at github.com>
date: 2017-08-25T20:12:05+02:00
summary:

bpo-31279: Silence -Wstringop-overflow warning. (#3207)

files:
M Objects/bytearrayobject.c

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 22dd810a7dd..857a1aa070e 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -224,7 +224,7 @@ PyByteArray_Resize(PyObject *self, Py_ssize_t requested_size)
             return -1;
         }
         memcpy(sval, PyByteArray_AS_STRING(self),
-               Py_MIN(requested_size, Py_SIZE(self)));
+               Py_MIN((size_t)requested_size, (size_t)Py_SIZE(self)));
         PyObject_Free(obj->ob_bytes);
     }
     else {


From webhook-mailer at python.org  Fri Aug 25 14:14:57 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Fri, 25 Aug 2017 18:14:57 -0000
Subject: [Python-checkins] bpo-31271: Fix an assertion failure in
 io.TextIOWrapper.write. (#3201)
Message-ID: <mailman.109.1503684898.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/a5b4ea15b61e3f3985f4f0748a18f8b888a63532
commit: a5b4ea15b61e3f3985f4f0748a18f8b888a63532
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-25T21:14:54+03:00
summary:

bpo-31271: Fix an assertion failure in io.TextIOWrapper.write. (#3201)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst
M Lib/test/test_io.py
M Modules/_io/textio.c

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index ab0cbe16361..ba95c1442fa 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -3225,6 +3225,14 @@ def test_read_nonbytes(self):
         t = self.TextIOWrapper(self.StringIO('a'))
         self.assertRaises(TypeError, t.read)
 
+    def test_illegal_encoder(self):
+        # Issue 31271: Calling write() while the return value of encoder's
+        # encode() is invalid shouldn't cause an assertion failure.
+        rot13 = codecs.lookup("rot13")
+        with support.swap_attr(rot13, '_is_text_encoding', True):
+            t = io.TextIOWrapper(io.BytesIO(b'foo'), encoding="rot13")
+        self.assertRaises(TypeError, t.write, 'bar')
+
     def test_illegal_decoder(self):
         # Issue #17106
         # Bypass the early encoding check added in issue 20404
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst
new file mode 100644
index 00000000000..7bb78801057
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst	
@@ -0,0 +1,2 @@
+Fix an assertion failure in the write() method of `io.TextIOWrapper`, when
+the encoder doesn't return a bytes object. Patch by Oren Milman.
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 5103ae659ce..402f743c61f 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -1387,6 +1387,13 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text)
     Py_DECREF(text);
     if (b == NULL)
         return NULL;
+    if (!PyBytes_Check(b)) {
+        PyErr_Format(PyExc_TypeError,
+                     "encoder should return a bytes object, not '%.200s'",
+                     Py_TYPE(b)->tp_name);
+        Py_DECREF(b);
+        return NULL;
+    }
 
     if (self->pending_bytes == NULL) {
         self->pending_bytes = PyList_New(0);


From lp_benchmark_robot at intel.com  Fri Aug 25 19:06:15 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Fri, 25 Aug 2017 16:06:15 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-25
Message-ID: <d6e8939a-b632-4b8f-adbd-c6725864b655@orsmsx154.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-25 03:04:19-07:00.
  - commit:		a3a6df3
  - previous commit:	a6296d3
  - revision date:	2017-08-24 18:15:02-07:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.076% |  -0.195%   |  +3.294%   |  +7.610%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.395% |  +0.663%   |  +24.346%  |  +6.682%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 1.710% |  -0.004%   |  +24.711%  |  +6.949%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.905% |  +0.058%   |  +23.085%  |  +2.896%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 1.836% |  -0.678%   |  +2.231%   |  +14.293%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 2.095% |  -0.450%   |  +11.462%  |  +10.083%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.624% |  -0.374%   |  +5.680%   |  +11.195%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.857% |  -0.076%   |  +3.620%   |  +5.508%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.518% |  -0.518%   |  +6.251%   |  +17.079%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 5.044% |  -3.165%   |  +6.723%   |  +13.263%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.520% |  -0.450%   |  +3.706%   |  +6.139%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.535% |  +0.243%   |  +5.347%   |  +4.092%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.646% |  +0.451%   |  +3.504%   |  +6.216%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.766% |  -1.114%   |  +8.156%   |  +8.968%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.210% |  +0.195%   |  +6.109%   |  +6.956%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.816% |  -0.094%   |  +6.277%   |  +10.955%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.578% |  -0.470%   |  +8.756%   |  +11.498%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.520% |  -0.103%   |  +6.621%   |  +9.451%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.865% |  +0.297%   |  +4.910%   |  +7.603%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 2.137% |  -0.138%   |  +1.318%   |  +12.914%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.619% |  -1.821%   |  +5.282%   |  +9.944%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.701% |  +0.809%   |  +46.870%  |  +10.810%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.545% |  -1.494%   |  +7.527%   |  +9.041%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.423% |  +0.135%   |  +19.394%  |  +10.299%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 5.176% |  -0.330%   |  +4.880%   |  +13.650%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.080% |  -0.980%   |  +3.898%   |  +4.626%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.539% |  +0.368%   |  -4.524%   |  +5.737%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 1.188% |  -0.575%   |  +1.781%   |  +6.706%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.284% |  -1.699%   |  +2.643%   |  +10.369%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 3.653% |  -0.459%   |  -0.137%   |  +21.211%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.314% |  +0.262%   |  +1.647%   |  +24.466%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.959% |  +0.138%   |  +6.291%   |  +21.780%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 4.125% |  +1.152%   |  +11.719%  |  +9.397%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.234% |  +0.142%   |  +0.398%   |  +9.199%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.138% |  -0.300%   |  +8.447%   |  +4.854%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.098% |  -0.177%   |  +0.536%   |  +4.649%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.386% |  -0.449%   |  +8.643%   |  +13.801%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.335% |  +0.651%   |  -7.074%   |  +10.130%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 1.534% |  -0.003%   |  +1.761%   |  +9.919%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.477% |  -0.468%   |  +0.223%   |  +1.129%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.933% |  -0.171%   |  +11.168%  |  +4.303%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 2.093% |  -0.321%   |  +7.954%   |  +13.895%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.340% |  +0.176%   |  +0.801%   |  +2.531%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.665% |  +0.127%   |  +26.755%  |  +8.678%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.554% |  -0.023%   |  +5.076%   |  +5.099%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.837% |  -0.139%   |  +14.845%  |  +5.847%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 2.973% |  +0.366%   |  +0.645%   |  +0.774%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.381% |  +0.724%   |  +5.599%   |  +1.730%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.324% |  -1.185%   |  +4.866%   |  +8.428%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.207% |  -1.220%   |  +4.607%   |  +5.496%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.310% |  -1.694%   |  -0.849%   |  +11.781%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.499% |  -1.215%   |  +11.686%  |  +8.027%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.519% |  -0.450%   |  +10.042%  |  +5.962%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.550% |  -0.547%   |  +11.168%  |  +9.150%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.469% |  -1.183%   |  +13.385%  |  +9.002%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 3.216% |  -0.507%   |  +22.809%  |  +11.321%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.044% |  -0.419%   |  +5.550%   |  +6.125%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.110% |  +0.015%   |  +2.295%   |  -0.939%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 9.804% |  -0.117%   |  +7.272%   |  +20.740%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.844% |  -0.009%   |  -2.017%   |  +17.694%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 2.898% |  -0.763%   |  +5.915%   |  +7.157%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.521% |  -0.220%   |  +5.595%   |  +7.952%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.367% |  +0.161%   |  +2.303%   |  +5.610%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 1.538% |  -0.150%   |  -5.215%   |  +10.776%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.126% |  +0.320%   |  +7.051%   |  +7.942%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-25

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From solipsis at pitrou.net  Sat Aug 26 05:05:46 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 26 Aug 2017 09:05:46 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=-2
Message-ID: <20170826090545.108118.C1602AF8632D8967@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [0, 0, -7] memory blocks, sum=-7
test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_forkserver leaked [1, -2, 2] memory blocks, sum=1


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflog6_kuqb', '--timeout', '7200']

From webhook-mailer at python.org  Sat Aug 26 08:27:56 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sat, 26 Aug 2017 12:27:56 -0000
Subject: [Python-checkins] [3.6] bpo-28261: Prevent raising SystemError
 where PyArg_ParseTuple is used to parse non-args. (#3210)
Message-ID: <mailman.110.1503750478.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/8e67981fc8e1bf3cb9774b5fbf4a39b8d65ba4ff
commit: 8e67981fc8e1bf3cb9774b5fbf4a39b8d65ba4ff
branch: 3.6
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-26T15:27:50+03:00
summary:

[3.6] bpo-28261: Prevent raising SystemError where PyArg_ParseTuple is used to parse non-args. (#3210)

files:
M Lib/test/test_audioop.py
M Lib/test/test_io.py
M Modules/_io/textio.c
M Modules/audioop.c

diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py
index 8f34d72427e..9baa62ad45c 100644
--- a/Lib/test/test_audioop.py
+++ b/Lib/test/test_audioop.py
@@ -405,6 +405,10 @@ def test_ratecv(self):
             self.assertEqual(audioop.ratecv(datas[w], w, 1, 8000, 8000, None, 30, 10)[0],
                              expected[w])
 
+        self.assertRaises(TypeError, audioop.ratecv, b'', 1, 1, 8000, 8000, 42)
+        self.assertRaises(TypeError, audioop.ratecv,
+                          b'', 1, 1, 8000, 8000, (1, (42,)))
+
     def test_reverse(self):
         for w in 1, 2, 3, 4:
             self.assertEqual(audioop.reverse(b'', w), b'')
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 8c91ad2ad8a..6a2c7a9fca4 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -3410,6 +3410,7 @@ def test_newline_decoder(self):
         decoder = codecs.getincrementaldecoder("utf-8")()
         decoder = self.IncrementalNewlineDecoder(decoder, translate=True)
         self.check_newline_decoding_utf8(decoder)
+        self.assertRaises(TypeError, decoder.setstate, 42)
 
     def test_newline_bytes(self):
         # Issue 5433: Excessive optimization in IncrementalNewlineDecoder
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index bc8d11efa52..61adcf60508 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -538,6 +538,12 @@ _io_IncrementalNewlineDecoder_getstate_impl(nldecoder_object *self)
            _PyIO_str_getstate, NULL);
         if (state == NULL)
             return NULL;
+        if (!PyTuple_Check(state)) {
+            PyErr_SetString(PyExc_TypeError,
+                            "illegal decoder state");
+            Py_DECREF(state);
+            return NULL;
+        }
         if (!PyArg_ParseTuple(state, "OK", &buffer, &flag)) {
             Py_DECREF(state);
             return NULL;
@@ -569,6 +575,10 @@ _io_IncrementalNewlineDecoder_setstate(nldecoder_object *self,
     PyObject *buffer;
     unsigned long long flag;
 
+    if (!PyTuple_Check(state)) {
+        PyErr_SetString(PyExc_TypeError, "state argument must be a tuple");
+        return NULL;
+    }
     if (!PyArg_ParseTuple(state, "OK", &buffer, &flag))
         return NULL;
 
@@ -2320,6 +2330,12 @@ _io_TextIOWrapper_tell_impl(textio *self)
             _PyIO_str_getstate, NULL); \
         if (_state == NULL) \
             goto fail; \
+        if (!PyTuple_Check(_state)) { \
+            PyErr_SetString(PyExc_TypeError, \
+                            "illegal decoder state"); \
+            Py_DECREF(_state); \
+            goto fail; \
+        } \
         if (!PyArg_ParseTuple(_state, "Oi", &dec_buffer, &dec_flags)) { \
             Py_DECREF(_state); \
             goto fail; \
diff --git a/Modules/audioop.c b/Modules/audioop.c
index dcd7788d621..d5820425191 100644
--- a/Modules/audioop.c
+++ b/Modules/audioop.c
@@ -1293,7 +1293,7 @@ audioop_ratecv_impl(PyObject *module, Py_buffer *fragment, int width,
     char *cp, *ncp;
     Py_ssize_t len;
     int chan, d, *prev_i, *cur_i, cur_o;
-    PyObject *samps, *str, *rv = NULL;
+    PyObject *samps, *str, *rv = NULL, *channel;
     int bytes_per_frame;
 
     if (!audioop_check_size(width))
@@ -1354,6 +1354,10 @@ audioop_ratecv_impl(PyObject *module, Py_buffer *fragment, int width,
             prev_i[chan] = cur_i[chan] = 0;
     }
     else {
+        if (!PyTuple_Check(state)) {
+            PyErr_SetString(PyExc_TypeError, "state must be a tuple or None");
+            goto exit;
+        }
         if (!PyArg_ParseTuple(state,
                         "iO!;audioop.ratecv: illegal state argument",
                         &d, &PyTuple_Type, &samps))
@@ -1364,7 +1368,13 @@ audioop_ratecv_impl(PyObject *module, Py_buffer *fragment, int width,
             goto exit;
         }
         for (chan = 0; chan < nchannels; chan++) {
-            if (!PyArg_ParseTuple(PyTuple_GetItem(samps, chan),
+            channel = PyTuple_GetItem(samps, chan);
+            if (!PyTuple_Check(channel)) {
+                PyErr_SetString(PyExc_TypeError,
+                                "ratecv(): illegal state argument");
+                goto exit;
+            }
+            if (!PyArg_ParseTuple(channel,
                                   "ii:ratecv", &prev_i[chan],
                                                &cur_i[chan]))
                 goto exit;


From webhook-mailer at python.org  Sat Aug 26 13:04:15 2017
From: webhook-mailer at python.org (Paul Moore)
Date: Sat, 26 Aug 2017 17:04:15 -0000
Subject: [Python-checkins] bpo-31072: Rename the new filter argument for
 zipapp.create_archive. (#3049)
Message-ID: <mailman.111.1503767058.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/0780bf7578dc4c9c3852dc5e869aba515a2c65b1
commit: 0780bf7578dc4c9c3852dc5e869aba515a2c65b1
branch: master
author: Paul Moore <p.f.moore at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-26T18:04:12+01:00
summary:

bpo-31072: Rename the new filter argument for zipapp.create_archive. (#3049)

bpo-31072: Rename the new filter argument for zipapp.create_archive (GH-3049)

* Rename the new argument to "filter"
* Improve tests for the new functionality
* Add a "What's New" entry.

files:
M Doc/library/zipapp.rst
M Doc/whatsnew/3.7.rst
M Lib/test/test_zipapp.py
M Lib/zipapp.py

diff --git a/Doc/library/zipapp.rst b/Doc/library/zipapp.rst
index 993c2ccc398..120bbbb6620 100644
--- a/Doc/library/zipapp.rst
+++ b/Doc/library/zipapp.rst
@@ -99,7 +99,7 @@ The module defines two convenience functions:
 
 
 .. function:: create_archive(source, target=None, interpreter=None, main=None,
-                             include_file=None)
+                             filter=None)
 
    Create an application archive from *source*.  The source can be any
    of the following:
@@ -144,9 +144,10 @@ The module defines two convenience functions:
    contain a ``__main__.py`` file, as otherwise the resulting archive
    would not be executable.
 
-   The *include_file* argument specifies a callback function that is passed the
-   relative path to the file in order to determine which files to store when
-   being called against a directory.
+   The optional *filter* argument specifies a callback function that
+   is passed a Path object representing the path to the file being added
+   (relative to the source directory).  It should return ``True`` if the
+   file is to be added.
 
    If a file object is specified for *source* or *target*, it is the
    caller's responsibility to close it after calling create_archive.
@@ -157,6 +158,9 @@ The module defines two convenience functions:
    passed to the ``zipfile.ZipFile`` class, and must supply the methods
    needed by that class.
 
+   .. versionadded:: 3.7
+      Added the *filter* argument.
+
 .. function:: get_interpreter(archive)
 
    Return the interpreter specified in the ``#!`` line at the start of the
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index a92ad9f1df4..8547660e188 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -258,6 +258,13 @@ Function :func:`~uu.encode` now accepts an optional *backtick*
 keyword argument.  When it's true, zeros are represented by ``'`'``
 instead of spaces.  (Contributed by Xiang Zhang in :issue:`30103`.)
 
+zipapp
+------
+
+Function :func:`zipapp.create_archive` now accepts an optional *filter*
+argument, to allow the user to select which files should be included in the
+archive.
+
 
 Optimizations
 =============
diff --git a/Lib/test/test_zipapp.py b/Lib/test/test_zipapp.py
index 47eed5f4a6c..56cf37c9afa 100644
--- a/Lib/test/test_zipapp.py
+++ b/Lib/test/test_zipapp.py
@@ -53,10 +53,11 @@ def test_create_archive_with_subdirs(self):
             self.assertIn('foo/', z.namelist())
             self.assertIn('bar/', z.namelist())
 
-    def test_create_archive_with_include_file(self):
-        # Test packing a directory and using include_file to specify which files to include.
-        def skip_pyc_files(file):
-            return '.pyc' not in str(file)
+    def test_create_archive_with_filter(self):
+        # Test packing a directory and using filter to specify
+        # which files to include.
+        def skip_pyc_files(path):
+            return path.suffix != '.pyc'
         source = self.tmpdir / 'source'
         source.mkdir()
         (source / '__main__.py').touch()
@@ -64,12 +65,32 @@ def skip_pyc_files(file):
         (source / 'test.pyc').touch()
         target = self.tmpdir / 'source.pyz'
 
-        zipapp.create_archive(source, target, include_file=skip_pyc_files)
+        zipapp.create_archive(source, target, filter=skip_pyc_files)
         with zipfile.ZipFile(target, 'r') as z:
             self.assertIn('__main__.py', z.namelist())
             self.assertIn('test.py', z.namelist())
             self.assertNotIn('test.pyc', z.namelist())
 
+    def test_create_archive_filter_exclude_dir(self):
+        # Test packing a directory and using a filter to exclude a
+        # subdirectory (ensures that the path supplied to include
+        # is relative to the source location, as expected).
+        def skip_dummy_dir(path):
+            return path.parts[0] != 'dummy'
+        source = self.tmpdir / 'source'
+        source.mkdir()
+        (source / '__main__.py').touch()
+        (source / 'test.py').touch()
+        (source / 'dummy').mkdir()
+        (source / 'dummy' / 'test2.py').touch()
+        target = self.tmpdir / 'source.pyz'
+
+        zipapp.create_archive(source, target, filter=skip_dummy_dir)
+        with zipfile.ZipFile(target, 'r') as z:
+            self.assertEqual(len(z.namelist()), 2)
+            self.assertIn('__main__.py', z.namelist())
+            self.assertIn('test.py', z.namelist())
+
     def test_create_archive_default_target(self):
         # Test packing a directory to the default name.
         source = self.tmpdir / 'source'
diff --git a/Lib/zipapp.py b/Lib/zipapp.py
index bf15b6806dd..51d0290a901 100644
--- a/Lib/zipapp.py
+++ b/Lib/zipapp.py
@@ -74,7 +74,7 @@ def _copy_archive(archive, new_archive, interpreter=None):
 
 
 def create_archive(source, target=None, interpreter=None, main=None,
-                   include_file=None):
+                   filter=None):
     """Create an application archive from SOURCE.
 
     The SOURCE can be the name of a directory, or a filename or a file-like
@@ -135,9 +135,9 @@ def create_archive(source, target=None, interpreter=None, main=None,
         _write_file_prefix(fd, interpreter)
         with zipfile.ZipFile(fd, 'w') as z:
             for child in source.rglob('*'):
-                arcname = child.relative_to(source).as_posix()
-                if include_file is None or include_file(pathlib.Path(arcname)):
-                    z.write(child, arcname)
+                arcname = child.relative_to(source)
+                if filter is None or filter(arcname):
+                    z.write(child, arcname.as_posix())
             if main_py:
                 z.writestr('__main__.py', main_py.encode('utf-8'))
 


From webhook-mailer at python.org  Sat Aug 26 13:29:43 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sat, 26 Aug 2017 17:29:43 -0000
Subject: [Python-checkins] [3.6] bpo-31271: Fix an assertion failure in
 io.TextIOWrapper.write. (GH-3201) (#3209)
Message-ID: <mailman.112.1503768585.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/9bcbc6cba385a83cac8f1ff430cad7617184d2bc
commit: 9bcbc6cba385a83cac8f1ff430cad7617184d2bc
branch: 3.6
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-26T20:29:40+03:00
summary:

[3.6] bpo-31271: Fix an assertion failure in io.TextIOWrapper.write. (GH-3201) (#3209)

(cherry picked from commit a5b4ea15b61e3f3985f4f0748a18f8b888a63532)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst
M Lib/test/test_io.py
M Modules/_io/textio.c

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 6a2c7a9fca4..7057c927c3f 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -3163,6 +3163,14 @@ def test_read_nonbytes(self):
         t = self.TextIOWrapper(self.StringIO('a'))
         self.assertRaises(TypeError, t.read)
 
+    def test_illegal_encoder(self):
+        # Issue 31271: Calling write() while the return value of encoder's
+        # encode() is invalid shouldn't cause an assertion failure.
+        rot13 = codecs.lookup("rot13")
+        with support.swap_attr(rot13, '_is_text_encoding', True):
+            t = io.TextIOWrapper(io.BytesIO(b'foo'), encoding="rot13")
+        self.assertRaises(TypeError, t.write, 'bar')
+
     def test_illegal_decoder(self):
         # Issue #17106
         # Bypass the early encoding check added in issue 20404
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst
new file mode 100644
index 00000000000..7bb78801057
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst	
@@ -0,0 +1,2 @@
+Fix an assertion failure in the write() method of `io.TextIOWrapper`, when
+the encoder doesn't return a bytes object. Patch by Oren Milman.
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 61adcf60508..801bb1745bb 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -1331,6 +1331,13 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text)
     Py_DECREF(text);
     if (b == NULL)
         return NULL;
+    if (!PyBytes_Check(b)) {
+        PyErr_Format(PyExc_TypeError,
+                     "encoder should return a bytes object, not '%.200s'",
+                     Py_TYPE(b)->tp_name);
+        Py_DECREF(b);
+        return NULL;
+    }
 
     if (self->pending_bytes == NULL) {
         self->pending_bytes = PyList_New(0);


From webhook-mailer at python.org  Sat Aug 26 14:26:05 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 26 Aug 2017 18:26:05 -0000
Subject: [Python-checkins] bpo-30781: IDLE - use ttk widgets in configdialog
 (#2654)
Message-ID: <mailman.113.1503771967.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/7028e5986fceeeb73dffb5d5bf8f03d88f73b63d
commit: 7028e5986fceeeb73dffb5d5bf8f03d88f73b63d
branch: master
author: Cheryl Sabella <cheryl.sabella at gmail.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-08-26T14:26:02-04:00
summary:

bpo-30781: IDLE -  use ttk widgets in configdialog (#2654)

Patch by Cheryl Sabella.

files:
M Lib/idlelib/configdialog.py
M Lib/idlelib/idle_test/test_configdialog.py
M Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 81ea8afbbcd..ff7b638b51f 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -9,13 +9,13 @@
 Refer to comments in EditorWindow autoindent code for details.
 
 """
-from tkinter import (Toplevel, Frame, LabelFrame, Listbox, Label, Button,
-                     Entry, Text, Scale, Radiobutton, Checkbutton, Canvas,
+from tkinter import (Toplevel, Listbox, Text, Scale, Canvas,
                      StringVar, BooleanVar, IntVar, TRUE, FALSE,
                      TOP, BOTTOM, RIGHT, LEFT, SOLID, GROOVE, NORMAL, DISABLED,
                      NONE, BOTH, X, Y, W, E, EW, NS, NSEW, NW,
                      HORIZONTAL, VERTICAL, ANCHOR, ACTIVE, END)
-from tkinter.ttk import Notebook, Scrollbar
+from tkinter.ttk import (Button, Checkbutton, Entry, Frame, Label, LabelFrame,
+                         Notebook, Radiobutton, Scrollbar, Style)
 import tkinter.colorchooser as tkColorChooser
 import tkinter.font as tkFont
 import tkinter.messagebox as tkMessageBox
@@ -137,9 +137,9 @@ def create_action_buttons(self):
             # text in the buttons.
             padding_args = {}
         else:
-            padding_args = {'padx':6, 'pady':3}
-        outer = Frame(self, pady=2)
-        buttons = Frame(outer, pady=2)
+            padding_args = {'padding': (6, 3)}
+        outer = Frame(self, padding=2)
+        buttons = Frame(outer, padding=2)
         for txt, cmd in (
             ('Ok', self.ok),
             ('Apply', self.apply),
@@ -266,7 +266,7 @@ def create_page_extensions(self):
         self.extension_list.grid(column=0, row=0, sticky='nws')
         scroll.grid(column=1, row=0, sticky='ns')
         self.details_frame.grid(column=2, row=0, sticky='nsew', padx=[10, 0])
-        frame.configure(padx=10, pady=10)
+        frame.configure(padding=10)
         self.config_frame = {}
         self.current_extension = None
 
@@ -356,9 +356,8 @@ def create_extension_frame(self, ext_name):
             label.grid(row=row, column=0, sticky=NW)
             var = opt['var']
             if opt['type'] == 'bool':
-                Checkbutton(entry_area, textvariable=var, variable=var,
-                            onvalue='True', offvalue='False',
-                            indicatoron=FALSE, selectcolor='', width=8
+                Checkbutton(entry_area, variable=var,
+                            onvalue='True', offvalue='False', width=8
                             ).grid(row=row, column=1, sticky=W, padx=7)
             elif opt['type'] == 'int':
                 Entry(entry_area, textvariable=var, validate='key',
@@ -635,6 +634,7 @@ class HighPage(Frame):
     def __init__(self, master):
         super().__init__(master)
         self.cd = master.master
+        self.style = Style(master)
         self.create_page_highlight()
         self.load_theme_cfg()
 
@@ -821,12 +821,14 @@ def tem(event, elem=element):
                 self.highlight_target.set(elem)
             text.tag_bind(
                     self.theme_elements[element][0], '<ButtonPress-1>', tem)
-        text['state'] = DISABLED
-        self.frame_color_set = Frame(frame_custom, relief=SOLID, borderwidth=1)
+        text['state'] = 'disabled'
+        self.style.configure('frame_color_set.TFrame', borderwidth=1,
+                             relief='solid')
+        self.frame_color_set = Frame(frame_custom, style='frame_color_set.TFrame')
         frame_fg_bg_toggle = Frame(frame_custom)
         self.button_set_color = Button(
                 self.frame_color_set, text='Choose Color for :',
-                command=self.get_color, highlightthickness=0)
+                command=self.get_color)
         self.targetlist = DynOptionMenu(
                 self.frame_color_set, self.highlight_target, None,
                 highlightthickness=0) #, command=self.set_highlight_targetBinding
@@ -855,7 +857,7 @@ def tem(event, elem=element):
         self.button_delete_custom = Button(
                 frame_theme, text='Delete Custom Theme',
                 command=self.delete_custom)
-        self.theme_message = Label(frame_theme, bd=2)
+        self.theme_message = Label(frame_theme, borderwidth=2)
 
         # Pack widgets:
         # body.
@@ -913,7 +915,7 @@ def load_theme_cfg(self):
             item_list = idleConf.GetSectionList('user', 'highlight')
             item_list.sort()
             if not item_list:
-                self.custom_theme_on['state'] = DISABLED
+                self.custom_theme_on.state(('disabled',))
                 self.custom_name.set('- no custom themes -')
             else:
                 self.customlist.SetMenu(item_list, item_list[0])
@@ -945,12 +947,10 @@ def var_changed_builtin_name(self, *params):
                 changes.add_option('main', 'Theme', 'name', old_themes[0])
             changes.add_option('main', 'Theme', 'name2', value)
             self.theme_message['text'] = 'New theme, see Help'
-            self.theme_message['fg'] = '#500000'
         else:
             changes.add_option('main', 'Theme', 'name', value)
             changes.add_option('main', 'Theme', 'name2', '')
             self.theme_message['text'] = ''
-            self.theme_message['fg'] = 'black'
         self.paint_theme_sample()
 
     def var_changed_custom_name(self, *params):
@@ -1004,14 +1004,14 @@ def set_theme_type(self):
             load_theme_cfg
         """
         if self.theme_source.get():
-            self.builtinlist['state'] = NORMAL
-            self.customlist['state'] = DISABLED
-            self.button_delete_custom['state'] = DISABLED
+            self.builtinlist['state'] = 'normal'
+            self.customlist['state'] = 'disabled'
+            self.button_delete_custom.state(('disabled',))
         else:
-            self.builtinlist['state'] = DISABLED
-            self.custom_theme_on['state'] = NORMAL
-            self.customlist['state'] = NORMAL
-            self.button_delete_custom['state'] = NORMAL
+            self.builtinlist['state'] = 'disabled'
+            self.custom_theme_on.state(('!disabled',))
+            self.customlist['state'] = 'normal'
+            self.button_delete_custom.state(('!disabled',))
 
     def get_color(self):
         """Handle button to select a new color for the target tag.
@@ -1032,7 +1032,8 @@ def get_color(self):
             create_new
         """
         target = self.highlight_target.get()
-        prev_color = self.frame_color_set.cget('bg')
+        prev_color = self.style.lookup(self.frame_color_set['style'],
+                                       'background')
         rgbTuplet, color_string = tkColorChooser.askcolor(
                 parent=self, title='Pick new color for : '+target,
                 initialcolor=prev_color)
@@ -1053,7 +1054,7 @@ def get_color(self):
     def on_new_color_set(self):
         "Display sample of new color selection on the dialog."
         new_color = self.color.get()
-        self.frame_color_set['bg'] = new_color  # Set sample.
+        self.style.configure('frame_color_set.TFrame', background=new_color)
         plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
         sample_element = self.theme_elements[self.highlight_target.get()][0]
         self.highlight_sample.tag_config(sample_element, **{plane: new_color})
@@ -1139,12 +1140,12 @@ def set_highlight_target(self):
             load_theme_cfg
         """
         if self.highlight_target.get() == 'Cursor':  # bg not possible
-            self.fg_on['state'] = DISABLED
-            self.bg_on['state'] = DISABLED
+            self.fg_on.state(('disabled',))
+            self.bg_on.state(('disabled',))
             self.fg_bg_toggle.set(1)
         else:  # Both fg and bg can be set.
-            self.fg_on['state'] = NORMAL
-            self.bg_on['state'] = NORMAL
+            self.fg_on.state(('!disabled',))
+            self.bg_on.state(('!disabled',))
             self.fg_bg_toggle.set(1)
         self.set_color_sample()
 
@@ -1172,7 +1173,7 @@ def set_color_sample(self):
         tag = self.theme_elements[self.highlight_target.get()][0]
         plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
         color = self.highlight_sample.tag_cget(tag, plane)
-        self.frame_color_set['bg'] = color
+        self.style.configure('frame_color_set.TFrame', background=color)
 
     def paint_theme_sample(self):
         """Apply the theme colors to each element tag in the sample text.
@@ -1260,7 +1261,7 @@ def delete_custom(self):
         item_list = idleConf.GetSectionList('user', 'highlight')
         item_list.sort()
         if not item_list:
-            self.custom_theme_on['state'] = DISABLED
+            self.custom_theme_on.state(('disabled',))
             self.customlist.SetMenu(item_list, '- no custom themes -')
         else:
             self.customlist.SetMenu(item_list, item_list[0])
@@ -1397,7 +1398,7 @@ def create_page_keys(self):
                 frame_custom, text='Get New Keys for Selection',
                 command=self.get_new_keys, state=DISABLED)
         # frame_key_sets.
-        frames = [Frame(frame_key_sets, padx=2, pady=2, borderwidth=0)
+        frames = [Frame(frame_key_sets, padding=2, borderwidth=0)
                   for i in range(2)]
         self.builtin_keyset_on = Radiobutton(
                 frames[0], variable=self.keyset_source, value=1,
@@ -1415,7 +1416,7 @@ def create_page_keys(self):
         self.button_save_custom_keys = Button(
                 frames[1], text='Save as New Custom Key Set',
                 command=self.save_as_new_key_set)
-        self.keys_message = Label(frames[0], bd=2)
+        self.keys_message = Label(frames[0], borderwidth=2)
 
         # Pack widgets:
         # body.
@@ -1457,7 +1458,7 @@ def load_key_cfg(self):
             item_list = idleConf.GetSectionList('user', 'keys')
             item_list.sort()
             if not item_list:
-                self.custom_keyset_on['state'] = DISABLED
+                self.custom_keyset_on.state(('disabled',))
                 self.custom_name.set('- no custom keys -')
             else:
                 self.customlist.SetMenu(item_list, item_list[0])
@@ -1487,12 +1488,10 @@ def var_changed_builtin_name(self, *params):
                 changes.add_option('main', 'Keys', 'name', old_keys[0])
             changes.add_option('main', 'Keys', 'name2', value)
             self.keys_message['text'] = 'New key set, see Help'
-            self.keys_message['fg'] = '#500000'
         else:
             changes.add_option('main', 'Keys', 'name', value)
             changes.add_option('main', 'Keys', 'name2', '')
             self.keys_message['text'] = ''
-            self.keys_message['fg'] = 'black'
         self.load_keys_list(value)
 
     def var_changed_custom_name(self, *params):
@@ -1526,14 +1525,14 @@ def var_changed_keybinding(self, *params):
     def set_keys_type(self):
         "Set available screen options based on builtin or custom key set."
         if self.keyset_source.get():
-            self.builtinlist['state'] = NORMAL
-            self.customlist['state'] = DISABLED
-            self.button_delete_custom_keys['state'] = DISABLED
+            self.builtinlist['state'] = 'normal'
+            self.customlist['state'] = 'disabled'
+            self.button_delete_custom_keys.state(('disabled',))
         else:
-            self.builtinlist['state'] = DISABLED
-            self.custom_keyset_on['state'] = NORMAL
-            self.customlist['state'] = NORMAL
-            self.button_delete_custom_keys['state'] = NORMAL
+            self.builtinlist['state'] = 'disabled'
+            self.custom_keyset_on.state(('!disabled',))
+            self.customlist['state'] = 'normal'
+            self.button_delete_custom_keys.state(('!disabled',))
 
     def get_new_keys(self):
         """Handle event to change key binding for selected line.
@@ -1595,7 +1594,7 @@ def save_as_new_key_set(self):
 
     def on_bindingslist_select(self, event):
         "Activate button to assign new keys to selected action."
-        self.button_new_keys['state'] = NORMAL
+        self.button_new_keys.state(('!disabled',))
 
     def create_new_key_set(self, new_key_set_name):
         """Create a new custom key set with the given name.
@@ -1689,7 +1688,7 @@ def delete_custom_keys(self):
         item_list = idleConf.GetSectionList('user', 'keys')
         item_list.sort()
         if not item_list:
-            self.custom_keyset_on['state'] = DISABLED
+            self.custom_keyset_on.state(('disabled',))
             self.customlist.SetMenu(item_list, '- no custom keys -')
         else:
             self.customlist.SetMenu(item_list, item_list[0])
@@ -1809,13 +1808,13 @@ def create_page_general(self):
         self.helplist['yscrollcommand'] = scroll_helplist.set
         self.helplist.bind('<ButtonRelease-1>', self.help_source_selected)
         self.button_helplist_edit = Button(
-                frame_helplist_buttons, text='Edit', state=DISABLED,
+                frame_helplist_buttons, text='Edit', state='disabled',
                 width=8, command=self.helplist_item_edit)
         self.button_helplist_add = Button(
                 frame_helplist_buttons, text='Add',
                 width=8, command=self.helplist_item_add)
         self.button_helplist_remove = Button(
-                frame_helplist_buttons, text='Remove', state=DISABLED,
+                frame_helplist_buttons, text='Remove', state='disabled',
                 width=8, command=self.helplist_item_remove)
 
         # Pack widgets:
@@ -1874,15 +1873,15 @@ def help_source_selected(self, event):
     def set_add_delete_state(self):
         "Toggle the state for the help list buttons based on list entries."
         if self.helplist.size() < 1:  # No entries in list.
-            self.button_helplist_edit['state'] = DISABLED
-            self.button_helplist_remove['state'] = DISABLED
+            self.button_helplist_edit.state(('disabled',))
+            self.button_helplist_remove.state(('disabled',))
         else:  # Some entries.
             if self.helplist.curselection():  # There currently is a selection.
-                self.button_helplist_edit['state'] = NORMAL
-                self.button_helplist_remove['state'] = NORMAL
+                self.button_helplist_edit.state(('!disabled',))
+                self.button_helplist_remove.state(('!disabled',))
             else:  # There currently is not a selection.
-                self.button_helplist_edit['state'] = DISABLED
-                self.button_helplist_remove['state'] = DISABLED
+                self.button_helplist_edit.state(('disabled',))
+                self.button_helplist_remove.state(('disabled',))
 
     def helplist_item_add(self):
         """Handle add button for the help list.
@@ -2062,7 +2061,7 @@ def __init__(self, parent, *args, **kw):
         # Create a canvas object and a vertical scrollbar for scrolling it.
         vscrollbar = Scrollbar(self, orient=VERTICAL)
         vscrollbar.pack(fill=Y, side=RIGHT, expand=FALSE)
-        canvas = Canvas(self, bd=0, highlightthickness=0,
+        canvas = Canvas(self, borderwidth=0, highlightthickness=0,
                         yscrollcommand=vscrollbar.set, width=240)
         canvas.pack(side=LEFT, fill=BOTH, expand=TRUE)
         vscrollbar.config(command=canvas.yview)
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index df801c32b73..c947da1866e 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -272,7 +272,7 @@ def test_load_theme_cfg(self):
         # builtinlist sets variable builtin_name to the CurrentTheme default.
         eq(d.builtin_name.get(), 'IDLE Classic')
         eq(d.custom_name.get(), '- no custom themes -')
-        eq(d.custom_theme_on['state'], DISABLED)
+        eq(d.custom_theme_on.state(), ('disabled',))
         eq(d.set_theme_type.called, 1)
         eq(d.paint_theme_sample.called, 1)
         eq(d.set_highlight_target.called, 1)
@@ -315,7 +315,7 @@ def test_theme_source(self):
         changes.clear()
 
         # Custom selected.
-        d.custom_theme_on['state'] = NORMAL
+        d.custom_theme_on.state(('!disabled',))
         d.custom_theme_on.invoke()
         self.assertEqual(mainpage, {'Theme': {'default': 'False'}})
         eq(d.var_changed_builtin_name.called, 1)
@@ -428,15 +428,15 @@ def test_set_theme_type(self):
         d.set_theme_type()
         eq(d.builtinlist['state'], NORMAL)
         eq(d.customlist['state'], DISABLED)
-        eq(d.button_delete_custom['state'], DISABLED)
+        eq(d.button_delete_custom.state(), ('disabled',))
 
         # Custom theme selected.
         d.theme_source.set(False)
         d.set_theme_type()
         eq(d.builtinlist['state'], DISABLED)
-        eq(d.custom_theme_on['state'], NORMAL)
+        eq(d.custom_theme_on.state(), ('selected',))
         eq(d.customlist['state'], NORMAL)
-        eq(d.button_delete_custom['state'], NORMAL)
+        eq(d.button_delete_custom.state(), ())
         d.set_theme_type = Func()
 
     def test_get_color(self):
@@ -455,7 +455,7 @@ def test_get_color(self):
         eq(d.color.get(), '#ffffff')
 
         # Selection same as previous color.
-        chooser.result = ('', d.frame_color_set.cget('bg'))
+        chooser.result = ('', d.style.lookup(d.frame_color_set['style'], 'background'))
         d.button_set_color.invoke()
         eq(d.color.get(), '#ffffff')
 
@@ -494,7 +494,7 @@ def test_on_new_color_set(self):
         d.fg_bg_toggle.set(True)
 
         d.color.set(color)
-        self.assertEqual(d.frame_color_set.cget('bg'), color)
+        self.assertEqual(d.style.lookup(d.frame_color_set['style'], 'background'), color)
         self.assertEqual(d.highlight_sample.tag_cget('hilite', 'foreground'), color)
         self.assertEqual(highpage,
                          {'Python': {'hilite-foreground': color}})
@@ -567,15 +567,15 @@ def test_set_highlight_target(self):
 
         # Target is cursor.
         d.highlight_target.set('Cursor')
-        eq(d.fg_on['state'], DISABLED)
-        eq(d.bg_on['state'], DISABLED)
+        eq(d.fg_on.state(), ('disabled', 'selected'))
+        eq(d.bg_on.state(), ('disabled',))
         self.assertTrue(d.fg_bg_toggle)
         eq(d.set_color_sample.called, 1)
 
         # Target is not cursor.
         d.highlight_target.set('Comment')
-        eq(d.fg_on['state'], NORMAL)
-        eq(d.bg_on['state'], NORMAL)
+        eq(d.fg_on.state(), ('selected',))
+        eq(d.bg_on.state(), ())
         self.assertTrue(d.fg_bg_toggle)
         eq(d.set_color_sample.called, 2)
 
@@ -597,8 +597,9 @@ def test_set_color_sample(self):
         d.highlight_target.set('Selected Text')
         d.fg_bg_toggle.set(True)
         d.set_color_sample()
-        self.assertEqual(d.frame_color_set.cget('bg'),
-                         d.highlight_sample.tag_cget('hilite', 'foreground'))
+        self.assertEqual(
+                d.style.lookup(d.frame_color_set['style'], 'background'),
+                d.highlight_sample.tag_cget('hilite', 'foreground'))
         d.set_color_sample = Func()
 
     def test_paint_theme_sample(self):
@@ -641,7 +642,7 @@ def test_paint_theme_sample(self):
     def test_delete_custom(self):
         eq = self.assertEqual
         d = self.page
-        d.button_delete_custom['state'] = NORMAL
+        d.button_delete_custom.state(('!disabled',))
         yesno = configdialog.tkMessageBox.askyesno = Func()
         dialog.deactivate_current_config = Func()
         dialog.activate_config_changes = Func()
@@ -670,7 +671,7 @@ def test_delete_custom(self):
         eq(yesno.called, 2)
         self.assertNotIn(theme_name, highpage)
         eq(idleConf.GetSectionList('user', 'highlight'), [])
-        eq(d.custom_theme_on['state'], DISABLED)
+        eq(d.custom_theme_on.state(), ('disabled',))
         eq(d.custom_name.get(), '- no custom themes -')
         eq(dialog.deactivate_current_config.called, 1)
         eq(dialog.activate_config_changes.called, 1)
@@ -721,7 +722,7 @@ def test_load_key_cfg(self):
         # builtinlist sets variable builtin_name to the CurrentKeys default.
         eq(d.builtin_name.get(), 'IDLE Classic OSX')
         eq(d.custom_name.get(), '- no custom keys -')
-        eq(d.custom_keyset_on['state'], DISABLED)
+        eq(d.custom_keyset_on.state(), ('disabled',))
         eq(d.set_keys_type.called, 1)
         eq(d.load_keys_list.called, 1)
         eq(d.load_keys_list.args, ('IDLE Classic OSX', ))
@@ -765,7 +766,7 @@ def test_keyset_source(self):
         changes.clear()
 
         # Custom selected.
-        d.custom_keyset_on['state'] = NORMAL
+        d.custom_keyset_on.state(('!disabled',))
         d.custom_keyset_on.invoke()
         self.assertEqual(mainpage, {'Keys': {'default': 'False'}})
         eq(d.var_changed_builtin_name.called, 1)
@@ -847,15 +848,15 @@ def test_set_keys_type(self):
         d.set_keys_type()
         eq(d.builtinlist['state'], NORMAL)
         eq(d.customlist['state'], DISABLED)
-        eq(d.button_delete_custom_keys['state'], DISABLED)
+        eq(d.button_delete_custom_keys.state(), ('disabled',))
 
         # Custom keyset selected.
         d.keyset_source.set(False)
         d.set_keys_type()
         eq(d.builtinlist['state'], DISABLED)
-        eq(d.custom_keyset_on['state'], NORMAL)
+        eq(d.custom_keyset_on.state(), ('selected',))
         eq(d.customlist['state'], NORMAL)
-        eq(d.button_delete_custom_keys['state'], NORMAL)
+        eq(d.button_delete_custom_keys.state(), ())
         d.set_keys_type = Func()
 
     def test_get_new_keys(self):
@@ -865,7 +866,7 @@ def test_get_new_keys(self):
         gkd = configdialog.GetKeysDialog = Func(return_self=True)
         gnkn = d.get_new_keys_name = Func()
 
-        d.button_new_keys['state'] = NORMAL
+        d.button_new_keys.state(('!disabled',))
         d.bindingslist.delete(0, 'end')
         d.bindingslist.insert(0, 'copy - <Control-Shift-Key-C>')
         d.bindingslist.selection_set(0)
@@ -953,7 +954,7 @@ def test_on_bindingslist_select(self):
         b.event_generate('<Button-1>', x=x, y=y)
         b.event_generate('<ButtonRelease-1>', x=x, y=y)
         self.assertEqual(b.get('anchor'), 'find')
-        self.assertEqual(d.button_new_keys['state'], NORMAL)
+        self.assertEqual(d.button_new_keys.state(), ())
 
     def test_create_new_key_set_and_save_new_key_set(self):
         eq = self.assertEqual
@@ -1032,7 +1033,7 @@ def test_load_keys_list(self):
     def test_delete_custom_keys(self):
         eq = self.assertEqual
         d = self.page
-        d.button_delete_custom_keys['state'] = NORMAL
+        d.button_delete_custom_keys.state(('!disabled',))
         yesno = configdialog.tkMessageBox.askyesno = Func()
         dialog.deactivate_current_config = Func()
         dialog.activate_config_changes = Func()
@@ -1061,7 +1062,7 @@ def test_delete_custom_keys(self):
         eq(yesno.called, 2)
         self.assertNotIn(keyset_name, keyspage)
         eq(idleConf.GetSectionList('user', 'keys'), [])
-        eq(d.custom_keyset_on['state'], DISABLED)
+        eq(d.custom_keyset_on.state(), ('disabled',))
         eq(d.custom_name.get(), '- no custom keys -')
         eq(dialog.deactivate_current_config.called, 1)
         eq(dialog.activate_config_changes.called, 1)
@@ -1173,18 +1174,18 @@ def test_set_add_delete_state(self):
 
         h.delete(0, 'end')
         sad()
-        eq(d.button_helplist_edit['state'], DISABLED)
-        eq(d.button_helplist_remove['state'], DISABLED)
+        eq(d.button_helplist_edit.state(), ('disabled',))
+        eq(d.button_helplist_remove.state(), ('disabled',))
 
         h.insert(0, 'source')
         sad()
-        eq(d.button_helplist_edit['state'], DISABLED)
-        eq(d.button_helplist_remove['state'], DISABLED)
+        eq(d.button_helplist_edit.state(), ('disabled',))
+        eq(d.button_helplist_remove.state(), ('disabled',))
 
         h.selection_set(0)
         sad()
-        eq(d.button_helplist_edit['state'], NORMAL)
-        eq(d.button_helplist_remove['state'], NORMAL)
+        eq(d.button_helplist_edit.state(), ())
+        eq(d.button_helplist_remove.state(), ())
         d.set_add_delete_state = Func()  # Mask method.
 
     def test_helplist_item_add(self):
diff --git a/Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst b/Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst
index 18f40a41f29..3031adff717 100644
--- a/Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst
+++ b/Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst
@@ -1 +1,2 @@
-IDLE - Use ttk Notebook in ConfigDialog
+IDLE - Use ttk widgets in ConfigDialog.
+Patches by Terry Jan Reedy and Cheryl Sabella.


From webhook-mailer at python.org  Sat Aug 26 14:56:34 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sat, 26 Aug 2017 18:56:34 -0000
Subject: [Python-checkins] [2.7] bpo-28261: Prevent raising SystemError
 where PyArg_ParseTuple is used to parse non-args. (#3213)
Message-ID: <mailman.114.1503773797.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/bc80fd1bd2e8b6817accbc101e7fe5e50ba8f768
commit: bc80fd1bd2e8b6817accbc101e7fe5e50ba8f768
branch: 2.7
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-26T21:56:31+03:00
summary:

[2.7] bpo-28261: Prevent raising SystemError where PyArg_ParseTuple is used to parse non-args. (#3213)

files:
M Lib/test/test_audioop.py
M Modules/audioop.c

diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py
index 4af73500ea4..5f1deb57761 100644
--- a/Lib/test/test_audioop.py
+++ b/Lib/test/test_audioop.py
@@ -325,6 +325,10 @@ def test_ratecv(self):
             self.assertEqual(audioop.ratecv(datas[w], w, 1, 8000, 8000, None, 30, 10)[0],
                              expected[w])
 
+        self.assertRaises(TypeError, audioop.ratecv, b'', 1, 1, 8000, 8000, 42)
+        self.assertRaises(TypeError, audioop.ratecv,
+                          b'', 1, 1, 8000, 8000, (1, (42,)))
+
     def test_reverse(self):
         for w in 1, 2, 4:
             self.assertEqual(audioop.reverse(b'', w), b'')
diff --git a/Modules/audioop.c b/Modules/audioop.c
index a4d13753b61..ad7336c7f9e 100644
--- a/Modules/audioop.c
+++ b/Modules/audioop.c
@@ -1086,7 +1086,7 @@ audioop_ratecv(PyObject *self, PyObject *args)
     char *cp, *ncp;
     int len, size, nchannels, inrate, outrate, weightA, weightB;
     int chan, d, *prev_i, *cur_i, cur_o;
-    PyObject *state, *samps, *str, *rv = NULL;
+    PyObject *state, *samps, *str, *rv = NULL, *channel;
     int bytes_per_frame;
 
     weightA = 1;
@@ -1152,6 +1152,10 @@ audioop_ratecv(PyObject *self, PyObject *args)
             prev_i[chan] = cur_i[chan] = 0;
     }
     else {
+        if (!PyTuple_Check(state)) {
+            PyErr_SetString(PyExc_TypeError, "state must be a tuple or None");
+            goto exit;
+        }
         if (!PyArg_ParseTuple(state,
                         "iO!;audioop.ratecv: illegal state argument",
                         &d, &PyTuple_Type, &samps))
@@ -1162,7 +1166,13 @@ audioop_ratecv(PyObject *self, PyObject *args)
             goto exit;
         }
         for (chan = 0; chan < nchannels; chan++) {
-            if (!PyArg_ParseTuple(PyTuple_GetItem(samps, chan),
+            channel = PyTuple_GetItem(samps, chan);
+            if (!PyTuple_Check(channel)) {
+                PyErr_SetString(PyExc_TypeError,
+                                "ratecv(): illegal state argument");
+                goto exit;
+            }
+            if (!PyArg_ParseTuple(channel,
                                   "ii:ratecv", &prev_i[chan],
                                                &cur_i[chan]))
                 goto exit;


From webhook-mailer at python.org  Sat Aug 26 16:12:17 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 26 Aug 2017 20:12:17 -0000
Subject: [Python-checkins] [3.6] bpo-30781: IDLE - use ttk widgets in
 configdialog (GH-2654) (#3214)
Message-ID: <mailman.115.1503778338.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/7b556025ff7d663233e7fcb84785eb071f5e2ba7
commit: 7b556025ff7d663233e7fcb84785eb071f5e2ba7
branch: 3.6
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-26T16:12:14-04:00
summary:

[3.6] bpo-30781: IDLE -  use ttk widgets in configdialog (GH-2654) (#3214)

Patch by Cheryl Sabella.
(cherry picked from commit 7028e59)

files:
M Lib/idlelib/configdialog.py
M Lib/idlelib/idle_test/test_configdialog.py
M Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 81ea8afbbcd..ff7b638b51f 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -9,13 +9,13 @@
 Refer to comments in EditorWindow autoindent code for details.
 
 """
-from tkinter import (Toplevel, Frame, LabelFrame, Listbox, Label, Button,
-                     Entry, Text, Scale, Radiobutton, Checkbutton, Canvas,
+from tkinter import (Toplevel, Listbox, Text, Scale, Canvas,
                      StringVar, BooleanVar, IntVar, TRUE, FALSE,
                      TOP, BOTTOM, RIGHT, LEFT, SOLID, GROOVE, NORMAL, DISABLED,
                      NONE, BOTH, X, Y, W, E, EW, NS, NSEW, NW,
                      HORIZONTAL, VERTICAL, ANCHOR, ACTIVE, END)
-from tkinter.ttk import Notebook, Scrollbar
+from tkinter.ttk import (Button, Checkbutton, Entry, Frame, Label, LabelFrame,
+                         Notebook, Radiobutton, Scrollbar, Style)
 import tkinter.colorchooser as tkColorChooser
 import tkinter.font as tkFont
 import tkinter.messagebox as tkMessageBox
@@ -137,9 +137,9 @@ def create_action_buttons(self):
             # text in the buttons.
             padding_args = {}
         else:
-            padding_args = {'padx':6, 'pady':3}
-        outer = Frame(self, pady=2)
-        buttons = Frame(outer, pady=2)
+            padding_args = {'padding': (6, 3)}
+        outer = Frame(self, padding=2)
+        buttons = Frame(outer, padding=2)
         for txt, cmd in (
             ('Ok', self.ok),
             ('Apply', self.apply),
@@ -266,7 +266,7 @@ def create_page_extensions(self):
         self.extension_list.grid(column=0, row=0, sticky='nws')
         scroll.grid(column=1, row=0, sticky='ns')
         self.details_frame.grid(column=2, row=0, sticky='nsew', padx=[10, 0])
-        frame.configure(padx=10, pady=10)
+        frame.configure(padding=10)
         self.config_frame = {}
         self.current_extension = None
 
@@ -356,9 +356,8 @@ def create_extension_frame(self, ext_name):
             label.grid(row=row, column=0, sticky=NW)
             var = opt['var']
             if opt['type'] == 'bool':
-                Checkbutton(entry_area, textvariable=var, variable=var,
-                            onvalue='True', offvalue='False',
-                            indicatoron=FALSE, selectcolor='', width=8
+                Checkbutton(entry_area, variable=var,
+                            onvalue='True', offvalue='False', width=8
                             ).grid(row=row, column=1, sticky=W, padx=7)
             elif opt['type'] == 'int':
                 Entry(entry_area, textvariable=var, validate='key',
@@ -635,6 +634,7 @@ class HighPage(Frame):
     def __init__(self, master):
         super().__init__(master)
         self.cd = master.master
+        self.style = Style(master)
         self.create_page_highlight()
         self.load_theme_cfg()
 
@@ -821,12 +821,14 @@ def tem(event, elem=element):
                 self.highlight_target.set(elem)
             text.tag_bind(
                     self.theme_elements[element][0], '<ButtonPress-1>', tem)
-        text['state'] = DISABLED
-        self.frame_color_set = Frame(frame_custom, relief=SOLID, borderwidth=1)
+        text['state'] = 'disabled'
+        self.style.configure('frame_color_set.TFrame', borderwidth=1,
+                             relief='solid')
+        self.frame_color_set = Frame(frame_custom, style='frame_color_set.TFrame')
         frame_fg_bg_toggle = Frame(frame_custom)
         self.button_set_color = Button(
                 self.frame_color_set, text='Choose Color for :',
-                command=self.get_color, highlightthickness=0)
+                command=self.get_color)
         self.targetlist = DynOptionMenu(
                 self.frame_color_set, self.highlight_target, None,
                 highlightthickness=0) #, command=self.set_highlight_targetBinding
@@ -855,7 +857,7 @@ def tem(event, elem=element):
         self.button_delete_custom = Button(
                 frame_theme, text='Delete Custom Theme',
                 command=self.delete_custom)
-        self.theme_message = Label(frame_theme, bd=2)
+        self.theme_message = Label(frame_theme, borderwidth=2)
 
         # Pack widgets:
         # body.
@@ -913,7 +915,7 @@ def load_theme_cfg(self):
             item_list = idleConf.GetSectionList('user', 'highlight')
             item_list.sort()
             if not item_list:
-                self.custom_theme_on['state'] = DISABLED
+                self.custom_theme_on.state(('disabled',))
                 self.custom_name.set('- no custom themes -')
             else:
                 self.customlist.SetMenu(item_list, item_list[0])
@@ -945,12 +947,10 @@ def var_changed_builtin_name(self, *params):
                 changes.add_option('main', 'Theme', 'name', old_themes[0])
             changes.add_option('main', 'Theme', 'name2', value)
             self.theme_message['text'] = 'New theme, see Help'
-            self.theme_message['fg'] = '#500000'
         else:
             changes.add_option('main', 'Theme', 'name', value)
             changes.add_option('main', 'Theme', 'name2', '')
             self.theme_message['text'] = ''
-            self.theme_message['fg'] = 'black'
         self.paint_theme_sample()
 
     def var_changed_custom_name(self, *params):
@@ -1004,14 +1004,14 @@ def set_theme_type(self):
             load_theme_cfg
         """
         if self.theme_source.get():
-            self.builtinlist['state'] = NORMAL
-            self.customlist['state'] = DISABLED
-            self.button_delete_custom['state'] = DISABLED
+            self.builtinlist['state'] = 'normal'
+            self.customlist['state'] = 'disabled'
+            self.button_delete_custom.state(('disabled',))
         else:
-            self.builtinlist['state'] = DISABLED
-            self.custom_theme_on['state'] = NORMAL
-            self.customlist['state'] = NORMAL
-            self.button_delete_custom['state'] = NORMAL
+            self.builtinlist['state'] = 'disabled'
+            self.custom_theme_on.state(('!disabled',))
+            self.customlist['state'] = 'normal'
+            self.button_delete_custom.state(('!disabled',))
 
     def get_color(self):
         """Handle button to select a new color for the target tag.
@@ -1032,7 +1032,8 @@ def get_color(self):
             create_new
         """
         target = self.highlight_target.get()
-        prev_color = self.frame_color_set.cget('bg')
+        prev_color = self.style.lookup(self.frame_color_set['style'],
+                                       'background')
         rgbTuplet, color_string = tkColorChooser.askcolor(
                 parent=self, title='Pick new color for : '+target,
                 initialcolor=prev_color)
@@ -1053,7 +1054,7 @@ def get_color(self):
     def on_new_color_set(self):
         "Display sample of new color selection on the dialog."
         new_color = self.color.get()
-        self.frame_color_set['bg'] = new_color  # Set sample.
+        self.style.configure('frame_color_set.TFrame', background=new_color)
         plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
         sample_element = self.theme_elements[self.highlight_target.get()][0]
         self.highlight_sample.tag_config(sample_element, **{plane: new_color})
@@ -1139,12 +1140,12 @@ def set_highlight_target(self):
             load_theme_cfg
         """
         if self.highlight_target.get() == 'Cursor':  # bg not possible
-            self.fg_on['state'] = DISABLED
-            self.bg_on['state'] = DISABLED
+            self.fg_on.state(('disabled',))
+            self.bg_on.state(('disabled',))
             self.fg_bg_toggle.set(1)
         else:  # Both fg and bg can be set.
-            self.fg_on['state'] = NORMAL
-            self.bg_on['state'] = NORMAL
+            self.fg_on.state(('!disabled',))
+            self.bg_on.state(('!disabled',))
             self.fg_bg_toggle.set(1)
         self.set_color_sample()
 
@@ -1172,7 +1173,7 @@ def set_color_sample(self):
         tag = self.theme_elements[self.highlight_target.get()][0]
         plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
         color = self.highlight_sample.tag_cget(tag, plane)
-        self.frame_color_set['bg'] = color
+        self.style.configure('frame_color_set.TFrame', background=color)
 
     def paint_theme_sample(self):
         """Apply the theme colors to each element tag in the sample text.
@@ -1260,7 +1261,7 @@ def delete_custom(self):
         item_list = idleConf.GetSectionList('user', 'highlight')
         item_list.sort()
         if not item_list:
-            self.custom_theme_on['state'] = DISABLED
+            self.custom_theme_on.state(('disabled',))
             self.customlist.SetMenu(item_list, '- no custom themes -')
         else:
             self.customlist.SetMenu(item_list, item_list[0])
@@ -1397,7 +1398,7 @@ def create_page_keys(self):
                 frame_custom, text='Get New Keys for Selection',
                 command=self.get_new_keys, state=DISABLED)
         # frame_key_sets.
-        frames = [Frame(frame_key_sets, padx=2, pady=2, borderwidth=0)
+        frames = [Frame(frame_key_sets, padding=2, borderwidth=0)
                   for i in range(2)]
         self.builtin_keyset_on = Radiobutton(
                 frames[0], variable=self.keyset_source, value=1,
@@ -1415,7 +1416,7 @@ def create_page_keys(self):
         self.button_save_custom_keys = Button(
                 frames[1], text='Save as New Custom Key Set',
                 command=self.save_as_new_key_set)
-        self.keys_message = Label(frames[0], bd=2)
+        self.keys_message = Label(frames[0], borderwidth=2)
 
         # Pack widgets:
         # body.
@@ -1457,7 +1458,7 @@ def load_key_cfg(self):
             item_list = idleConf.GetSectionList('user', 'keys')
             item_list.sort()
             if not item_list:
-                self.custom_keyset_on['state'] = DISABLED
+                self.custom_keyset_on.state(('disabled',))
                 self.custom_name.set('- no custom keys -')
             else:
                 self.customlist.SetMenu(item_list, item_list[0])
@@ -1487,12 +1488,10 @@ def var_changed_builtin_name(self, *params):
                 changes.add_option('main', 'Keys', 'name', old_keys[0])
             changes.add_option('main', 'Keys', 'name2', value)
             self.keys_message['text'] = 'New key set, see Help'
-            self.keys_message['fg'] = '#500000'
         else:
             changes.add_option('main', 'Keys', 'name', value)
             changes.add_option('main', 'Keys', 'name2', '')
             self.keys_message['text'] = ''
-            self.keys_message['fg'] = 'black'
         self.load_keys_list(value)
 
     def var_changed_custom_name(self, *params):
@@ -1526,14 +1525,14 @@ def var_changed_keybinding(self, *params):
     def set_keys_type(self):
         "Set available screen options based on builtin or custom key set."
         if self.keyset_source.get():
-            self.builtinlist['state'] = NORMAL
-            self.customlist['state'] = DISABLED
-            self.button_delete_custom_keys['state'] = DISABLED
+            self.builtinlist['state'] = 'normal'
+            self.customlist['state'] = 'disabled'
+            self.button_delete_custom_keys.state(('disabled',))
         else:
-            self.builtinlist['state'] = DISABLED
-            self.custom_keyset_on['state'] = NORMAL
-            self.customlist['state'] = NORMAL
-            self.button_delete_custom_keys['state'] = NORMAL
+            self.builtinlist['state'] = 'disabled'
+            self.custom_keyset_on.state(('!disabled',))
+            self.customlist['state'] = 'normal'
+            self.button_delete_custom_keys.state(('!disabled',))
 
     def get_new_keys(self):
         """Handle event to change key binding for selected line.
@@ -1595,7 +1594,7 @@ def save_as_new_key_set(self):
 
     def on_bindingslist_select(self, event):
         "Activate button to assign new keys to selected action."
-        self.button_new_keys['state'] = NORMAL
+        self.button_new_keys.state(('!disabled',))
 
     def create_new_key_set(self, new_key_set_name):
         """Create a new custom key set with the given name.
@@ -1689,7 +1688,7 @@ def delete_custom_keys(self):
         item_list = idleConf.GetSectionList('user', 'keys')
         item_list.sort()
         if not item_list:
-            self.custom_keyset_on['state'] = DISABLED
+            self.custom_keyset_on.state(('disabled',))
             self.customlist.SetMenu(item_list, '- no custom keys -')
         else:
             self.customlist.SetMenu(item_list, item_list[0])
@@ -1809,13 +1808,13 @@ def create_page_general(self):
         self.helplist['yscrollcommand'] = scroll_helplist.set
         self.helplist.bind('<ButtonRelease-1>', self.help_source_selected)
         self.button_helplist_edit = Button(
-                frame_helplist_buttons, text='Edit', state=DISABLED,
+                frame_helplist_buttons, text='Edit', state='disabled',
                 width=8, command=self.helplist_item_edit)
         self.button_helplist_add = Button(
                 frame_helplist_buttons, text='Add',
                 width=8, command=self.helplist_item_add)
         self.button_helplist_remove = Button(
-                frame_helplist_buttons, text='Remove', state=DISABLED,
+                frame_helplist_buttons, text='Remove', state='disabled',
                 width=8, command=self.helplist_item_remove)
 
         # Pack widgets:
@@ -1874,15 +1873,15 @@ def help_source_selected(self, event):
     def set_add_delete_state(self):
         "Toggle the state for the help list buttons based on list entries."
         if self.helplist.size() < 1:  # No entries in list.
-            self.button_helplist_edit['state'] = DISABLED
-            self.button_helplist_remove['state'] = DISABLED
+            self.button_helplist_edit.state(('disabled',))
+            self.button_helplist_remove.state(('disabled',))
         else:  # Some entries.
             if self.helplist.curselection():  # There currently is a selection.
-                self.button_helplist_edit['state'] = NORMAL
-                self.button_helplist_remove['state'] = NORMAL
+                self.button_helplist_edit.state(('!disabled',))
+                self.button_helplist_remove.state(('!disabled',))
             else:  # There currently is not a selection.
-                self.button_helplist_edit['state'] = DISABLED
-                self.button_helplist_remove['state'] = DISABLED
+                self.button_helplist_edit.state(('disabled',))
+                self.button_helplist_remove.state(('disabled',))
 
     def helplist_item_add(self):
         """Handle add button for the help list.
@@ -2062,7 +2061,7 @@ def __init__(self, parent, *args, **kw):
         # Create a canvas object and a vertical scrollbar for scrolling it.
         vscrollbar = Scrollbar(self, orient=VERTICAL)
         vscrollbar.pack(fill=Y, side=RIGHT, expand=FALSE)
-        canvas = Canvas(self, bd=0, highlightthickness=0,
+        canvas = Canvas(self, borderwidth=0, highlightthickness=0,
                         yscrollcommand=vscrollbar.set, width=240)
         canvas.pack(side=LEFT, fill=BOTH, expand=TRUE)
         vscrollbar.config(command=canvas.yview)
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index df801c32b73..c947da1866e 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -272,7 +272,7 @@ def test_load_theme_cfg(self):
         # builtinlist sets variable builtin_name to the CurrentTheme default.
         eq(d.builtin_name.get(), 'IDLE Classic')
         eq(d.custom_name.get(), '- no custom themes -')
-        eq(d.custom_theme_on['state'], DISABLED)
+        eq(d.custom_theme_on.state(), ('disabled',))
         eq(d.set_theme_type.called, 1)
         eq(d.paint_theme_sample.called, 1)
         eq(d.set_highlight_target.called, 1)
@@ -315,7 +315,7 @@ def test_theme_source(self):
         changes.clear()
 
         # Custom selected.
-        d.custom_theme_on['state'] = NORMAL
+        d.custom_theme_on.state(('!disabled',))
         d.custom_theme_on.invoke()
         self.assertEqual(mainpage, {'Theme': {'default': 'False'}})
         eq(d.var_changed_builtin_name.called, 1)
@@ -428,15 +428,15 @@ def test_set_theme_type(self):
         d.set_theme_type()
         eq(d.builtinlist['state'], NORMAL)
         eq(d.customlist['state'], DISABLED)
-        eq(d.button_delete_custom['state'], DISABLED)
+        eq(d.button_delete_custom.state(), ('disabled',))
 
         # Custom theme selected.
         d.theme_source.set(False)
         d.set_theme_type()
         eq(d.builtinlist['state'], DISABLED)
-        eq(d.custom_theme_on['state'], NORMAL)
+        eq(d.custom_theme_on.state(), ('selected',))
         eq(d.customlist['state'], NORMAL)
-        eq(d.button_delete_custom['state'], NORMAL)
+        eq(d.button_delete_custom.state(), ())
         d.set_theme_type = Func()
 
     def test_get_color(self):
@@ -455,7 +455,7 @@ def test_get_color(self):
         eq(d.color.get(), '#ffffff')
 
         # Selection same as previous color.
-        chooser.result = ('', d.frame_color_set.cget('bg'))
+        chooser.result = ('', d.style.lookup(d.frame_color_set['style'], 'background'))
         d.button_set_color.invoke()
         eq(d.color.get(), '#ffffff')
 
@@ -494,7 +494,7 @@ def test_on_new_color_set(self):
         d.fg_bg_toggle.set(True)
 
         d.color.set(color)
-        self.assertEqual(d.frame_color_set.cget('bg'), color)
+        self.assertEqual(d.style.lookup(d.frame_color_set['style'], 'background'), color)
         self.assertEqual(d.highlight_sample.tag_cget('hilite', 'foreground'), color)
         self.assertEqual(highpage,
                          {'Python': {'hilite-foreground': color}})
@@ -567,15 +567,15 @@ def test_set_highlight_target(self):
 
         # Target is cursor.
         d.highlight_target.set('Cursor')
-        eq(d.fg_on['state'], DISABLED)
-        eq(d.bg_on['state'], DISABLED)
+        eq(d.fg_on.state(), ('disabled', 'selected'))
+        eq(d.bg_on.state(), ('disabled',))
         self.assertTrue(d.fg_bg_toggle)
         eq(d.set_color_sample.called, 1)
 
         # Target is not cursor.
         d.highlight_target.set('Comment')
-        eq(d.fg_on['state'], NORMAL)
-        eq(d.bg_on['state'], NORMAL)
+        eq(d.fg_on.state(), ('selected',))
+        eq(d.bg_on.state(), ())
         self.assertTrue(d.fg_bg_toggle)
         eq(d.set_color_sample.called, 2)
 
@@ -597,8 +597,9 @@ def test_set_color_sample(self):
         d.highlight_target.set('Selected Text')
         d.fg_bg_toggle.set(True)
         d.set_color_sample()
-        self.assertEqual(d.frame_color_set.cget('bg'),
-                         d.highlight_sample.tag_cget('hilite', 'foreground'))
+        self.assertEqual(
+                d.style.lookup(d.frame_color_set['style'], 'background'),
+                d.highlight_sample.tag_cget('hilite', 'foreground'))
         d.set_color_sample = Func()
 
     def test_paint_theme_sample(self):
@@ -641,7 +642,7 @@ def test_paint_theme_sample(self):
     def test_delete_custom(self):
         eq = self.assertEqual
         d = self.page
-        d.button_delete_custom['state'] = NORMAL
+        d.button_delete_custom.state(('!disabled',))
         yesno = configdialog.tkMessageBox.askyesno = Func()
         dialog.deactivate_current_config = Func()
         dialog.activate_config_changes = Func()
@@ -670,7 +671,7 @@ def test_delete_custom(self):
         eq(yesno.called, 2)
         self.assertNotIn(theme_name, highpage)
         eq(idleConf.GetSectionList('user', 'highlight'), [])
-        eq(d.custom_theme_on['state'], DISABLED)
+        eq(d.custom_theme_on.state(), ('disabled',))
         eq(d.custom_name.get(), '- no custom themes -')
         eq(dialog.deactivate_current_config.called, 1)
         eq(dialog.activate_config_changes.called, 1)
@@ -721,7 +722,7 @@ def test_load_key_cfg(self):
         # builtinlist sets variable builtin_name to the CurrentKeys default.
         eq(d.builtin_name.get(), 'IDLE Classic OSX')
         eq(d.custom_name.get(), '- no custom keys -')
-        eq(d.custom_keyset_on['state'], DISABLED)
+        eq(d.custom_keyset_on.state(), ('disabled',))
         eq(d.set_keys_type.called, 1)
         eq(d.load_keys_list.called, 1)
         eq(d.load_keys_list.args, ('IDLE Classic OSX', ))
@@ -765,7 +766,7 @@ def test_keyset_source(self):
         changes.clear()
 
         # Custom selected.
-        d.custom_keyset_on['state'] = NORMAL
+        d.custom_keyset_on.state(('!disabled',))
         d.custom_keyset_on.invoke()
         self.assertEqual(mainpage, {'Keys': {'default': 'False'}})
         eq(d.var_changed_builtin_name.called, 1)
@@ -847,15 +848,15 @@ def test_set_keys_type(self):
         d.set_keys_type()
         eq(d.builtinlist['state'], NORMAL)
         eq(d.customlist['state'], DISABLED)
-        eq(d.button_delete_custom_keys['state'], DISABLED)
+        eq(d.button_delete_custom_keys.state(), ('disabled',))
 
         # Custom keyset selected.
         d.keyset_source.set(False)
         d.set_keys_type()
         eq(d.builtinlist['state'], DISABLED)
-        eq(d.custom_keyset_on['state'], NORMAL)
+        eq(d.custom_keyset_on.state(), ('selected',))
         eq(d.customlist['state'], NORMAL)
-        eq(d.button_delete_custom_keys['state'], NORMAL)
+        eq(d.button_delete_custom_keys.state(), ())
         d.set_keys_type = Func()
 
     def test_get_new_keys(self):
@@ -865,7 +866,7 @@ def test_get_new_keys(self):
         gkd = configdialog.GetKeysDialog = Func(return_self=True)
         gnkn = d.get_new_keys_name = Func()
 
-        d.button_new_keys['state'] = NORMAL
+        d.button_new_keys.state(('!disabled',))
         d.bindingslist.delete(0, 'end')
         d.bindingslist.insert(0, 'copy - <Control-Shift-Key-C>')
         d.bindingslist.selection_set(0)
@@ -953,7 +954,7 @@ def test_on_bindingslist_select(self):
         b.event_generate('<Button-1>', x=x, y=y)
         b.event_generate('<ButtonRelease-1>', x=x, y=y)
         self.assertEqual(b.get('anchor'), 'find')
-        self.assertEqual(d.button_new_keys['state'], NORMAL)
+        self.assertEqual(d.button_new_keys.state(), ())
 
     def test_create_new_key_set_and_save_new_key_set(self):
         eq = self.assertEqual
@@ -1032,7 +1033,7 @@ def test_load_keys_list(self):
     def test_delete_custom_keys(self):
         eq = self.assertEqual
         d = self.page
-        d.button_delete_custom_keys['state'] = NORMAL
+        d.button_delete_custom_keys.state(('!disabled',))
         yesno = configdialog.tkMessageBox.askyesno = Func()
         dialog.deactivate_current_config = Func()
         dialog.activate_config_changes = Func()
@@ -1061,7 +1062,7 @@ def test_delete_custom_keys(self):
         eq(yesno.called, 2)
         self.assertNotIn(keyset_name, keyspage)
         eq(idleConf.GetSectionList('user', 'keys'), [])
-        eq(d.custom_keyset_on['state'], DISABLED)
+        eq(d.custom_keyset_on.state(), ('disabled',))
         eq(d.custom_name.get(), '- no custom keys -')
         eq(dialog.deactivate_current_config.called, 1)
         eq(dialog.activate_config_changes.called, 1)
@@ -1173,18 +1174,18 @@ def test_set_add_delete_state(self):
 
         h.delete(0, 'end')
         sad()
-        eq(d.button_helplist_edit['state'], DISABLED)
-        eq(d.button_helplist_remove['state'], DISABLED)
+        eq(d.button_helplist_edit.state(), ('disabled',))
+        eq(d.button_helplist_remove.state(), ('disabled',))
 
         h.insert(0, 'source')
         sad()
-        eq(d.button_helplist_edit['state'], DISABLED)
-        eq(d.button_helplist_remove['state'], DISABLED)
+        eq(d.button_helplist_edit.state(), ('disabled',))
+        eq(d.button_helplist_remove.state(), ('disabled',))
 
         h.selection_set(0)
         sad()
-        eq(d.button_helplist_edit['state'], NORMAL)
-        eq(d.button_helplist_remove['state'], NORMAL)
+        eq(d.button_helplist_edit.state(), ())
+        eq(d.button_helplist_remove.state(), ())
         d.set_add_delete_state = Func()  # Mask method.
 
     def test_helplist_item_add(self):
diff --git a/Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst b/Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst
index 18f40a41f29..3031adff717 100644
--- a/Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst
+++ b/Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst
@@ -1 +1,2 @@
-IDLE - Use ttk Notebook in ConfigDialog
+IDLE - Use ttk widgets in ConfigDialog.
+Patches by Terry Jan Reedy and Cheryl Sabella.


From webhook-mailer at python.org  Sat Aug 26 16:44:17 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Sat, 26 Aug 2017 20:44:17 -0000
Subject: [Python-checkins] coalesce blurbs for 2.7.14rc1
Message-ID: <mailman.116.1503780258.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/a944079d392dacd6f7baee9d8c8fd7bda25c2a18
commit: a944079d392dacd6f7baee9d8c8fd7bda25c2a18
branch: 2.7
author: Benjamin Peterson <benjamin at python.org>
committer: Benjamin Peterson <benjamin at python.org>
date: 2017-08-26T11:13:23-07:00
summary:

coalesce blurbs for 2.7.14rc1

files:
A Misc/NEWS.d/2.7.14rc1.rst
D Misc/NEWS.d/next/Core and Builtins/2017-06-26-14-29-50.bpo-30765.Q5iBmf.rst
D Misc/NEWS.d/next/Library/2017-06-29-22-04-44.bpo-30807.sLtjY-.rst
D Misc/NEWS.d/next/Library/2017-07-07-02-18-57.bpo-29854.J8wKb_.rst
D Misc/NEWS.d/next/Library/2017-07-23-13-47-22.bpo-29902.CiuFdn.rst
D Misc/NEWS.d/next/Library/2017-07-26-04-46-12.bpo-30595.-zJ7d8.rst
D Misc/NEWS.d/next/Library/2017-07-26-22-02-07.bpo-30119.DZ6C_S.rst
D Misc/NEWS.d/next/Library/2017-07-31-19-32-57.bpo-29519._j1awg.rst
D Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst
D Misc/NEWS.d/next/Library/2017-08-08-14-59-26.bpo-31135.9q1QdB.rst
D Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst
D Misc/NEWS.d/next/Tests/2017-06-26-11-24-14.bpo-30283.qCQmlm.rst
D Misc/NEWS.d/next/Tests/2017-07-20-14-29-54.bpo-30822.X0wREo.rst
D Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst

diff --git a/Misc/NEWS.d/2.7.14rc1.rst b/Misc/NEWS.d/2.7.14rc1.rst
new file mode 100644
index 00000000000..462c03a9fc3
--- /dev/null
+++ b/Misc/NEWS.d/2.7.14rc1.rst
@@ -0,0 +1,149 @@
+.. bpo: 30947
+.. date: 2017-08-16-16-35-59
+.. nonce: iNMmm4
+.. release date: 2017-08-26
+.. section: Security
+
+Upgrade libexpat embedded copy from version 2.2.1 to 2.2.3 to get security
+fixes.
+
+..
+
+.. bpo: 30765
+.. date: 2017-06-26-14-29-50
+.. nonce: Q5iBmf
+.. section: Core and Builtins
+
+Avoid blocking in pthread_mutex_lock() when PyThread_acquire_lock() is asked
+not to block.
+
+..
+
+.. bpo: 31135
+.. date: 2017-08-08-14-59-26
+.. nonce: 9q1QdB
+.. section: Library
+
+ttk: Fix LabeledScale and OptionMenu destroy() method. Call the parent
+destroy() method even if the used attribute doesn't exist. The
+LabeledScale.destroy() method now also explicitly clears label and scale
+attributes to help the garbage collector to destroy all widgets.
+
+..
+
+.. bpo: 31107
+.. date: 2017-08-02-12-48-15
+.. nonce: 1t2hn5
+.. section: Library
+
+Fix `copy_reg._slotnames()` mangled attribute calculation for classes whose
+name begins with an underscore. Patch by Shane Harvey.
+
+..
+
+.. bpo: 29519
+.. date: 2017-07-31-19-32-57
+.. nonce: _j1awg
+.. section: Library
+
+Fix weakref spewing exceptions during interpreter shutdown when used with a
+rare combination of multiprocessing and custom codecs.
+
+..
+
+.. bpo: 30119
+.. date: 2017-07-26-22-02-07
+.. nonce: DZ6C_S
+.. section: Library
+
+ftplib.FTP.putline() now throws ValueError on commands that contains CR or
+LF. Patch by Dong-hee Na.
+
+..
+
+.. bpo: 30595
+.. date: 2017-07-26-04-46-12
+.. nonce: -zJ7d8
+.. section: Library
+
+multiprocessing.Queue.get() with a timeout now polls its reader in non-
+blocking mode if it succeeded to aquire the lock but the acquire took longer
+than the timeout.
+
+..
+
+.. bpo: 29902
+.. date: 2017-07-23-13-47-22
+.. nonce: CiuFdn
+.. section: Library
+
+Py3k deprecation warning now is emitted when pickling or copying some
+builtin and extension objects that don't support pickling explicitly and are
+pickled incorrectly by default (like memoryview or staticmethod).  This is a
+TypeError in Python 3.6.
+
+..
+
+.. bpo: 29854
+.. date: 2017-07-07-02-18-57
+.. nonce: J8wKb_
+.. section: Library
+
+Fix segfault in readline when using readline's history-size option.  Patch
+by Nir Soffer.
+
+..
+
+.. bpo: 30807
+.. date: 2017-06-29-22-04-44
+.. nonce: sLtjY-
+.. section: Library
+
+signal.setitimer() may disable the timer when passed a tiny value.
+
+Tiny values (such as 1e-6) are valid non-zero values for setitimer(), which
+is specified as taking microsecond-resolution intervals. However, on some
+platform, our conversion routine could convert 1e-6 into a zero interval,
+therefore disabling the timer instead of (re-)scheduling it.
+
+..
+
+.. bpo: 30715
+.. date: 2017-07-25-15-27-44
+.. nonce: Sp7bTF
+.. section: Tests
+
+Address ALPN callback changes for OpenSSL 1.1.0f. The latest version behaves
+like OpenSSL 1.0.2 and no longer aborts handshake.
+
+..
+
+.. bpo: 30822
+.. date: 2017-07-20-14-29-54
+.. nonce: X0wREo
+.. section: Tests
+
+Fix regrtest command line parser to allow passing -u extralargefile to run
+test_zipfile64.
+
+..
+
+.. bpo: 30283
+.. date: 2017-06-26-11-24-14
+.. nonce: qCQmlm
+.. section: Tests
+
+regrtest: Enhance regrtest and backport features from the master branch.
+
+Add options: --coverage, --testdir, --list-tests (list test files, don't run
+them), --list-cases (list test identifiers, don't run them, :issue:`30523`),
+--matchfile (load a list of test filters from a text file, :issue:`30540`),
+--slowest (alias to --slow).
+
+Enhance output: add timestamp, test result, currently running tests, "Tests
+result: xxx" summary with total duration, etc.
+
+Fix reference leak hunting in regrtest, --huntrleaks: regrtest now warms up
+caches, create explicitly all internal singletons which are created on
+demand to prevent false positives when checking for reference leaks.
+(:issue:`30675`).
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-06-26-14-29-50.bpo-30765.Q5iBmf.rst b/Misc/NEWS.d/next/Core and Builtins/2017-06-26-14-29-50.bpo-30765.Q5iBmf.rst
deleted file mode 100644
index 08d76cb965e..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-06-26-14-29-50.bpo-30765.Q5iBmf.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Avoid blocking in pthread_mutex_lock() when PyThread_acquire_lock() is asked
-not to block.
diff --git a/Misc/NEWS.d/next/Library/2017-06-29-22-04-44.bpo-30807.sLtjY-.rst b/Misc/NEWS.d/next/Library/2017-06-29-22-04-44.bpo-30807.sLtjY-.rst
deleted file mode 100644
index ce6f48a61f6..00000000000
--- a/Misc/NEWS.d/next/Library/2017-06-29-22-04-44.bpo-30807.sLtjY-.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-signal.setitimer() may disable the timer when passed a tiny value.
-
-Tiny values (such as 1e-6) are valid non-zero values for setitimer(), which
-is specified as taking microsecond-resolution intervals. However, on some
-platform, our conversion routine could convert 1e-6 into a zero interval,
-therefore disabling the timer instead of (re-)scheduling it.
diff --git a/Misc/NEWS.d/next/Library/2017-07-07-02-18-57.bpo-29854.J8wKb_.rst b/Misc/NEWS.d/next/Library/2017-07-07-02-18-57.bpo-29854.J8wKb_.rst
deleted file mode 100644
index 5c439087dcb..00000000000
--- a/Misc/NEWS.d/next/Library/2017-07-07-02-18-57.bpo-29854.J8wKb_.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix segfault in readline when using readline's history-size option.  Patch
-by Nir Soffer.
diff --git a/Misc/NEWS.d/next/Library/2017-07-23-13-47-22.bpo-29902.CiuFdn.rst b/Misc/NEWS.d/next/Library/2017-07-23-13-47-22.bpo-29902.CiuFdn.rst
deleted file mode 100644
index 6aa6605be3e..00000000000
--- a/Misc/NEWS.d/next/Library/2017-07-23-13-47-22.bpo-29902.CiuFdn.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Py3k deprecation warning now is emitted when pickling or copying some builtin
-and extension objects that don't support pickling explicitly and are pickled
-incorrectly by default (like memoryview or staticmethod).  This is a
-TypeError in Python 3.6.
diff --git a/Misc/NEWS.d/next/Library/2017-07-26-04-46-12.bpo-30595.-zJ7d8.rst b/Misc/NEWS.d/next/Library/2017-07-26-04-46-12.bpo-30595.-zJ7d8.rst
deleted file mode 100644
index 4a2a3901cc6..00000000000
--- a/Misc/NEWS.d/next/Library/2017-07-26-04-46-12.bpo-30595.-zJ7d8.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-multiprocessing.Queue.get() with a timeout now polls its reader in non-
-blocking mode if it succeeded to aquire the lock but the acquire took longer
-than the timeout.
diff --git a/Misc/NEWS.d/next/Library/2017-07-26-22-02-07.bpo-30119.DZ6C_S.rst b/Misc/NEWS.d/next/Library/2017-07-26-22-02-07.bpo-30119.DZ6C_S.rst
deleted file mode 100644
index a37d3703842..00000000000
--- a/Misc/NEWS.d/next/Library/2017-07-26-22-02-07.bpo-30119.DZ6C_S.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-ftplib.FTP.putline() now throws ValueError on commands that contains CR or
-LF. Patch by Dong-hee Na.
diff --git a/Misc/NEWS.d/next/Library/2017-07-31-19-32-57.bpo-29519._j1awg.rst b/Misc/NEWS.d/next/Library/2017-07-31-19-32-57.bpo-29519._j1awg.rst
deleted file mode 100644
index 9b2e39d3318..00000000000
--- a/Misc/NEWS.d/next/Library/2017-07-31-19-32-57.bpo-29519._j1awg.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix weakref spewing exceptions during interpreter shutdown when used with a
-rare combination of multiprocessing and custom codecs.
diff --git a/Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst b/Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst
deleted file mode 100644
index 09807058b4c..00000000000
--- a/Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix `copy_reg._slotnames()` mangled attribute calculation for classes whose
-name begins with an underscore. Patch by Shane Harvey.
diff --git a/Misc/NEWS.d/next/Library/2017-08-08-14-59-26.bpo-31135.9q1QdB.rst b/Misc/NEWS.d/next/Library/2017-08-08-14-59-26.bpo-31135.9q1QdB.rst
deleted file mode 100644
index 4d89633e126..00000000000
--- a/Misc/NEWS.d/next/Library/2017-08-08-14-59-26.bpo-31135.9q1QdB.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-ttk: Fix LabeledScale and OptionMenu destroy() method. Call the parent
-destroy() method even if the used attribute doesn't exist. The
-LabeledScale.destroy() method now also explicitly clears label and scale
-attributes to help the garbage collector to destroy all widgets.
diff --git a/Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst b/Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst
deleted file mode 100644
index 3caca9a79b4..00000000000
--- a/Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Upgrade libexpat embedded copy from version 2.2.1 to 2.2.3 to get security
-fixes.
diff --git a/Misc/NEWS.d/next/Tests/2017-06-26-11-24-14.bpo-30283.qCQmlm.rst b/Misc/NEWS.d/next/Tests/2017-06-26-11-24-14.bpo-30283.qCQmlm.rst
deleted file mode 100644
index 528dc7a9231..00000000000
--- a/Misc/NEWS.d/next/Tests/2017-06-26-11-24-14.bpo-30283.qCQmlm.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-regrtest: Enhance regrtest and backport features from the master branch.
-
-Add options: --coverage, --testdir, --list-tests (list test files, don't run
-them), --list-cases (list test identifiers, don't run them, :issue:`30523`),
---matchfile (load a list of test filters from a text file, :issue:`30540`),
---slowest (alias to --slow).
-
-Enhance output: add timestamp, test result, currently running tests, "Tests
-result: xxx" summary with total duration, etc.
-
-Fix reference leak hunting in regrtest, --huntrleaks: regrtest now warms up
-caches, create explicitly all internal singletons which are created on demand
-to prevent false positives when checking for reference leaks.
-(:issue:`30675`).
diff --git a/Misc/NEWS.d/next/Tests/2017-07-20-14-29-54.bpo-30822.X0wREo.rst b/Misc/NEWS.d/next/Tests/2017-07-20-14-29-54.bpo-30822.X0wREo.rst
deleted file mode 100644
index ee0cf02c703..00000000000
--- a/Misc/NEWS.d/next/Tests/2017-07-20-14-29-54.bpo-30822.X0wREo.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix regrtest command line parser to allow passing -u extralargefile to
-run test_zipfile64.
diff --git a/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst b/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst
deleted file mode 100644
index 88394e585c5..00000000000
--- a/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Address ALPN callback changes for OpenSSL 1.1.0f. The latest version behaves
-like OpenSSL 1.0.2 and no longer aborts handshake.


From webhook-mailer at python.org  Sat Aug 26 21:00:51 2017
From: webhook-mailer at python.org (Steve Dower)
Date: Sun, 27 Aug 2017 01:00:51 -0000
Subject: [Python-checkins] Enables RC markings in nuget packages. (#3216)
Message-ID: <mailman.117.1503795652.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/0b69b3723d018b197b94b173c3305bdef4c6b11b
commit: 0b69b3723d018b197b94b173c3305bdef4c6b11b
branch: 2.7
author: Steve Dower <steve.dower at microsoft.com>
committer: GitHub <noreply at github.com>
date: 2017-08-26T18:00:48-07:00
summary:

Enables RC markings in nuget packages. (#3216)

files:
M Tools/nuget/make_pkg.proj

diff --git a/Tools/nuget/make_pkg.proj b/Tools/nuget/make_pkg.proj
index cb124abb5e8..0f3f8bd000a 100644
--- a/Tools/nuget/make_pkg.proj
+++ b/Tools/nuget/make_pkg.proj
@@ -14,6 +14,7 @@
 
     <PropertyGroup>
         <NuspecVersion>$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)</NuspecVersion>
+        <NuspecVersion Condition="$(ReleaseLevelName) != ''">$(NuspecVersion)-$(ReleaseLevelName)</NuspecVersion>
         <SignOutput>false</SignOutput>
         <TargetName>$(OutputName).$(NuspecVersion)</TargetName>
         <TargetExt>.nupkg</TargetExt>


From solipsis at pitrou.net  Sun Aug 27 04:59:30 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 27 Aug 2017 08:59:30 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=13
Message-ID: <20170827085930.92121.2B272E957EE001DB@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_asyncio leaked [3, 0, 0] memory blocks, sum=3
test_collections leaked [0, 0, 7] memory blocks, sum=7
test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_spawn leaked [-2, 2, -1] memory blocks, sum=-1


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogzIWImY', '--timeout', '7200']

From webhook-mailer at python.org  Sun Aug 27 16:39:45 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 27 Aug 2017 20:39:45 -0000
Subject: [Python-checkins] bpo-31287: IDLE - do not alter tkinter.messagebox
 in configdialog tests. (#3220)
Message-ID: <mailman.118.1503866385.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/3457f428964d0fd6ab601272ead276a9bf8b1eaf
commit: 3457f428964d0fd6ab601272ead276a9bf8b1eaf
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-27T16:39:41-04:00
summary:

bpo-31287: IDLE - do not alter tkinter.messagebox in configdialog tests. (#3220)

files:
A Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst
M Lib/idlelib/configdialog.py
M Lib/idlelib/idle_test/test_configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index ff7b638b51f..8afc9e6d692 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -18,7 +18,7 @@
                          Notebook, Radiobutton, Scrollbar, Style)
 import tkinter.colorchooser as tkColorChooser
 import tkinter.font as tkFont
-import tkinter.messagebox as tkMessageBox
+from tkinter import messagebox
 
 from idlelib.config import idleConf, ConfigChanges
 from idlelib.config_key import GetKeysDialog
@@ -1227,6 +1227,10 @@ def save_new(self, theme_name, theme):
             value = theme[element]
             idleConf.userCfg['highlight'].SetOption(theme_name, element, value)
 
+    def askyesno(self, *args, **kwargs):
+        # Make testing easier.  Could change implementation.
+        messagebox.askyesno(*args, **kwargs)
+
     def delete_custom(self):
         """Handle event to delete custom theme.
 
@@ -1251,7 +1255,7 @@ def delete_custom(self):
         """
         theme_name = self.custom_name.get()
         delmsg = 'Are you sure you wish to delete the theme %r ?'
-        if not tkMessageBox.askyesno(
+        if not self.askyesno(
                 'Delete Theme',  delmsg % theme_name, parent=self):
             return
         self.cd.deactivate_current_config()
@@ -1669,6 +1673,10 @@ def save_new_key_set(keyset_name, keyset):
             value = keyset[event]
             idleConf.userCfg['keys'].SetOption(keyset_name, event, value)
 
+    def askyesno(self, *args, **kwargs):
+        # Make testing easier.  Could change implementation.
+        messagebox.askyesno(*args, **kwargs)
+
     def delete_custom_keys(self):
         """Handle event to delete a custom key set.
 
@@ -1678,7 +1686,7 @@ def delete_custom_keys(self):
         """
         keyset_name = self.custom_name.get()
         delmsg = 'Are you sure you wish to delete the key set %r ?'
-        if not tkMessageBox.askyesno(
+        if not self.askyesno(
                 'Delete Key Set',  delmsg % keyset_name, parent=self):
             return
         self.cd.deactivate_current_config()
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index c947da1866e..f116538faca 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -643,7 +643,7 @@ def test_delete_custom(self):
         eq = self.assertEqual
         d = self.page
         d.button_delete_custom.state(('!disabled',))
-        yesno = configdialog.tkMessageBox.askyesno = Func()
+        yesno = d.askyesno = Func()
         dialog.deactivate_current_config = Func()
         dialog.activate_config_changes = Func()
 
@@ -678,7 +678,7 @@ def test_delete_custom(self):
         eq(d.set_theme_type.called, 1)
 
         del dialog.activate_config_changes, dialog.deactivate_current_config
-        del configdialog.tkMessageBox.askyesno
+        del d.askyesno
 
 
 class KeysPageTest(unittest.TestCase):
@@ -1034,7 +1034,7 @@ def test_delete_custom_keys(self):
         eq = self.assertEqual
         d = self.page
         d.button_delete_custom_keys.state(('!disabled',))
-        yesno = configdialog.tkMessageBox.askyesno = Func()
+        yesno = d.askyesno = Func()
         dialog.deactivate_current_config = Func()
         dialog.activate_config_changes = Func()
 
@@ -1069,7 +1069,7 @@ def test_delete_custom_keys(self):
         eq(d.set_keys_type.called, 1)
 
         del dialog.activate_config_changes, dialog.deactivate_current_config
-        del configdialog.tkMessageBox.askyesno
+        del d.askyesno
 
 
 class GenPageTest(unittest.TestCase):
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst b/Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst
new file mode 100644
index 00000000000..9cd55573f87
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst
@@ -0,0 +1 @@
+IDLE - Do not modify tkinter.message in test_configdialog.


From webhook-mailer at python.org  Sun Aug 27 17:14:22 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 27 Aug 2017 21:14:22 -0000
Subject: [Python-checkins] [3.6] bpo-31287: IDLE - do not alter
 tkinter.messagebox in configdialog tests. (GH-3220) (#3221)
Message-ID: <mailman.119.1503868465.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/7e248904cd5b3e658b1792deca1b82d873b2d120
commit: 7e248904cd5b3e658b1792deca1b82d873b2d120
branch: 3.6
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-27T17:14:19-04:00
summary:

[3.6] bpo-31287: IDLE - do not alter tkinter.messagebox in configdialog tests. (GH-3220) (#3221)

(cherry picked from commit 3457f42)

files:
A Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst
M Lib/idlelib/configdialog.py
M Lib/idlelib/idle_test/test_configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index ff7b638b51f..8afc9e6d692 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -18,7 +18,7 @@
                          Notebook, Radiobutton, Scrollbar, Style)
 import tkinter.colorchooser as tkColorChooser
 import tkinter.font as tkFont
-import tkinter.messagebox as tkMessageBox
+from tkinter import messagebox
 
 from idlelib.config import idleConf, ConfigChanges
 from idlelib.config_key import GetKeysDialog
@@ -1227,6 +1227,10 @@ def save_new(self, theme_name, theme):
             value = theme[element]
             idleConf.userCfg['highlight'].SetOption(theme_name, element, value)
 
+    def askyesno(self, *args, **kwargs):
+        # Make testing easier.  Could change implementation.
+        messagebox.askyesno(*args, **kwargs)
+
     def delete_custom(self):
         """Handle event to delete custom theme.
 
@@ -1251,7 +1255,7 @@ def delete_custom(self):
         """
         theme_name = self.custom_name.get()
         delmsg = 'Are you sure you wish to delete the theme %r ?'
-        if not tkMessageBox.askyesno(
+        if not self.askyesno(
                 'Delete Theme',  delmsg % theme_name, parent=self):
             return
         self.cd.deactivate_current_config()
@@ -1669,6 +1673,10 @@ def save_new_key_set(keyset_name, keyset):
             value = keyset[event]
             idleConf.userCfg['keys'].SetOption(keyset_name, event, value)
 
+    def askyesno(self, *args, **kwargs):
+        # Make testing easier.  Could change implementation.
+        messagebox.askyesno(*args, **kwargs)
+
     def delete_custom_keys(self):
         """Handle event to delete a custom key set.
 
@@ -1678,7 +1686,7 @@ def delete_custom_keys(self):
         """
         keyset_name = self.custom_name.get()
         delmsg = 'Are you sure you wish to delete the key set %r ?'
-        if not tkMessageBox.askyesno(
+        if not self.askyesno(
                 'Delete Key Set',  delmsg % keyset_name, parent=self):
             return
         self.cd.deactivate_current_config()
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index c947da1866e..f116538faca 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -643,7 +643,7 @@ def test_delete_custom(self):
         eq = self.assertEqual
         d = self.page
         d.button_delete_custom.state(('!disabled',))
-        yesno = configdialog.tkMessageBox.askyesno = Func()
+        yesno = d.askyesno = Func()
         dialog.deactivate_current_config = Func()
         dialog.activate_config_changes = Func()
 
@@ -678,7 +678,7 @@ def test_delete_custom(self):
         eq(d.set_theme_type.called, 1)
 
         del dialog.activate_config_changes, dialog.deactivate_current_config
-        del configdialog.tkMessageBox.askyesno
+        del d.askyesno
 
 
 class KeysPageTest(unittest.TestCase):
@@ -1034,7 +1034,7 @@ def test_delete_custom_keys(self):
         eq = self.assertEqual
         d = self.page
         d.button_delete_custom_keys.state(('!disabled',))
-        yesno = configdialog.tkMessageBox.askyesno = Func()
+        yesno = d.askyesno = Func()
         dialog.deactivate_current_config = Func()
         dialog.activate_config_changes = Func()
 
@@ -1069,7 +1069,7 @@ def test_delete_custom_keys(self):
         eq(d.set_keys_type.called, 1)
 
         del dialog.activate_config_changes, dialog.deactivate_current_config
-        del configdialog.tkMessageBox.askyesno
+        del d.askyesno
 
 
 class GenPageTest(unittest.TestCase):
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst b/Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst
new file mode 100644
index 00000000000..9cd55573f87
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst
@@ -0,0 +1 @@
+IDLE - Do not modify tkinter.message in test_configdialog.


From webhook-mailer at python.org  Sun Aug 27 18:06:04 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 27 Aug 2017 22:06:04 -0000
Subject: [Python-checkins] bpo-30617: IDLE: docstrings and unittest for
 outwin.py (#2046)
Message-ID: <mailman.120.1503871566.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/998f4966bf0c591f3e8b3d07eccad7501f60f524
commit: 998f4966bf0c591f3e8b3d07eccad7501f60f524
branch: master
author: Cheryl Sabella <cheryl.sabella at gmail.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-08-27T18:06:00-04:00
summary:

bpo-30617: IDLE: docstrings and unittest for outwin.py (#2046)


Move some data and functions from the class to module level. Patch by Cheryl Sabella.

files:
A Lib/idlelib/idle_test/test_outwin.py
A Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst
M Lib/idlelib/outwin.py

diff --git a/Lib/idlelib/idle_test/test_outwin.py b/Lib/idlelib/idle_test/test_outwin.py
new file mode 100644
index 00000000000..231c7bf9cfb
--- /dev/null
+++ b/Lib/idlelib/idle_test/test_outwin.py
@@ -0,0 +1,172 @@
+""" Test idlelib.outwin.
+"""
+
+import unittest
+from tkinter import Tk, Text
+from idlelib.idle_test.mock_tk import Mbox_func
+from idlelib.idle_test.mock_idle import Func
+from idlelib import outwin
+from test.support import requires
+from unittest import mock
+
+
+class OutputWindowTest(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        requires('gui')
+        root = cls.root = Tk()
+        root.withdraw()
+        w = cls.window = outwin.OutputWindow(None, None, None, root)
+        cls.text = w.text = Text(root)
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.window.close()
+        del cls.text, cls.window
+        cls.root.destroy()
+        del cls.root
+
+    def setUp(self):
+        self.text.delete('1.0', 'end')
+
+    def test_ispythonsource(self):
+        # OutputWindow overrides ispythonsource to always return False.
+        w = self.window
+        self.assertFalse(w.ispythonsource('test.txt'))
+        self.assertFalse(w.ispythonsource(__file__))
+
+    def test_window_title(self):
+        self.assertEqual(self.window.top.title(), 'Output')
+
+    def test_maybesave(self):
+        w = self.window
+        eq = self.assertEqual
+        w.get_saved = Func()
+
+        w.get_saved.result = False
+        eq(w.maybesave(), 'no')
+        eq(w.get_saved.called, 1)
+
+        w.get_saved.result = True
+        eq(w.maybesave(), 'yes')
+        eq(w.get_saved.called, 2)
+        del w.get_saved
+
+    def test_write(self):
+        eq = self.assertEqual
+        delete = self.text.delete
+        get = self.text.get
+        write = self.window.write
+
+        # Test bytes.
+        b = b'Test bytes.'
+        eq(write(b), len(b))
+        eq(get('1.0', '1.end'), b.decode())
+
+        # No new line - insert stays on same line.
+        delete('1.0', 'end')
+        test_text = 'test text'
+        eq(write(test_text), len(test_text))
+        eq(get('1.0', '1.end'), 'test text')
+        eq(get('insert linestart', 'insert lineend'), 'test text')
+
+        # New line - insert moves to next line.
+        delete('1.0', 'end')
+        test_text = 'test text\n'
+        eq(write(test_text), len(test_text))
+        eq(get('1.0', '1.end'), 'test text')
+        eq(get('insert linestart', 'insert lineend'), '')
+
+        # Text after new line is tagged for second line of Text widget.
+        delete('1.0', 'end')
+        test_text = 'test text\nLine 2'
+        eq(write(test_text), len(test_text))
+        eq(get('1.0', '1.end'), 'test text')
+        eq(get('2.0', '2.end'), 'Line 2')
+        eq(get('insert linestart', 'insert lineend'), 'Line 2')
+
+        # Test tags.
+        delete('1.0', 'end')
+        test_text = 'test text\n'
+        test_text2 = 'Line 2\n'
+        eq(write(test_text, tags='mytag'), len(test_text))
+        eq(write(test_text2, tags='secondtag'), len(test_text2))
+        eq(get('mytag.first', 'mytag.last'), test_text)
+        eq(get('secondtag.first', 'secondtag.last'), test_text2)
+        eq(get('1.0', '1.end'), test_text.rstrip('\n'))
+        eq(get('2.0', '2.end'), test_text2.rstrip('\n'))
+
+    def test_writelines(self):
+        eq = self.assertEqual
+        get = self.text.get
+        writelines = self.window.writelines
+
+        writelines(('Line 1\n', 'Line 2\n', 'Line 3\n'))
+        eq(get('1.0', '1.end'), 'Line 1')
+        eq(get('2.0', '2.end'), 'Line 2')
+        eq(get('3.0', '3.end'), 'Line 3')
+        eq(get('insert linestart', 'insert lineend'), '')
+
+    def test_goto_file_line(self):
+        eq = self.assertEqual
+        w = self.window
+        text = self.text
+
+        w.flist = mock.Mock()
+        gfl = w.flist.gotofileline = Func()
+        showerror = w.showerror = Mbox_func()
+
+        # No file/line number.
+        w.write('Not a file line')
+        self.assertIsNone(w.goto_file_line())
+        eq(gfl.called, 0)
+        eq(showerror.title, 'No special line')
+
+        # Current file/line number.
+        w.write(f'{str(__file__)}: 42: spam\n')
+        w.write(f'{str(__file__)}: 21: spam')
+        self.assertIsNone(w.goto_file_line())
+        eq(gfl.args, (str(__file__), 21))
+
+        # Previous line has file/line number.
+        text.delete('1.0', 'end')
+        w.write(f'{str(__file__)}: 42: spam\n')
+        w.write('Not a file line')
+        self.assertIsNone(w.goto_file_line())
+        eq(gfl.args, (str(__file__), 42))
+
+        del w.flist.gotofileline, w.showerror
+
+
+class ModuleFunctionTest(unittest.TestCase):
+
+    @classmethod
+    def setUp(cls):
+        outwin.file_line_progs = None
+
+    def test_compile_progs(self):
+        outwin.compile_progs()
+        for pat, regex in zip(outwin.file_line_pats, outwin.file_line_progs):
+            self.assertEqual(regex.pattern, pat)
+
+    @mock.patch('builtins.open')
+    def test_file_line_helper(self, mock_open):
+        flh = outwin.file_line_helper
+        test_lines = (
+            (r'foo file "testfile1", line 42, bar', ('testfile1', 42)),
+            (r'foo testfile2(21) bar', ('testfile2', 21)),
+            (r'  testfile3  : 42: foo bar\n', ('  testfile3  ', 42)),
+            (r'foo testfile4.py :1: ', ('foo testfile4.py ', 1)),
+            ('testfile5: \u19D4\u19D2: ', ('testfile5', 42)),
+            (r'testfile6: 42', None),       # only one `:`
+            (r'testfile7 42 text', None)    # no separators
+            )
+        for line, expected_output in test_lines:
+            self.assertEqual(flh(line), expected_output)
+            if expected_output:
+                mock_open.assert_called_with(expected_output[0], 'r')
+
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)
diff --git a/Lib/idlelib/outwin.py b/Lib/idlelib/outwin.py
index f6d2915c624..5f7c09fb92c 100644
--- a/Lib/idlelib/outwin.py
+++ b/Lib/idlelib/outwin.py
@@ -1,43 +1,113 @@
+"""Editor window that can serve as an output file.
+"""
+
 import re
 
-from tkinter import *
-import tkinter.messagebox as tkMessageBox
+from tkinter import messagebox
 
 from idlelib.editor import EditorWindow
 from idlelib import iomenu
 
 
-class OutputWindow(EditorWindow):
+file_line_pats = [
+    # order of patterns matters
+    r'file "([^"]*)", line (\d+)',
+    r'([^\s]+)\((\d+)\)',
+    r'^(\s*\S.*?):\s*(\d+):',  # Win filename, maybe starting with spaces
+    r'([^\s]+):\s*(\d+):',     # filename or path, ltrim
+    r'^\s*(\S.*?):\s*(\d+):',  # Win abs path with embedded spaces, ltrim
+]
+
+file_line_progs = None
+
+
+def compile_progs():
+    "Compile the patterns for matching to file name and line number."
+    global file_line_progs
+    file_line_progs = [re.compile(pat, re.IGNORECASE)
+                       for pat in file_line_pats]
+
 
+def file_line_helper(line):
+    """Extract file name and line number from line of text.
+
+    Check if line of text contains one of the file/line patterns.
+    If it does and if the file and line are valid, return
+    a tuple of the file name and line number.  If it doesn't match
+    or if the file or line is invalid, return None.
+    """
+    if not file_line_progs:
+        compile_progs()
+    for prog in file_line_progs:
+        match = prog.search(line)
+        if match:
+            filename, lineno = match.group(1, 2)
+            try:
+                f = open(filename, "r")
+                f.close()
+                break
+            except OSError:
+                continue
+    else:
+        return None
+    try:
+        return filename, int(lineno)
+    except TypeError:
+        return None
+
+
+class OutputWindow(EditorWindow):
     """An editor window that can serve as an output file.
 
     Also the future base class for the Python shell window.
     This class has no input facilities.
+
+    Adds binding to open a file at a line to the text widget.
     """
 
+    # Our own right-button menu
+    rmenu_specs = [
+        ("Cut", "<<cut>>", "rmenu_check_cut"),
+        ("Copy", "<<copy>>", "rmenu_check_copy"),
+        ("Paste", "<<paste>>", "rmenu_check_paste"),
+        (None, None, None),
+        ("Go to file/line", "<<goto-file-line>>", None),
+    ]
+
     def __init__(self, *args):
         EditorWindow.__init__(self, *args)
         self.text.bind("<<goto-file-line>>", self.goto_file_line)
 
     # Customize EditorWindow
-
     def ispythonsource(self, filename):
-        # No colorization needed
-        return 0
+        "Python source is only part of output: do not colorize."
+        return False
 
     def short_title(self):
+        "Customize EditorWindow title."
         return "Output"
 
     def maybesave(self):
-        # Override base class method -- don't ask any questions
-        if self.get_saved():
-            return "yes"
-        else:
-            return "no"
+        "Customize EditorWindow to not display save file messagebox."
+        return 'yes' if self.get_saved() else 'no'
 
     # Act as output file
-
     def write(self, s, tags=(), mark="insert"):
+        """Write text to text widget.
+
+        The text is inserted at the given index with the provided
+        tags.  The text widget is then scrolled to make it visible
+        and updated to display it, giving the effect of seeing each
+        line as it is added.
+
+        Args:
+            s: Text to insert into text widget.
+            tags: Tuple of tag strings to apply on the insert.
+            mark: Index for the insert.
+
+        Return:
+            Length of text inserted.
+        """
         if isinstance(s, (bytes, bytes)):
             s = s.decode(iomenu.encoding, "replace")
         self.text.insert(mark, s, tags)
@@ -46,80 +116,46 @@ def write(self, s, tags=(), mark="insert"):
         return len(s)
 
     def writelines(self, lines):
+        "Write each item in lines iterable."
         for line in lines:
             self.write(line)
 
     def flush(self):
+        "No flushing needed as write() directly writes to widget."
         pass
 
-    # Our own right-button menu
-
-    rmenu_specs = [
-        ("Cut", "<<cut>>", "rmenu_check_cut"),
-        ("Copy", "<<copy>>", "rmenu_check_copy"),
-        ("Paste", "<<paste>>", "rmenu_check_paste"),
-        (None, None, None),
-        ("Go to file/line", "<<goto-file-line>>", None),
-    ]
+    def showerror(self, *args, **kwargs):
+        messagebox.showerror(*args, **kwargs)
 
-    file_line_pats = [
-        # order of patterns matters
-        r'file "([^"]*)", line (\d+)',
-        r'([^\s]+)\((\d+)\)',
-        r'^(\s*\S.*?):\s*(\d+):',  # Win filename, maybe starting with spaces
-        r'([^\s]+):\s*(\d+):',     # filename or path, ltrim
-        r'^\s*(\S.*?):\s*(\d+):',  # Win abs path with embedded spaces, ltrim
-    ]
+    def goto_file_line(self, event=None):
+        """Handle request to open file/line.
 
-    file_line_progs = None
+        If the selected or previous line in the output window
+        contains a file name and line number, then open that file
+        name in a new window and position on the line number.
 
-    def goto_file_line(self, event=None):
-        if self.file_line_progs is None:
-            l = []
-            for pat in self.file_line_pats:
-                l.append(re.compile(pat, re.IGNORECASE))
-            self.file_line_progs = l
-        # x, y = self.event.x, self.event.y
-        # self.text.mark_set("insert", "@%d,%d" % (x, y))
+        Otherwise, display an error messagebox.
+        """
         line = self.text.get("insert linestart", "insert lineend")
-        result = self._file_line_helper(line)
+        result = file_line_helper(line)
         if not result:
             # Try the previous line.  This is handy e.g. in tracebacks,
             # where you tend to right-click on the displayed source line
             line = self.text.get("insert -1line linestart",
                                  "insert -1line lineend")
-            result = self._file_line_helper(line)
+            result = file_line_helper(line)
             if not result:
-                tkMessageBox.showerror(
+                self.showerror(
                     "No special line",
                     "The line you point at doesn't look like "
                     "a valid file name followed by a line number.",
                     parent=self.text)
                 return
         filename, lineno = result
-        edit = self.flist.open(filename)
-        edit.gotoline(lineno)
-
-    def _file_line_helper(self, line):
-        for prog in self.file_line_progs:
-            match = prog.search(line)
-            if match:
-                filename, lineno = match.group(1, 2)
-                try:
-                    f = open(filename, "r")
-                    f.close()
-                    break
-                except OSError:
-                    continue
-        else:
-            return None
-        try:
-            return filename, int(lineno)
-        except TypeError:
-            return None
+        self.flist.gotofileline(filename, lineno)
 
-# These classes are currently not used but might come in handy
 
+# These classes are currently not used but might come in handy
 class OnDemandOutputWindow:
 
     tagdefs = {
@@ -145,3 +181,7 @@ def setup(self):
                 text.tag_configure(tag, **cnf)
         text.tag_raise('sel')
         self.write = self.owin.write
+
+if __name__ == '__main__':
+    import unittest
+    unittest.main('idlelib.idle_test.test_outwin', verbosity=2, exit=False)
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst b/Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst
new file mode 100644
index 00000000000..262674c32dc
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst
@@ -0,0 +1,4 @@
+IDLE - Add docstrings and tests for outwin subclass of editor.
+
+Move some data and functions from the class to module level. Patch by Cheryl
+Sabella.


From webhook-mailer at python.org  Sun Aug 27 18:19:11 2017
From: webhook-mailer at python.org (Mariatta)
Date: Sun, 27 Aug 2017 22:19:11 -0000
Subject: [Python-checkins] bpo-31191: Improve grammar in threading.Barrier
 docs (GH-3080) (GH-3224)
Message-ID: <mailman.121.1503872351.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/2dfafa3c565c0b51920269a891fa270848b378d5
commit: 2dfafa3c565c0b51920269a891fa270848b378d5
branch: 3.6
author: Mariatta <Mariatta at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-08-27T15:19:08-07:00
summary:

bpo-31191: Improve grammar in threading.Barrier docs (GH-3080) (GH-3224)

(cherry picked from commit 143be366295038b36fc32c44b8e1b48a375eab56)

files:
M Doc/library/threading.rst

diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index cda859fe4cb..021e29e7124 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -875,8 +875,8 @@ Barrier Objects
 This class provides a simple synchronization primitive for use by a fixed number
 of threads that need to wait for each other.  Each of the threads tries to pass
 the barrier by calling the :meth:`~Barrier.wait` method and will block until
-all of the threads have made the call.  At this points, the threads are released
-simultaneously.
+all of the threads have made their :meth:`~Barrier.wait` calls. At this point,
+the threads are released simultaneously.
 
 The barrier can be reused any number of times for the same number of threads.
 


From webhook-mailer at python.org  Sun Aug 27 18:29:27 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 27 Aug 2017 22:29:27 -0000
Subject: [Python-checkins] [3.6] bpo-30617: IDLE: docstrings and unittest
 for outwin.py (GH-2046) (#3223)
Message-ID: <mailman.122.1503872968.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/5c89c2fd8a0be0ad2f89f084775c5f9f76687237
commit: 5c89c2fd8a0be0ad2f89f084775c5f9f76687237
branch: 3.6
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-27T18:29:24-04:00
summary:

[3.6] bpo-30617: IDLE: docstrings and unittest for outwin.py (GH-2046) (#3223)

Move some data and functions from the class to module level. Patch by Cheryl Sabella.
(cherry picked from commit 998f496)

files:
A Lib/idlelib/idle_test/test_outwin.py
A Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst
M Lib/idlelib/outwin.py

diff --git a/Lib/idlelib/idle_test/test_outwin.py b/Lib/idlelib/idle_test/test_outwin.py
new file mode 100644
index 00000000000..231c7bf9cfb
--- /dev/null
+++ b/Lib/idlelib/idle_test/test_outwin.py
@@ -0,0 +1,172 @@
+""" Test idlelib.outwin.
+"""
+
+import unittest
+from tkinter import Tk, Text
+from idlelib.idle_test.mock_tk import Mbox_func
+from idlelib.idle_test.mock_idle import Func
+from idlelib import outwin
+from test.support import requires
+from unittest import mock
+
+
+class OutputWindowTest(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        requires('gui')
+        root = cls.root = Tk()
+        root.withdraw()
+        w = cls.window = outwin.OutputWindow(None, None, None, root)
+        cls.text = w.text = Text(root)
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.window.close()
+        del cls.text, cls.window
+        cls.root.destroy()
+        del cls.root
+
+    def setUp(self):
+        self.text.delete('1.0', 'end')
+
+    def test_ispythonsource(self):
+        # OutputWindow overrides ispythonsource to always return False.
+        w = self.window
+        self.assertFalse(w.ispythonsource('test.txt'))
+        self.assertFalse(w.ispythonsource(__file__))
+
+    def test_window_title(self):
+        self.assertEqual(self.window.top.title(), 'Output')
+
+    def test_maybesave(self):
+        w = self.window
+        eq = self.assertEqual
+        w.get_saved = Func()
+
+        w.get_saved.result = False
+        eq(w.maybesave(), 'no')
+        eq(w.get_saved.called, 1)
+
+        w.get_saved.result = True
+        eq(w.maybesave(), 'yes')
+        eq(w.get_saved.called, 2)
+        del w.get_saved
+
+    def test_write(self):
+        eq = self.assertEqual
+        delete = self.text.delete
+        get = self.text.get
+        write = self.window.write
+
+        # Test bytes.
+        b = b'Test bytes.'
+        eq(write(b), len(b))
+        eq(get('1.0', '1.end'), b.decode())
+
+        # No new line - insert stays on same line.
+        delete('1.0', 'end')
+        test_text = 'test text'
+        eq(write(test_text), len(test_text))
+        eq(get('1.0', '1.end'), 'test text')
+        eq(get('insert linestart', 'insert lineend'), 'test text')
+
+        # New line - insert moves to next line.
+        delete('1.0', 'end')
+        test_text = 'test text\n'
+        eq(write(test_text), len(test_text))
+        eq(get('1.0', '1.end'), 'test text')
+        eq(get('insert linestart', 'insert lineend'), '')
+
+        # Text after new line is tagged for second line of Text widget.
+        delete('1.0', 'end')
+        test_text = 'test text\nLine 2'
+        eq(write(test_text), len(test_text))
+        eq(get('1.0', '1.end'), 'test text')
+        eq(get('2.0', '2.end'), 'Line 2')
+        eq(get('insert linestart', 'insert lineend'), 'Line 2')
+
+        # Test tags.
+        delete('1.0', 'end')
+        test_text = 'test text\n'
+        test_text2 = 'Line 2\n'
+        eq(write(test_text, tags='mytag'), len(test_text))
+        eq(write(test_text2, tags='secondtag'), len(test_text2))
+        eq(get('mytag.first', 'mytag.last'), test_text)
+        eq(get('secondtag.first', 'secondtag.last'), test_text2)
+        eq(get('1.0', '1.end'), test_text.rstrip('\n'))
+        eq(get('2.0', '2.end'), test_text2.rstrip('\n'))
+
+    def test_writelines(self):
+        eq = self.assertEqual
+        get = self.text.get
+        writelines = self.window.writelines
+
+        writelines(('Line 1\n', 'Line 2\n', 'Line 3\n'))
+        eq(get('1.0', '1.end'), 'Line 1')
+        eq(get('2.0', '2.end'), 'Line 2')
+        eq(get('3.0', '3.end'), 'Line 3')
+        eq(get('insert linestart', 'insert lineend'), '')
+
+    def test_goto_file_line(self):
+        eq = self.assertEqual
+        w = self.window
+        text = self.text
+
+        w.flist = mock.Mock()
+        gfl = w.flist.gotofileline = Func()
+        showerror = w.showerror = Mbox_func()
+
+        # No file/line number.
+        w.write('Not a file line')
+        self.assertIsNone(w.goto_file_line())
+        eq(gfl.called, 0)
+        eq(showerror.title, 'No special line')
+
+        # Current file/line number.
+        w.write(f'{str(__file__)}: 42: spam\n')
+        w.write(f'{str(__file__)}: 21: spam')
+        self.assertIsNone(w.goto_file_line())
+        eq(gfl.args, (str(__file__), 21))
+
+        # Previous line has file/line number.
+        text.delete('1.0', 'end')
+        w.write(f'{str(__file__)}: 42: spam\n')
+        w.write('Not a file line')
+        self.assertIsNone(w.goto_file_line())
+        eq(gfl.args, (str(__file__), 42))
+
+        del w.flist.gotofileline, w.showerror
+
+
+class ModuleFunctionTest(unittest.TestCase):
+
+    @classmethod
+    def setUp(cls):
+        outwin.file_line_progs = None
+
+    def test_compile_progs(self):
+        outwin.compile_progs()
+        for pat, regex in zip(outwin.file_line_pats, outwin.file_line_progs):
+            self.assertEqual(regex.pattern, pat)
+
+    @mock.patch('builtins.open')
+    def test_file_line_helper(self, mock_open):
+        flh = outwin.file_line_helper
+        test_lines = (
+            (r'foo file "testfile1", line 42, bar', ('testfile1', 42)),
+            (r'foo testfile2(21) bar', ('testfile2', 21)),
+            (r'  testfile3  : 42: foo bar\n', ('  testfile3  ', 42)),
+            (r'foo testfile4.py :1: ', ('foo testfile4.py ', 1)),
+            ('testfile5: \u19D4\u19D2: ', ('testfile5', 42)),
+            (r'testfile6: 42', None),       # only one `:`
+            (r'testfile7 42 text', None)    # no separators
+            )
+        for line, expected_output in test_lines:
+            self.assertEqual(flh(line), expected_output)
+            if expected_output:
+                mock_open.assert_called_with(expected_output[0], 'r')
+
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)
diff --git a/Lib/idlelib/outwin.py b/Lib/idlelib/outwin.py
index f6d2915c624..5f7c09fb92c 100644
--- a/Lib/idlelib/outwin.py
+++ b/Lib/idlelib/outwin.py
@@ -1,43 +1,113 @@
+"""Editor window that can serve as an output file.
+"""
+
 import re
 
-from tkinter import *
-import tkinter.messagebox as tkMessageBox
+from tkinter import messagebox
 
 from idlelib.editor import EditorWindow
 from idlelib import iomenu
 
 
-class OutputWindow(EditorWindow):
+file_line_pats = [
+    # order of patterns matters
+    r'file "([^"]*)", line (\d+)',
+    r'([^\s]+)\((\d+)\)',
+    r'^(\s*\S.*?):\s*(\d+):',  # Win filename, maybe starting with spaces
+    r'([^\s]+):\s*(\d+):',     # filename or path, ltrim
+    r'^\s*(\S.*?):\s*(\d+):',  # Win abs path with embedded spaces, ltrim
+]
+
+file_line_progs = None
+
+
+def compile_progs():
+    "Compile the patterns for matching to file name and line number."
+    global file_line_progs
+    file_line_progs = [re.compile(pat, re.IGNORECASE)
+                       for pat in file_line_pats]
+
 
+def file_line_helper(line):
+    """Extract file name and line number from line of text.
+
+    Check if line of text contains one of the file/line patterns.
+    If it does and if the file and line are valid, return
+    a tuple of the file name and line number.  If it doesn't match
+    or if the file or line is invalid, return None.
+    """
+    if not file_line_progs:
+        compile_progs()
+    for prog in file_line_progs:
+        match = prog.search(line)
+        if match:
+            filename, lineno = match.group(1, 2)
+            try:
+                f = open(filename, "r")
+                f.close()
+                break
+            except OSError:
+                continue
+    else:
+        return None
+    try:
+        return filename, int(lineno)
+    except TypeError:
+        return None
+
+
+class OutputWindow(EditorWindow):
     """An editor window that can serve as an output file.
 
     Also the future base class for the Python shell window.
     This class has no input facilities.
+
+    Adds binding to open a file at a line to the text widget.
     """
 
+    # Our own right-button menu
+    rmenu_specs = [
+        ("Cut", "<<cut>>", "rmenu_check_cut"),
+        ("Copy", "<<copy>>", "rmenu_check_copy"),
+        ("Paste", "<<paste>>", "rmenu_check_paste"),
+        (None, None, None),
+        ("Go to file/line", "<<goto-file-line>>", None),
+    ]
+
     def __init__(self, *args):
         EditorWindow.__init__(self, *args)
         self.text.bind("<<goto-file-line>>", self.goto_file_line)
 
     # Customize EditorWindow
-
     def ispythonsource(self, filename):
-        # No colorization needed
-        return 0
+        "Python source is only part of output: do not colorize."
+        return False
 
     def short_title(self):
+        "Customize EditorWindow title."
         return "Output"
 
     def maybesave(self):
-        # Override base class method -- don't ask any questions
-        if self.get_saved():
-            return "yes"
-        else:
-            return "no"
+        "Customize EditorWindow to not display save file messagebox."
+        return 'yes' if self.get_saved() else 'no'
 
     # Act as output file
-
     def write(self, s, tags=(), mark="insert"):
+        """Write text to text widget.
+
+        The text is inserted at the given index with the provided
+        tags.  The text widget is then scrolled to make it visible
+        and updated to display it, giving the effect of seeing each
+        line as it is added.
+
+        Args:
+            s: Text to insert into text widget.
+            tags: Tuple of tag strings to apply on the insert.
+            mark: Index for the insert.
+
+        Return:
+            Length of text inserted.
+        """
         if isinstance(s, (bytes, bytes)):
             s = s.decode(iomenu.encoding, "replace")
         self.text.insert(mark, s, tags)
@@ -46,80 +116,46 @@ def write(self, s, tags=(), mark="insert"):
         return len(s)
 
     def writelines(self, lines):
+        "Write each item in lines iterable."
         for line in lines:
             self.write(line)
 
     def flush(self):
+        "No flushing needed as write() directly writes to widget."
         pass
 
-    # Our own right-button menu
-
-    rmenu_specs = [
-        ("Cut", "<<cut>>", "rmenu_check_cut"),
-        ("Copy", "<<copy>>", "rmenu_check_copy"),
-        ("Paste", "<<paste>>", "rmenu_check_paste"),
-        (None, None, None),
-        ("Go to file/line", "<<goto-file-line>>", None),
-    ]
+    def showerror(self, *args, **kwargs):
+        messagebox.showerror(*args, **kwargs)
 
-    file_line_pats = [
-        # order of patterns matters
-        r'file "([^"]*)", line (\d+)',
-        r'([^\s]+)\((\d+)\)',
-        r'^(\s*\S.*?):\s*(\d+):',  # Win filename, maybe starting with spaces
-        r'([^\s]+):\s*(\d+):',     # filename or path, ltrim
-        r'^\s*(\S.*?):\s*(\d+):',  # Win abs path with embedded spaces, ltrim
-    ]
+    def goto_file_line(self, event=None):
+        """Handle request to open file/line.
 
-    file_line_progs = None
+        If the selected or previous line in the output window
+        contains a file name and line number, then open that file
+        name in a new window and position on the line number.
 
-    def goto_file_line(self, event=None):
-        if self.file_line_progs is None:
-            l = []
-            for pat in self.file_line_pats:
-                l.append(re.compile(pat, re.IGNORECASE))
-            self.file_line_progs = l
-        # x, y = self.event.x, self.event.y
-        # self.text.mark_set("insert", "@%d,%d" % (x, y))
+        Otherwise, display an error messagebox.
+        """
         line = self.text.get("insert linestart", "insert lineend")
-        result = self._file_line_helper(line)
+        result = file_line_helper(line)
         if not result:
             # Try the previous line.  This is handy e.g. in tracebacks,
             # where you tend to right-click on the displayed source line
             line = self.text.get("insert -1line linestart",
                                  "insert -1line lineend")
-            result = self._file_line_helper(line)
+            result = file_line_helper(line)
             if not result:
-                tkMessageBox.showerror(
+                self.showerror(
                     "No special line",
                     "The line you point at doesn't look like "
                     "a valid file name followed by a line number.",
                     parent=self.text)
                 return
         filename, lineno = result
-        edit = self.flist.open(filename)
-        edit.gotoline(lineno)
-
-    def _file_line_helper(self, line):
-        for prog in self.file_line_progs:
-            match = prog.search(line)
-            if match:
-                filename, lineno = match.group(1, 2)
-                try:
-                    f = open(filename, "r")
-                    f.close()
-                    break
-                except OSError:
-                    continue
-        else:
-            return None
-        try:
-            return filename, int(lineno)
-        except TypeError:
-            return None
+        self.flist.gotofileline(filename, lineno)
 
-# These classes are currently not used but might come in handy
 
+# These classes are currently not used but might come in handy
 class OnDemandOutputWindow:
 
     tagdefs = {
@@ -145,3 +181,7 @@ def setup(self):
                 text.tag_configure(tag, **cnf)
         text.tag_raise('sel')
         self.write = self.owin.write
+
+if __name__ == '__main__':
+    import unittest
+    unittest.main('idlelib.idle_test.test_outwin', verbosity=2, exit=False)
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst b/Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst
new file mode 100644
index 00000000000..262674c32dc
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst
@@ -0,0 +1,4 @@
+IDLE - Add docstrings and tests for outwin subclass of editor.
+
+Move some data and functions from the class to module level. Patch by Cheryl
+Sabella.


From webhook-mailer at python.org  Mon Aug 28 01:41:22 2017
From: webhook-mailer at python.org (Mariatta)
Date: Mon, 28 Aug 2017 05:41:22 -0000
Subject: [Python-checkins] bpo-26656: Improve re.compile documentation
 (GH-3211)
Message-ID: <mailman.123.1503898883.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/ed94a8b2851914bcda3a77b28b25517b8baa91e6
commit: ed94a8b2851914bcda3a77b28b25517b8baa91e6
branch: master
author: Henk-Jaap Wagenaar <wagenaarhenkjaap at gmail.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-08-27T22:41:20-07:00
summary:

bpo-26656: Improve re.compile documentation (GH-3211)

- Link to the regular expressions object documentation
- Clarify that it can be used with more than the two methods currently stated.

files:
M Doc/library/re.rst

diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index 0b9d9755f30..138e7d87996 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -490,9 +490,10 @@ form.
 
 .. function:: compile(pattern, flags=0)
 
-   Compile a regular expression pattern into a regular expression object, which
-   can be used for matching using its :func:`~regex.match` and
-   :func:`~regex.search` methods, described below.
+   Compile a regular expression pattern into a :ref:`regular expression object
+   <re-objects>`, which can be used for matching using its
+   :func:`~regex.match`, :func:`~regex.search` and other methods, described
+   below.
 
    The expression's behaviour can be modified by specifying a *flags* value.
    Values can be any of the following variables, combined using bitwise OR (the


From webhook-mailer at python.org  Mon Aug 28 01:50:10 2017
From: webhook-mailer at python.org (Mariatta)
Date: Mon, 28 Aug 2017 05:50:10 -0000
Subject: [Python-checkins] [3.6] bpo-26656: Improve re.compile documentation
 (GH-3211) (GH-3225)
Message-ID: <mailman.124.1503899417.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/83e5c888fff2bf3663952b2bfd3a3ee6c20386ef
commit: 83e5c888fff2bf3663952b2bfd3a3ee6c20386ef
branch: 3.6
author: Mariatta <Mariatta at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-08-27T22:50:08-07:00
summary:

[3.6] bpo-26656: Improve re.compile documentation (GH-3211) (GH-3225)

- Link to the regular expressions object documentation
- Clarify that it can be used with more than the two methods currently stated.
(cherry picked from commit ed94a8b2851914bcda3a77b28b25517b8baa91e6)

files:
M Doc/library/re.rst

diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index 5ae304d25e1..7a51abdc983 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -490,9 +490,10 @@ form.
 
 .. function:: compile(pattern, flags=0)
 
-   Compile a regular expression pattern into a regular expression object, which
-   can be used for matching using its :func:`~regex.match` and
-   :func:`~regex.search` methods, described below.
+   Compile a regular expression pattern into a :ref:`regular expression object
+   <re-objects>`, which can be used for matching using its
+   :func:`~regex.match`, :func:`~regex.search` and other methods, described
+   below.
 
    The expression's behaviour can be modified by specifying a *flags* value.
    Values can be any of the following variables, combined using bitwise OR (the


From webhook-mailer at python.org  Mon Aug 28 04:32:49 2017
From: webhook-mailer at python.org (Christian Heimes)
Date: Mon, 28 Aug 2017 08:32:49 -0000
Subject: [Python-checkins] bpo-30987 - Support for ISO-TP protocol in
 SocketCAN (#2956)
Message-ID: <mailman.125.1503909171.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/a30f6d45ac3e72761b96a8df0527182029eaee24
commit: a30f6d45ac3e72761b96a8df0527182029eaee24
branch: master
author: Pier-Yves Lessard <py.lessard at gmail.com>
committer: Christian Heimes <christian at python.org>
date: 2017-08-28T10:32:44+02:00
summary:

bpo-30987 - Support for ISO-TP protocol in SocketCAN (#2956)

* Added support for CAN_ISOTP protocol

* Added unit tests for CAN ISOTP

* Updated documentation for ISO-TP protocol

* Removed trailing whitespace in documentation

* Added blurb NEWS.d file

* updated Misc/ACKS

* Fixed broken unit test that was using isotp const outside of skippable section

* Removed dependecy over third party project

* Added implementation for getsockname + unit tests

* Missing newline at end of ACKS file

* Accidentally inserted a type in ACKS file

* Followed tiran changes review #1 recommendations

* Added spaces after comma

files:
A Misc/NEWS.d/next/Library/2017-07-30-22-00-12.bpo-30987.228rW0.rst
M Doc/library/socket.rst
M Lib/test/test_socket.py
M Misc/ACKS
M Modules/socketmodule.c

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 8af6bc5439b..c5064e92c21 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -103,6 +103,10 @@ created.  Socket addresses are represented as follows:
   ``'can0'``. The network interface name ``''`` can be used to receive packets
   from all network interfaces of this family.
 
+  - :const:`CAN_ISOTP` protocol require a tuple ``(interface, rx_addr, tx_addr)``
+    where both additional parameters are unsigned long integer that represent a
+    CAN identifier (standard or extended).
+
 - A string or a tuple ``(id, unit)`` is used for the :const:`SYSPROTO_CONTROL`
   protocol of the :const:`PF_SYSTEM` family. The string is the name of a
   kernel control using a dynamically-assigned ID. The tuple can be used if ID
@@ -341,6 +345,16 @@ Constants
 
    .. versionadded:: 3.5
 
+.. data:: CAN_ISOTP
+
+   CAN_ISOTP, in the CAN protocol family, is the ISO-TP (ISO 15765-2) protocol.
+   ISO-TP constants, documented in the Linux documentation.
+
+   Availability: Linux >= 2.6.25
+
+   .. versionadded:: 3.7
+
+
 .. data:: AF_RDS
           PF_RDS
           SOL_RDS
@@ -427,7 +441,7 @@ The following functions all create :ref:`socket objects <socket-objects>`.
    :const:`SOCK_DGRAM`, :const:`SOCK_RAW` or perhaps one of the other ``SOCK_``
    constants. The protocol number is usually zero and may be omitted or in the
    case where the address family is :const:`AF_CAN` the protocol should be one
-   of :const:`CAN_RAW` or :const:`CAN_BCM`.  If *fileno* is specified, the other
+   of :const:`CAN_RAW`, :const:`CAN_BCM` or :const:`CAN_ISOTP`.  If *fileno* is specified, the other
    arguments are ignored, causing the socket with the specified file descriptor
    to return.  Unlike :func:`socket.fromfd`, *fileno* will return the same
    socket and not a duplicate. This may help close a detached socket using
@@ -445,6 +459,8 @@ The following functions all create :ref:`socket objects <socket-objects>`.
    .. versionchanged:: 3.4
       The returned socket is now non-inheritable.
 
+   .. versionchanged:: 3.7
+       The CAN_ISOTP protocol was added.
 
 .. function:: socketpair([family[, type[, proto]]])
 
@@ -1661,7 +1677,7 @@ the interface::
    # disabled promiscuous mode
    s.ioctl(socket.SIO_RCVALL, socket.RCVALL_OFF)
 
-The last example shows how to use the socket interface to communicate to a CAN
+The next example shows how to use the socket interface to communicate to a CAN
 network using the raw socket protocol. To use CAN with the broadcast
 manager protocol instead, open a socket with::
 
@@ -1671,7 +1687,7 @@ After binding (:const:`CAN_RAW`) or connecting (:const:`CAN_BCM`) the socket, yo
 can use the :meth:`socket.send`, and the :meth:`socket.recv` operations (and
 their counterparts) on the socket object as usual.
 
-This example might require special privileges::
+This last example might require special privileges::
 
    import socket
    import struct
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index f28f7d6816e..84234887747 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -55,6 +55,16 @@ def _have_socket_can():
         s.close()
     return True
 
+def _have_socket_can_isotp():
+    """Check whether CAN ISOTP sockets are supported on this host."""
+    try:
+        s = socket.socket(socket.PF_CAN, socket.SOCK_DGRAM, socket.CAN_ISOTP)
+    except (AttributeError, OSError):
+        return False
+    else:
+        s.close()
+    return True
+
 def _have_socket_rds():
     """Check whether RDS sockets are supported on this host."""
     try:
@@ -77,6 +87,8 @@ def _have_socket_alg():
 
 HAVE_SOCKET_CAN = _have_socket_can()
 
+HAVE_SOCKET_CAN_ISOTP = _have_socket_can_isotp()
+
 HAVE_SOCKET_RDS = _have_socket_rds()
 
 HAVE_SOCKET_ALG = _have_socket_alg()
@@ -1709,6 +1721,49 @@ def testBCM(self):
         self.assertEqual(bytes_sent, len(header_plus_frame))
 
 
+ at unittest.skipUnless(HAVE_SOCKET_CAN_ISOTP, 'CAN ISOTP required for this test.')
+class ISOTPTest(unittest.TestCase):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.interface = "vcan0"
+
+    def testCrucialConstants(self):
+        socket.AF_CAN
+        socket.PF_CAN
+        socket.CAN_ISOTP
+        socket.SOCK_DGRAM
+
+    def testCreateSocket(self):
+        with socket.socket(socket.PF_CAN, socket.SOCK_RAW, socket.CAN_RAW) as s:
+            pass
+
+    @unittest.skipUnless(hasattr(socket, "CAN_ISOTP"),
+                         'socket.CAN_ISOTP required for this test.')
+    def testCreateISOTPSocket(self):
+        with socket.socket(socket.PF_CAN, socket.SOCK_DGRAM, socket.CAN_ISOTP) as s:
+            pass
+
+    def testTooLongInterfaceName(self):
+        # most systems limit IFNAMSIZ to 16, take 1024 to be sure
+        with socket.socket(socket.PF_CAN, socket.SOCK_DGRAM, socket.CAN_ISOTP) as s:
+            with self.assertRaisesRegex(OSError, 'interface name too long'):
+                s.bind(('x' * 1024, 1, 2))
+
+    def testBind(self):
+        try:
+            with socket.socket(socket.PF_CAN, socket.SOCK_DGRAM, socket.CAN_ISOTP) as s:
+                addr = self.interface, 0x123, 0x456
+                s.bind(addr)
+                self.assertEqual(s.getsockname(), addr)
+        except OSError as e:
+            if e.errno == errno.ENODEV:
+                self.skipTest('network interface `%s` does not exist' %
+                           self.interface)
+            else:
+                raise
+
+
 @unittest.skipUnless(HAVE_SOCKET_RDS, 'RDS sockets required for this test.')
 class BasicRDSTest(unittest.TestCase):
 
diff --git a/Misc/ACKS b/Misc/ACKS
index b2e05920489..91e04246f73 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -908,6 +908,7 @@ John Lenton
 Kostyantyn Leschenko
 Benno Leslie
 Christopher Tur Lesniewski-Laas
+Pier-Yves Lessard
 Alain Leufroy
 Mark Levinson
 Mark Levitt
diff --git a/Misc/NEWS.d/next/Library/2017-07-30-22-00-12.bpo-30987.228rW0.rst b/Misc/NEWS.d/next/Library/2017-07-30-22-00-12.bpo-30987.228rW0.rst
new file mode 100644
index 00000000000..de30ea8850c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-07-30-22-00-12.bpo-30987.228rW0.rst
@@ -0,0 +1 @@
+Added support for CAN ISO-TP protocol in the socket module.
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index bf8d19fe2f4..beadecfad50 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1373,9 +1373,22 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)
                 ifname = ifr.ifr_name;
         }
 
-        return Py_BuildValue("O&h", PyUnicode_DecodeFSDefault,
-                                    ifname,
-                                    a->can_family);
+        switch (proto) {
+#ifdef CAN_ISOTP
+          case CAN_ISOTP:
+          {
+              return Py_BuildValue("O&kk", PyUnicode_DecodeFSDefault,
+                                          ifname,
+                                          a->can_addr.tp.rx_id,
+                                          a->can_addr.tp.tx_id);
+          }
+#endif
+          default:
+          {
+              return Py_BuildValue("O&", PyUnicode_DecodeFSDefault,
+                                        ifname);
+          }
+        }
     }
 #endif
 
@@ -1869,7 +1882,9 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
     }
 #endif
 
-#if defined(AF_CAN) && defined(CAN_RAW) && defined(CAN_BCM)
+#ifdef AF_CAN
+
+#if defined(CAN_RAW) && defined(CAN_BCM)
     case AF_CAN:
         switch (s->sock_proto) {
         case CAN_RAW:
@@ -1880,7 +1895,6 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
             PyObject *interfaceName;
             struct ifreq ifr;
             Py_ssize_t len;
-
             addr = (struct sockaddr_can *)addr_ret;
 
             if (!PyArg_ParseTuple(args, "O&", PyUnicode_FSConverter,
@@ -1913,6 +1927,54 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
             Py_DECREF(interfaceName);
             return 1;
         }
+#endif
+
+#ifdef CAN_ISOTP
+        case CAN_ISOTP:
+        {
+            struct sockaddr_can *addr;
+            PyObject *interfaceName;
+            struct ifreq ifr;
+            Py_ssize_t len;
+            unsigned long int rx_id, tx_id;
+
+            addr = (struct sockaddr_can *)addr_ret;
+
+            if (!PyArg_ParseTuple(args, "O&kk", PyUnicode_FSConverter,
+                                              &interfaceName,
+                                              &rx_id,
+                                              &tx_id))
+                return 0;
+
+            len = PyBytes_GET_SIZE(interfaceName);
+
+            if (len == 0) {
+                ifr.ifr_ifindex = 0;
+            } else if ((size_t)len < sizeof(ifr.ifr_name)) {
+                strncpy(ifr.ifr_name, PyBytes_AS_STRING(interfaceName), sizeof(ifr.ifr_name));
+                ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
+                if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
+                    s->errorhandler();
+                    Py_DECREF(interfaceName);
+                    return 0;
+                }
+            } else {
+                PyErr_SetString(PyExc_OSError,
+                                "AF_CAN interface name too long");
+                Py_DECREF(interfaceName);
+                return 0;
+            }
+
+            addr->can_family = AF_CAN;
+            addr->can_ifindex = ifr.ifr_ifindex;
+            addr->can_addr.tp.rx_id = rx_id;
+            addr->can_addr.tp.tx_id = tx_id;
+
+            *len_ret = sizeof(*addr);
+            Py_DECREF(interfaceName);
+            return 1;
+        }
+#endif
         default:
             PyErr_SetString(PyExc_OSError,
                             "getsockaddrarg: unsupported CAN protocol");
@@ -6995,6 +7057,9 @@ PyInit__socket(void)
     PyModule_AddIntMacro(m, CAN_SFF_MASK);
     PyModule_AddIntMacro(m, CAN_EFF_MASK);
     PyModule_AddIntMacro(m, CAN_ERR_MASK);
+#ifdef CAN_ISOTP
+    PyModule_AddIntMacro(m, CAN_ISOTP);
+#endif
 #endif
 #ifdef HAVE_LINUX_CAN_RAW_H
     PyModule_AddIntMacro(m, CAN_RAW_FILTER);


From solipsis at pitrou.net  Mon Aug 28 05:04:33 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 28 Aug 2017 09:04:33 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=8
Message-ID: <20170828090431.91276.B8FE0430D0D1604D@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [-7, 1, 7] memory blocks, sum=1
test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_fork leaked [2, -2, 3] memory blocks, sum=3
test_multiprocessing_spawn leaked [-1, 2, -1] memory blocks, sum=0


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogYqpaHs', '--timeout', '7200']

From webhook-mailer at python.org  Mon Aug 28 08:08:54 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Mon, 28 Aug 2017 12:08:54 -0000
Subject: [Python-checkins] bpo-10746: Fix ctypes PEP 3118 type codes for
 c_long, c_bool, c_int (#31)
Message-ID: <mailman.126.1503922137.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/07f1658aa09f6798793c473c72b2951b7fefe220
commit: 07f1658aa09f6798793c473c72b2951b7fefe220
branch: master
author: Pauli Virtanen <pav at iki.fi>
committer: Antoine Pitrou <pitrou at free.fr>
date: 2017-08-28T14:08:49+02:00
summary:

bpo-10746: Fix ctypes PEP 3118 type codes for c_long, c_bool, c_int (#31)

Ctypes currently produces wrong pep3118 type codes for several types.
E.g. memoryview(ctypes.c_long()).format gives "<l" on 64-bit platforms,
but it should be "<q" instead for sizeof(c_long) == 8

The problem is that the '<>' endian specification in the struct syntax
also turns on the "standard size" mode, which makes type characters have
a platform-independent meaning, which does not match with the codes used
internally in ctypes.  The struct module format syntax also does not
allow specifying native-size non-native-endian items.

This commit adds a converter function that maps the internal ctypes
codes to appropriate struct module standard-size codes in the pep3118
format strings. The tests are modified to check for this.

files:
A Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst
M Lib/ctypes/test/test_pep3118.py
M Modules/_ctypes/_ctypes.c

diff --git a/Lib/ctypes/test/test_pep3118.py b/Lib/ctypes/test/test_pep3118.py
index d68397ea802..f3c0e23e53e 100644
--- a/Lib/ctypes/test/test_pep3118.py
+++ b/Lib/ctypes/test/test_pep3118.py
@@ -112,6 +112,34 @@ class Complete(Structure):
 # This table contains format strings as they look on little endian
 # machines.  The test replaces '<' with '>' on big endian machines.
 #
+
+# Platform-specific type codes
+s_bool = {1: '?', 2: 'H', 4: 'L', 8: 'Q'}[sizeof(c_bool)]
+s_short = {2: 'h', 4: 'l', 8: 'q'}[sizeof(c_short)]
+s_ushort = {2: 'H', 4: 'L', 8: 'Q'}[sizeof(c_ushort)]
+s_int = {2: 'h', 4: 'i', 8: 'q'}[sizeof(c_int)]
+s_uint = {2: 'H', 4: 'I', 8: 'Q'}[sizeof(c_uint)]
+s_long = {4: 'l', 8: 'q'}[sizeof(c_long)]
+s_ulong = {4: 'L', 8: 'Q'}[sizeof(c_ulong)]
+s_longlong = "q"
+s_ulonglong = "Q"
+s_float = "f"
+s_double = "d"
+s_longdouble = "g"
+
+# Alias definitions in ctypes/__init__.py
+if c_int is c_long:
+    s_int = s_long
+if c_uint is c_ulong:
+    s_uint = s_ulong
+if c_longlong is c_long:
+    s_longlong = s_long
+if c_ulonglong is c_ulong:
+    s_ulonglong = s_ulong
+if c_longdouble is c_double:
+    s_longdouble = s_double
+
+
 native_types = [
     # type                      format                  shape           calc itemsize
 
@@ -120,52 +148,51 @@ class Complete(Structure):
     (c_char,                    "<c",                   (),           c_char),
     (c_byte,                    "<b",                   (),           c_byte),
     (c_ubyte,                   "<B",                   (),           c_ubyte),
-    (c_short,                   "<h",                   (),           c_short),
-    (c_ushort,                  "<H",                   (),           c_ushort),
+    (c_short,                   "<" + s_short,          (),           c_short),
+    (c_ushort,                  "<" + s_ushort,         (),           c_ushort),
 
-    # c_int and c_uint may be aliases to c_long
-    #(c_int,                     "<i",                   (),           c_int),
-    #(c_uint,                    "<I",                   (),           c_uint),
+    (c_int,                     "<" + s_int,            (),           c_int),
+    (c_uint,                    "<" + s_uint,           (),           c_uint),
 
-    (c_long,                    "<l",                   (),           c_long),
-    (c_ulong,                   "<L",                   (),           c_ulong),
+    (c_long,                    "<" + s_long,           (),           c_long),
+    (c_ulong,                   "<" + s_ulong,          (),           c_ulong),
 
-    # c_longlong and c_ulonglong are aliases on 64-bit platforms
-    #(c_longlong,                "<q",                   None,           c_longlong),
-    #(c_ulonglong,               "<Q",                   None,           c_ulonglong),
+    (c_longlong,                "<" + s_longlong,       (),           c_longlong),
+    (c_ulonglong,               "<" + s_ulonglong,      (),           c_ulonglong),
 
     (c_float,                   "<f",                   (),           c_float),
     (c_double,                  "<d",                   (),           c_double),
-    # c_longdouble may be an alias to c_double
 
-    (c_bool,                    "<?",                   (),           c_bool),
+    (c_longdouble,              "<" + s_longdouble,     (),           c_longdouble),
+
+    (c_bool,                    "<" + s_bool,           (),           c_bool),
     (py_object,                 "<O",                   (),           py_object),
 
     ## pointers
 
     (POINTER(c_byte),           "&<b",                  (),           POINTER(c_byte)),
-    (POINTER(POINTER(c_long)),  "&&<l",                 (),           POINTER(POINTER(c_long))),
+    (POINTER(POINTER(c_long)),  "&&<" + s_long,         (),           POINTER(POINTER(c_long))),
 
     ## arrays and pointers
 
     (c_double * 4,              "<d",                   (4,),           c_double),
     (c_float * 4 * 3 * 2,       "<f",                   (2,3,4),        c_float),
-    (POINTER(c_short) * 2,      "&<h",                  (2,),           POINTER(c_short)),
-    (POINTER(c_short) * 2 * 3,  "&<h",                  (3,2,),         POINTER(c_short)),
-    (POINTER(c_short * 2),      "&(2)<h",               (),           POINTER(c_short)),
+    (POINTER(c_short) * 2,      "&<" + s_short,         (2,),           POINTER(c_short)),
+    (POINTER(c_short) * 2 * 3,  "&<" + s_short,         (3,2,),         POINTER(c_short)),
+    (POINTER(c_short * 2),      "&(2)<" + s_short,      (),             POINTER(c_short)),
 
     ## structures and unions
 
-    (Point,                     "T{<l:x:<l:y:}",        (),           Point),
+    (Point,                     "T{<l:x:<l:y:}".replace('l', s_long),  (),  Point),
     # packed structures do not implement the pep
-    (PackedPoint,               "B",                    (),           PackedPoint),
-    (Point2,                    "T{<l:x:<l:y:}",        (),           Point2),
-    (EmptyStruct,               "T{}",                  (),           EmptyStruct),
+    (PackedPoint,               "B",                                   (),  PackedPoint),
+    (Point2,                    "T{<l:x:<l:y:}".replace('l', s_long),  (),  Point2),
+    (EmptyStruct,               "T{}",                                 (),  EmptyStruct),
     # the pep does't support unions
-    (aUnion,                    "B",                    (),           aUnion),
+    (aUnion,                    "B",                                   (),  aUnion),
     # structure with sub-arrays
-    (StructWithArrays,          "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}", (),  StructWithArrays),
-    (StructWithArrays * 3,      "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}", (3,),  StructWithArrays),
+    (StructWithArrays, "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}".replace('l', s_long), (), StructWithArrays),
+    (StructWithArrays * 3, "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}".replace('l', s_long), (3,), StructWithArrays),
 
     ## pointer to incomplete structure
     (Incomplete,                "B",                    (),           Incomplete),
@@ -173,7 +200,7 @@ class Complete(Structure):
 
     # 'Complete' is a structure that starts incomplete, but is completed after the
     # pointer type to it has been created.
-    (Complete,                  "T{<l:a:}",             (),           Complete),
+    (Complete,                  "T{<l:a:}".replace('l', s_long), (), Complete),
     # Unfortunately the pointer format string is not fixed...
     (POINTER(Complete),         "&B",                   (),           POINTER(Complete)),
 
@@ -196,10 +223,10 @@ class LEPoint(LittleEndianStructure):
 # and little endian machines.
 #
 endian_types = [
-    (BEPoint,                   "T{>l:x:>l:y:}",        (),           BEPoint),
-    (LEPoint,                   "T{<l:x:<l:y:}",        (),           LEPoint),
-    (POINTER(BEPoint),          "&T{>l:x:>l:y:}",       (),           POINTER(BEPoint)),
-    (POINTER(LEPoint),          "&T{<l:x:<l:y:}",       (),           POINTER(LEPoint)),
+    (BEPoint, "T{>l:x:>l:y:}".replace('l', s_long), (), BEPoint),
+    (LEPoint, "T{<l:x:<l:y:}".replace('l', s_long), (), LEPoint),
+    (POINTER(BEPoint), "&T{>l:x:>l:y:}".replace('l', s_long), (), POINTER(BEPoint)),
+    (POINTER(LEPoint), "&T{<l:x:<l:y:}".replace('l', s_long), (), POINTER(LEPoint)),
     ]
 
 if __name__ == "__main__":
diff --git a/Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst b/Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst
new file mode 100644
index 00000000000..e7625631002
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst
@@ -0,0 +1 @@
+Fix ctypes producing wrong PEP 3118 type codes for integer types.
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 0bcfc13ad02..0255f76b8a0 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -249,6 +249,71 @@ PyDict_GetItemProxy(PyObject *dict, PyObject *key)
 }
 
 /******************************************************************/
+
+/*
+  Allocate a memory block for a pep3118 format string, filled with
+  a suitable PEP 3118 type code corresponding to the given ctypes
+  type. Returns NULL on failure, with the error indicator set.
+
+  This produces type codes in the standard size mode (cf. struct module),
+  since the endianness may need to be swapped to a non-native one
+  later on.
+ */
+static char *
+_ctypes_alloc_format_string_for_type(char code, int big_endian)
+{
+    char *result;
+    char pep_code = '\0';
+
+    switch (code) {
+#if SIZEOF_INT == 2
+    case 'i': pep_code = 'h'; break;
+    case 'I': pep_code = 'H'; break;
+#elif SIZEOF_INT == 4
+    case 'i': pep_code = 'i'; break;
+    case 'I': pep_code = 'I'; break;
+#elif SIZEOF_INT == 8
+    case 'i': pep_code = 'q'; break;
+    case 'I': pep_code = 'Q'; break;
+#else
+# error SIZEOF_INT has an unexpected value
+#endif /* SIZEOF_INT */
+#if SIZEOF_LONG == 4
+    case 'l': pep_code = 'l'; break;
+    case 'L': pep_code = 'L'; break;
+#elif SIZEOF_LONG == 8
+    case 'l': pep_code = 'q'; break;
+    case 'L': pep_code = 'Q'; break;
+#else
+# error SIZEOF_LONG has an unexpected value
+#endif /* SIZEOF_LONG */
+#if SIZEOF__BOOL == 1
+    case '?': pep_code = '?'; break;
+#elif SIZEOF__BOOL == 2
+    case '?': pep_code = 'H'; break;
+#elif SIZEOF__BOOL == 4
+    case '?': pep_code = 'L'; break;
+#elif SIZEOF__BOOL == 8
+    case '?': pep_code = 'Q'; break;
+#else
+# error SIZEOF__BOOL has an unexpected value
+#endif /* SIZEOF__BOOL */
+    default:
+        /* The standard-size code is the same as the ctypes one */
+        pep_code = code;
+        break;
+    }
+
+    result = PyMem_Malloc(3);
+    if (result == NULL)
+        return NULL;
+
+    result[0] = big_endian ? '>' : '<';
+    result[1] = pep_code;
+    result[2] = '\0';
+    return result;
+}
+
 /*
   Allocate a memory block for a pep3118 format string, copy prefix (if
   non-null) and suffix into it.  Returns NULL on failure, with the error
@@ -1930,9 +1995,9 @@ PyCSimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     stgdict->setfunc = fmt->setfunc;
     stgdict->getfunc = fmt->getfunc;
 #ifdef WORDS_BIGENDIAN
-    stgdict->format = _ctypes_alloc_format_string(">", proto_str);
+    stgdict->format = _ctypes_alloc_format_string_for_type(proto_str[0], 1);
 #else
-    stgdict->format = _ctypes_alloc_format_string("<", proto_str);
+    stgdict->format = _ctypes_alloc_format_string_for_type(proto_str[0], 0);
 #endif
     if (stgdict->format == NULL) {
         Py_DECREF(result);


From webhook-mailer at python.org  Mon Aug 28 16:43:29 2017
From: webhook-mailer at python.org (Gregory P. Smith)
Date: Mon, 28 Aug 2017 20:43:29 -0000
Subject: [Python-checkins] Fix a typo in the Programming FAQ. (#3230)
Message-ID: <mailman.127.1503953010.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/e9d978fd1bc122395efc91a82b16b2c4b968441d
commit: e9d978fd1bc122395efc91a82b16b2c4b968441d
branch: master
author: Gregory P. Smith <greg at krypto.org>
committer: GitHub <noreply at github.com>
date: 2017-08-28T13:43:26-07:00
summary:

Fix a typo in the Programming FAQ. (#3230)

subobjects, not subobjecs.

files:
M Doc/faq/programming.rst

diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index d9bdb21e79a..1022373d387 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -1638,7 +1638,7 @@ collected.
 
 Despite the cycle collector, it's still a good idea to define an explicit
 ``close()`` method on objects to be called whenever you're done with them.  The
-``close()`` method can then remove attributes that refer to subobjecs.  Don't
+``close()`` method can then remove attributes that refer to subobjects.  Don't
 call :meth:`__del__` directly -- :meth:`__del__` should call ``close()`` and
 ``close()`` should make sure that it can be called more than once for the same
 object.


From lp_benchmark_robot at intel.com  Mon Aug 28 19:37:55 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Mon, 28 Aug 2017 16:37:55 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-28
Message-ID: <99f969c4-bb3a-4c52-a828-2dd8bdcb99a9@orsmsx156.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-28 03:04:26-07:00.
  - commit:		a30f6d4
  - previous commit:	a3a6df3
  - revision date:	2017-08-28 10:32:44+02:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.103% |  -0.086%   |  +3.212%   |  +8.151%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 0.646% |  -1.848%   |  +22.948%  |  +9.529%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 0.853% |  -1.144%   |  +23.850%  |  +8.296%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.543% |  -1.331%   |  +22.061%  |  +8.033%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.526% |  +0.740%   |  +2.954%   |  +16.849%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.641% |  +0.450%   |  +11.860%  |  +7.447%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.942% |  +0.235%   |  +5.901%   |  +9.293%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.583% |  -0.431%   |  +3.204%   |  +5.955%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.124% |  +0.231%   |  +6.467%   |  +19.317%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.790% |  -2.140%   |  +4.727%   |  +16.331%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.146% |  -0.479%   |  +3.244%   |  +8.244%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 2.058% |  -0.351%   |  +5.015%   |  +3.450%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.710% |  -0.009%   |  +3.494%   |  +6.087%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.471% |  -0.437%   |  +7.755%   |  +11.580%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.804% |  -0.924%   |  +5.241%   |  +9.555%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.688% |  -0.113%   |  +6.171%   |  +10.819%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.496% |  +0.733%   |  +9.425%   |  +10.816%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.420% |  -2.011%   |  +4.744%   |  +12.947%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 2.540% |  -1.525%   |  +3.460%   |  +9.889%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 4.819% |  -0.206%   |  +1.114%   |  +11.089%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.647% |  -0.980%   |  +4.355%   |  +12.401%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.280% |  -0.219%   |  +46.754%  |  +11.515%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.727% |  -2.651%   |  +5.076%   |  +13.817%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.691% |  -0.486%   |  +19.003%  |  +10.964%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 6.200% |  +0.826%   |  +5.666%   |  +13.583%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.846% |  +0.545%   |  +4.421%   |  +4.326%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.974% |  +0.583%   |  -3.915%   |  +6.609%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.535% |  +1.327%   |  +3.084%   |  +5.926%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.311% |  -3.296%   |  -0.566%   |  +13.762%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 2.126% |  -0.515%   |  -0.653%   |  +24.779%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.165% |  +0.854%   |  +2.487%   |  +18.406%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.865% |  +0.360%   |  +6.628%   |  +17.938%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 6.455% |  -2.035%   |  +9.922%   |  +10.475%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.384% |  -0.051%   |  +0.347%   |  +10.109%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.149% |  -0.230%   |  +8.237%   |  +5.558%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.102% |  -0.182%   |  +0.355%   |  +5.163%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.241% |  -0.391%   |  +8.286%   |  +12.425%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.608% |  -1.237%   |  -8.398%   |  +10.135%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 1.345% |  +0.496%   |  +2.249%   |  +8.644%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.166% |  +0.044%   |  +0.267%   |  +0.686%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 0.623% |  +0.920%   |  +11.985%  |  +4.325%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 2.594% |  -0.615%   |  +7.387%   |  +14.573%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 1.470% |  +0.270%   |  +1.068%   |  +3.857%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 2.258% |  -1.674%   |  +25.528%  |  +10.676%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.275% |  -2.086%   |  +3.097%   |  +7.086%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.798% |  -0.562%   |  +14.366%  |  +7.368%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 0.436% |  +0.444%   |  +1.086%   |  +1.227%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.673% |  -0.299%   |  +5.317%   |  +3.214%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.449% |  -0.454%   |  +4.434%   |  +6.923%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.983% |  -0.277%   |  +4.343%   |  +6.475%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 3.611% |  -4.183%   |  -5.067%   |  +15.390%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.240% |  -0.448%   |  +11.291%  |  +8.149%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.441% |  -0.830%   |  +9.296%   |  +7.239%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.832% |  -0.100%   |  +11.078%  |  +9.484%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.407% |  -1.833%   |  +11.797%  |  +9.417%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 4.583% |  -2.424%   |  +20.938%  |  +10.012%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.032% |  -0.862%   |  +4.735%   |  +6.139%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 0.801% |  +0.459%   |  +2.744%   |  -0.410%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 7.237% |  +1.946%   |  +9.076%   |  +20.647%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.986% |  -0.580%   |  -2.609%   |  +19.161%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 1.342% |  +0.477%   |  +6.363%   |  +6.394%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.236% |  +0.364%   |  +5.938%   |  +8.433%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.174% |  +1.224%   |  +3.499%   |  +4.845%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 1.080% |  +0.847%   |  -4.323%   |  +8.926%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.302% |  -0.333%   |  +6.741%   |  +8.649%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-28

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Tue Aug 29 04:58:34 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 29 Aug 2017 08:58:34 -0000
Subject: [Python-checkins] bpo-31243: Fixed PyArg_ParseTuple failure checks.
 (#3171)
Message-ID: <mailman.128.1503997116.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/ba7d7365215d791025d1efd25393c91404f2cfc8
commit: ba7d7365215d791025d1efd25393c91404f2cfc8
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-29T11:58:27+03:00
summary:

bpo-31243: Fixed PyArg_ParseTuple failure checks. (#3171)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst
M Lib/test/test_io.py
M Modules/_io/textio.c
M Modules/_testcapimodule.c

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index ba95c1442fa..48270c88be6 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -3253,6 +3253,26 @@ def _make_illegal_wrapper():
         t = _make_illegal_wrapper()
         self.assertRaises(TypeError, t.read)
 
+        # Issue 31243: calling read() while the return value of decoder's
+        # getstate() is invalid should neither crash the interpreter nor
+        # raise a SystemError.
+        def _make_very_illegal_wrapper(getstate_ret_val):
+            class BadDecoder:
+                def getstate(self):
+                    return getstate_ret_val
+            def _get_bad_decoder(dummy):
+                return BadDecoder()
+            quopri = codecs.lookup("quopri")
+            with support.swap_attr(quopri, 'incrementaldecoder',
+                                   _get_bad_decoder):
+                return _make_illegal_wrapper()
+        t = _make_very_illegal_wrapper(42)
+        self.assertRaises(TypeError, t.read, 42)
+        t = _make_very_illegal_wrapper(())
+        self.assertRaises(TypeError, t.read, 42)
+        t = _make_very_illegal_wrapper((1, 2))
+        self.assertRaises(TypeError, t.read, 42)
+
     def _check_create_at_shutdown(self, **kwargs):
         # Issue #20037: creating a TextIOWrapper at shutdown
         # shouldn't crash the interpreter.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst
new file mode 100644
index 00000000000..166458f2b78
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst	
@@ -0,0 +1,2 @@
+Fix a crash in some methods of `io.TextIOWrapper`, when the decoder's state
+is invalid. Patch by Oren Milman.
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 402f743c61f..9b7334d3b54 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -1513,15 +1513,23 @@ textiowrapper_read_chunk(textio *self, Py_ssize_t size_hint)
         /* Given this, we know there was a valid snapshot point
          * len(dec_buffer) bytes ago with decoder state (b'', dec_flags).
          */
-        if (PyArg_ParseTuple(state, "OO", &dec_buffer, &dec_flags) < 0) {
+        if (!PyTuple_Check(state)) {
+            PyErr_SetString(PyExc_TypeError,
+                            "illegal decoder state");
+            Py_DECREF(state);
+            return -1;
+        }
+        if (!PyArg_ParseTuple(state,
+                              "OO;illegal decoder state", &dec_buffer, &dec_flags))
+        {
             Py_DECREF(state);
             return -1;
         }
 
         if (!PyBytes_Check(dec_buffer)) {
             PyErr_Format(PyExc_TypeError,
-                         "decoder getstate() should have returned a bytes "
-                         "object, not '%.200s'",
+                         "illegal decoder state: the first item should be a "
+                         "bytes object, not '%.200s'",
                          Py_TYPE(dec_buffer)->tp_name);
             Py_DECREF(state);
             return -1;
@@ -2408,8 +2416,8 @@ _io_TextIOWrapper_tell_impl(textio *self)
         } \
         if (!PyBytes_Check(dec_buffer)) { \
             PyErr_Format(PyExc_TypeError, \
-                         "decoder getstate() should have returned a bytes " \
-                         "object, not '%.200s'", \
+                         "illegal decoder state: the first item should be a " \
+                         "bytes object, not '%.200s'", \
                          Py_TYPE(dec_buffer)->tp_name); \
             Py_DECREF(_state); \
             goto fail; \
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 95c10184159..2952317e76d 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -864,8 +864,9 @@ test_L_code(PyObject *self)
     PyTuple_SET_ITEM(tuple, 0, num);
 
     value = -1;
-    if (PyArg_ParseTuple(tuple, "L:test_L_code", &value) < 0)
+    if (!PyArg_ParseTuple(tuple, "L:test_L_code", &value)) {
         return NULL;
+    }
     if (value != 42)
         return raiseTestError("test_L_code",
             "L code returned wrong value for long 42");
@@ -878,8 +879,9 @@ test_L_code(PyObject *self)
     PyTuple_SET_ITEM(tuple, 0, num);
 
     value = -1;
-    if (PyArg_ParseTuple(tuple, "L:test_L_code", &value) < 0)
+    if (!PyArg_ParseTuple(tuple, "L:test_L_code", &value)) {
         return NULL;
+    }
     if (value != 42)
         return raiseTestError("test_L_code",
             "L code returned wrong value for int 42");
@@ -1195,8 +1197,9 @@ test_k_code(PyObject *self)
     PyTuple_SET_ITEM(tuple, 0, num);
 
     value = 0;
-    if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0)
+    if (!PyArg_ParseTuple(tuple, "k:test_k_code", &value)) {
         return NULL;
+    }
     if (value != ULONG_MAX)
         return raiseTestError("test_k_code",
             "k code returned wrong value for long 0xFFF...FFF");
@@ -1215,8 +1218,9 @@ test_k_code(PyObject *self)
     PyTuple_SET_ITEM(tuple, 0, num);
 
     value = 0;
-    if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0)
+    if (!PyArg_ParseTuple(tuple, "k:test_k_code", &value)) {
         return NULL;
+    }
     if (value != (unsigned long)-0x42)
         return raiseTestError("test_k_code",
             "k code returned wrong value for long -0xFFF..000042");
@@ -1549,11 +1553,13 @@ test_s_code(PyObject *self)
     /* These two blocks used to raise a TypeError:
      * "argument must be string without null bytes, not str"
      */
-    if (PyArg_ParseTuple(tuple, "s:test_s_code1", &value) < 0)
-    return NULL;
+    if (!PyArg_ParseTuple(tuple, "s:test_s_code1", &value)) {
+        return NULL;
+    }
 
-    if (PyArg_ParseTuple(tuple, "z:test_s_code2", &value) < 0)
-    return NULL;
+    if (!PyArg_ParseTuple(tuple, "z:test_s_code2", &value)) {
+        return NULL;
+    }
 
     Py_DECREF(tuple);
     Py_RETURN_NONE;
@@ -1655,14 +1661,16 @@ test_u_code(PyObject *self)
     PyTuple_SET_ITEM(tuple, 0, obj);
 
     value = 0;
-    if (PyArg_ParseTuple(tuple, "u:test_u_code", &value) < 0)
+    if (!PyArg_ParseTuple(tuple, "u:test_u_code", &value)) {
         return NULL;
+    }
     if (value != PyUnicode_AS_UNICODE(obj))
         return raiseTestError("test_u_code",
             "u code returned wrong value for u'test'");
     value = 0;
-    if (PyArg_ParseTuple(tuple, "u#:test_u_code", &value, &len) < 0)
+    if (!PyArg_ParseTuple(tuple, "u#:test_u_code", &value, &len)) {
         return NULL;
+    }
     if (value != PyUnicode_AS_UNICODE(obj) ||
         len != PyUnicode_GET_SIZE(obj))
         return raiseTestError("test_u_code",
@@ -1694,8 +1702,9 @@ test_Z_code(PyObject *self)
     value2 = PyUnicode_AS_UNICODE(obj);
 
     /* Test Z for both values */
-    if (PyArg_ParseTuple(tuple, "ZZ:test_Z_code", &value1, &value2) < 0)
+    if (!PyArg_ParseTuple(tuple, "ZZ:test_Z_code", &value1, &value2)) {
         return NULL;
+    }
     if (value1 != PyUnicode_AS_UNICODE(obj))
         return raiseTestError("test_Z_code",
             "Z code returned wrong value for 'test'");
@@ -1709,9 +1718,11 @@ test_Z_code(PyObject *self)
     len2 = -1;
 
     /* Test Z# for both values */
-    if (PyArg_ParseTuple(tuple, "Z#Z#:test_Z_code", &value1, &len1,
-                         &value2, &len2) < 0)
+    if (!PyArg_ParseTuple(tuple, "Z#Z#:test_Z_code", &value1, &len1,
+                          &value2, &len2))
+    {
         return NULL;
+    }
     if (value1 != PyUnicode_AS_UNICODE(obj) ||
         len1 != PyUnicode_GET_SIZE(obj))
         return raiseTestError("test_Z_code",
@@ -2033,8 +2044,9 @@ test_empty_argparse(PyObject *self)
     tuple = PyTuple_New(0);
     if (!tuple)
         return NULL;
-    if ((result = PyArg_ParseTuple(tuple, "|:test_empty_argparse")) < 0)
+    if (!(result = PyArg_ParseTuple(tuple, "|:test_empty_argparse"))) {
         goto done;
+    }
     dict = PyDict_New();
     if (!dict)
         goto done;
@@ -2042,8 +2054,9 @@ test_empty_argparse(PyObject *self)
   done:
     Py_DECREF(tuple);
     Py_XDECREF(dict);
-    if (result < 0)
+    if (!result) {
         return NULL;
+    }
     else {
         Py_RETURN_NONE;
     }
@@ -3698,8 +3711,9 @@ test_raise_signal(PyObject* self, PyObject *args)
 {
     int signum, err;
 
-    if (PyArg_ParseTuple(args, "i:raise_signal", &signum) < 0)
+    if (!PyArg_ParseTuple(args, "i:raise_signal", &signum)) {
         return NULL;
+    }
 
     err = raise(signum);
     if (err)


From solipsis at pitrou.net  Tue Aug 29 05:05:27 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 29 Aug 2017 09:05:27 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=8
Message-ID: <20170829090523.90988.E62E4E1425C3C32F@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [7, -7, 8] memory blocks, sum=8
test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_fork leaked [0, -2, 0] memory blocks, sum=-2
test_multiprocessing_forkserver leaked [-1, 1, -2] memory blocks, sum=-2


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogBpYy1l', '--timeout', '7200']

From webhook-mailer at python.org  Tue Aug 29 08:43:35 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 29 Aug 2017 12:43:35 -0000
Subject: [Python-checkins] [3.6] bpo-31243: Fixed PyArg_ParseTuple failure
 checks. (GH-3171) (#3233)
Message-ID: <mailman.129.1504010619.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/c7750c2a3af014a5b742d0159d8957ea95b6c221
commit: c7750c2a3af014a5b742d0159d8957ea95b6c221
branch: 3.6
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-29T15:43:32+03:00
summary:

[3.6] bpo-31243: Fixed PyArg_ParseTuple failure checks. (GH-3171) (#3233)

(cherry picked from commit ba7d7365215d791025d1efd25393c91404f2cfc8)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst
M Lib/test/test_io.py
M Modules/_io/textio.c
M Modules/_testcapimodule.c

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 7057c927c3f..08c041ed937 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -3191,6 +3191,26 @@ def _make_illegal_wrapper():
         t = _make_illegal_wrapper()
         self.assertRaises(TypeError, t.read)
 
+        # Issue 31243: calling read() while the return value of decoder's
+        # getstate() is invalid should neither crash the interpreter nor
+        # raise a SystemError.
+        def _make_very_illegal_wrapper(getstate_ret_val):
+            class BadDecoder:
+                def getstate(self):
+                    return getstate_ret_val
+            def _get_bad_decoder(dummy):
+                return BadDecoder()
+            quopri = codecs.lookup("quopri")
+            with support.swap_attr(quopri, 'incrementaldecoder',
+                                   _get_bad_decoder):
+                return _make_illegal_wrapper()
+        t = _make_very_illegal_wrapper(42)
+        self.assertRaises(TypeError, t.read, 42)
+        t = _make_very_illegal_wrapper(())
+        self.assertRaises(TypeError, t.read, 42)
+        t = _make_very_illegal_wrapper((1, 2))
+        self.assertRaises(TypeError, t.read, 42)
+
     def _check_create_at_shutdown(self, **kwargs):
         # Issue #20037: creating a TextIOWrapper at shutdown
         # shouldn't crash the interpreter.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst
new file mode 100644
index 00000000000..166458f2b78
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst	
@@ -0,0 +1,2 @@
+Fix a crash in some methods of `io.TextIOWrapper`, when the decoder's state
+is invalid. Patch by Oren Milman.
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 801bb1745bb..588c6977691 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -1457,15 +1457,23 @@ textiowrapper_read_chunk(textio *self, Py_ssize_t size_hint)
         /* Given this, we know there was a valid snapshot point
          * len(dec_buffer) bytes ago with decoder state (b'', dec_flags).
          */
-        if (PyArg_ParseTuple(state, "OO", &dec_buffer, &dec_flags) < 0) {
+        if (!PyTuple_Check(state)) {
+            PyErr_SetString(PyExc_TypeError,
+                            "illegal decoder state");
+            Py_DECREF(state);
+            return -1;
+        }
+        if (!PyArg_ParseTuple(state,
+                              "OO;illegal decoder state", &dec_buffer, &dec_flags))
+        {
             Py_DECREF(state);
             return -1;
         }
 
         if (!PyBytes_Check(dec_buffer)) {
             PyErr_Format(PyExc_TypeError,
-                         "decoder getstate() should have returned a bytes "
-                         "object, not '%.200s'",
+                         "illegal decoder state: the first item should be a "
+                         "bytes object, not '%.200s'",
                          Py_TYPE(dec_buffer)->tp_name);
             Py_DECREF(state);
             return -1;
@@ -2349,8 +2357,8 @@ _io_TextIOWrapper_tell_impl(textio *self)
         } \
         if (!PyBytes_Check(dec_buffer)) { \
             PyErr_Format(PyExc_TypeError, \
-                         "decoder getstate() should have returned a bytes " \
-                         "object, not '%.200s'", \
+                         "illegal decoder state: the first item should be a " \
+                         "bytes object, not '%.200s'", \
                          Py_TYPE(dec_buffer)->tp_name); \
             Py_DECREF(_state); \
             goto fail; \
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 91fac1573d3..ede675da285 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -870,8 +870,9 @@ test_L_code(PyObject *self)
     PyTuple_SET_ITEM(tuple, 0, num);
 
     value = -1;
-    if (PyArg_ParseTuple(tuple, "L:test_L_code", &value) < 0)
+    if (!PyArg_ParseTuple(tuple, "L:test_L_code", &value)) {
         return NULL;
+    }
     if (value != 42)
         return raiseTestError("test_L_code",
             "L code returned wrong value for long 42");
@@ -884,8 +885,9 @@ test_L_code(PyObject *self)
     PyTuple_SET_ITEM(tuple, 0, num);
 
     value = -1;
-    if (PyArg_ParseTuple(tuple, "L:test_L_code", &value) < 0)
+    if (!PyArg_ParseTuple(tuple, "L:test_L_code", &value)) {
         return NULL;
+    }
     if (value != 42)
         return raiseTestError("test_L_code",
             "L code returned wrong value for int 42");
@@ -1202,8 +1204,9 @@ test_k_code(PyObject *self)
     PyTuple_SET_ITEM(tuple, 0, num);
 
     value = 0;
-    if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0)
+    if (!PyArg_ParseTuple(tuple, "k:test_k_code", &value)) {
         return NULL;
+    }
     if (value != ULONG_MAX)
         return raiseTestError("test_k_code",
             "k code returned wrong value for long 0xFFF...FFF");
@@ -1221,8 +1224,9 @@ test_k_code(PyObject *self)
     PyTuple_SET_ITEM(tuple, 0, num);
 
     value = 0;
-    if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0)
+    if (!PyArg_ParseTuple(tuple, "k:test_k_code", &value)) {
         return NULL;
+    }
     if (value != (unsigned long)-0x42)
         return raiseTestError("test_k_code",
             "k code returned wrong value for long -0xFFF..000042");
@@ -1560,11 +1564,13 @@ test_s_code(PyObject *self)
     /* These two blocks used to raise a TypeError:
      * "argument must be string without null bytes, not str"
      */
-    if (PyArg_ParseTuple(tuple, "s:test_s_code1", &value) < 0)
-    return NULL;
+    if (!PyArg_ParseTuple(tuple, "s:test_s_code1", &value)) {
+        return NULL;
+    }
 
-    if (PyArg_ParseTuple(tuple, "z:test_s_code2", &value) < 0)
-    return NULL;
+    if (!PyArg_ParseTuple(tuple, "z:test_s_code2", &value)) {
+        return NULL;
+    }
 
     Py_DECREF(tuple);
     Py_RETURN_NONE;
@@ -1666,14 +1672,16 @@ test_u_code(PyObject *self)
     PyTuple_SET_ITEM(tuple, 0, obj);
 
     value = 0;
-    if (PyArg_ParseTuple(tuple, "u:test_u_code", &value) < 0)
+    if (!PyArg_ParseTuple(tuple, "u:test_u_code", &value)) {
         return NULL;
+    }
     if (value != PyUnicode_AS_UNICODE(obj))
         return raiseTestError("test_u_code",
             "u code returned wrong value for u'test'");
     value = 0;
-    if (PyArg_ParseTuple(tuple, "u#:test_u_code", &value, &len) < 0)
+    if (!PyArg_ParseTuple(tuple, "u#:test_u_code", &value, &len)) {
         return NULL;
+    }
     if (value != PyUnicode_AS_UNICODE(obj) ||
         len != PyUnicode_GET_SIZE(obj))
         return raiseTestError("test_u_code",
@@ -1706,8 +1714,9 @@ test_Z_code(PyObject *self)
     value2 = PyUnicode_AS_UNICODE(obj);
 
     /* Test Z for both values */
-    if (PyArg_ParseTuple(tuple, "ZZ:test_Z_code", &value1, &value2) < 0)
+    if (!PyArg_ParseTuple(tuple, "ZZ:test_Z_code", &value1, &value2)) {
         return NULL;
+    }
     if (value1 != PyUnicode_AS_UNICODE(obj))
         return raiseTestError("test_Z_code",
             "Z code returned wrong value for 'test'");
@@ -1721,9 +1730,11 @@ test_Z_code(PyObject *self)
     len2 = -1;
 
     /* Test Z# for both values */
-    if (PyArg_ParseTuple(tuple, "Z#Z#:test_Z_code", &value1, &len1,
-                         &value2, &len2) < 0)
+    if (!PyArg_ParseTuple(tuple, "Z#Z#:test_Z_code", &value1, &len1,
+                          &value2, &len2))
+    {
         return NULL;
+    }
     if (value1 != PyUnicode_AS_UNICODE(obj) ||
         len1 != PyUnicode_GET_SIZE(obj))
         return raiseTestError("test_Z_code",
@@ -2028,8 +2039,9 @@ test_empty_argparse(PyObject *self)
     tuple = PyTuple_New(0);
     if (!tuple)
         return NULL;
-    if ((result = PyArg_ParseTuple(tuple, "|:test_empty_argparse")) < 0)
+    if (!(result = PyArg_ParseTuple(tuple, "|:test_empty_argparse"))) {
         goto done;
+    }
     dict = PyDict_New();
     if (!dict)
         goto done;
@@ -2037,8 +2049,9 @@ test_empty_argparse(PyObject *self)
   done:
     Py_DECREF(tuple);
     Py_XDECREF(dict);
-    if (result < 0)
+    if (!result) {
         return NULL;
+    }
     else {
         Py_RETURN_NONE;
     }
@@ -3573,8 +3586,9 @@ test_raise_signal(PyObject* self, PyObject *args)
 {
     int signum, err;
 
-    if (PyArg_ParseTuple(args, "i:raise_signal", &signum) < 0)
+    if (!PyArg_ParseTuple(args, "i:raise_signal", &signum)) {
         return NULL;
+    }
 
     err = raise(signum);
     if (err)


From webhook-mailer at python.org  Tue Aug 29 08:47:47 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 29 Aug 2017 12:47:47 -0000
Subject: [Python-checkins] bpo-31286,
 bpo-30024: Fixed stack usage in absolute imports with (#3217)
Message-ID: <mailman.130.1504010869.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/265fcc5fc25d65afb33fda480c603f1e974e374e
commit: 265fcc5fc25d65afb33fda480c603f1e974e374e
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-29T15:47:44+03:00
summary:

bpo-31286, bpo-30024: Fixed stack usage in absolute imports with (#3217)

binding a submodule to a name.

files:
M Lib/test/test_import/__init__.py
M Python/compile.c

diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py
index 1b04de24dd1..ddef27d9cd4 100644
--- a/Lib/test/test_import/__init__.py
+++ b/Lib/test/test_import/__init__.py
@@ -237,6 +237,23 @@ def test_import_name_binding(self):
         import test.support as y
         self.assertIs(y, test.support, y.__name__)
 
+    def test_issue31286(self):
+        # import in a 'finally' block resulted in SystemError
+        try:
+            x = ...
+        finally:
+            import test.support.script_helper as x
+
+        # import in a 'while' loop resulted in stack overflow
+        i = 0
+        while i < 10:
+            import test.support.script_helper as x
+            i += 1
+
+        # import in a 'for' loop resulted in segmentation fault
+        for i in range(2):
+            import test.support.script_helper as x
+
     def test_failing_reload(self):
         # A failing reload should leave the module object in sys.modules.
         source = TESTFN + os.extsep + "py"
diff --git a/Python/compile.c b/Python/compile.c
index 78e797a2c33..e547c2fd591 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -2673,28 +2673,34 @@ compiler_import_as(struct compiler *c, identifier name, identifier asname)
        If there is a dot in name, we need to split it and emit a
        IMPORT_FROM for each name.
     */
-    Py_ssize_t dot = PyUnicode_FindChar(name, '.', 0,
-                                        PyUnicode_GET_LENGTH(name), 1);
+    Py_ssize_t len = PyUnicode_GET_LENGTH(name);
+    Py_ssize_t dot = PyUnicode_FindChar(name, '.', 0, len, 1);
     if (dot == -2)
         return 0;
     if (dot != -1) {
         /* Consume the base module name to get the first attribute */
-        Py_ssize_t pos = dot + 1;
-        while (dot != -1) {
+        while (1) {
+            Py_ssize_t pos = dot + 1;
             PyObject *attr;
-            dot = PyUnicode_FindChar(name, '.', pos,
-                                     PyUnicode_GET_LENGTH(name), 1);
+            dot = PyUnicode_FindChar(name, '.', pos, len, 1);
             if (dot == -2)
                 return 0;
-            attr = PyUnicode_Substring(name, pos,
-                                       (dot != -1) ? dot :
-                                       PyUnicode_GET_LENGTH(name));
+            attr = PyUnicode_Substring(name, pos, (dot != -1) ? dot : len);
             if (!attr)
                 return 0;
             ADDOP_O(c, IMPORT_FROM, attr, names);
             Py_DECREF(attr);
-            pos = dot + 1;
+            if (dot == -1) {
+                break;
+            }
+            ADDOP(c, ROT_TWO);
+            ADDOP(c, POP_TOP);
         }
+        if (!compiler_nameop(c, asname, Store)) {
+            return 0;
+        }
+        ADDOP(c, POP_TOP);
+        return 1;
     }
     return compiler_nameop(c, asname, Store);
 }


From webhook-mailer at python.org  Tue Aug 29 10:46:26 2017
From: webhook-mailer at python.org (Gregory P. Smith)
Date: Tue, 29 Aug 2017 14:46:26 -0000
Subject: [Python-checkins] bpo-31065: Add doc about Popen.poll returning
 None. (#3169)
Message-ID: <mailman.131.1504017989.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/006617ff7d6df3fdedcfe53e94ee2c52cc796437
commit: 006617ff7d6df3fdedcfe53e94ee2c52cc796437
branch: master
author: Ivan Chernoff <chernoffivan at gmail.com>
committer: Gregory P. Smith <greg at krypto.org>
date: 2017-08-29T07:46:24-07:00
summary:

bpo-31065: Add doc about Popen.poll returning None. (#3169)

files:
M Doc/library/subprocess.rst

diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index 2eaa48e070d..a4e234e62ae 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -584,7 +584,7 @@ Instances of the :class:`Popen` class have the following methods:
 .. method:: Popen.poll()
 
    Check if child process has terminated.  Set and return
-   :attr:`~Popen.returncode` attribute.
+   :attr:`~Popen.returncode` attribute. Otherwise, returns ``None``.
 
 
 .. method:: Popen.wait(timeout=None)


From webhook-mailer at python.org  Tue Aug 29 12:16:17 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 29 Aug 2017 16:16:17 -0000
Subject: [Python-checkins] [2.7] bpo-31243: Fixed PyArg_ParseTuple failure
 checks. (GH-3171) (#3235)
Message-ID: <mailman.132.1504023380.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/20958e6d91d11a80d6c664ce6346791259b1d193
commit: 20958e6d91d11a80d6c664ce6346791259b1d193
branch: 2.7
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-29T19:16:12+03:00
summary:

[2.7] bpo-31243: Fixed PyArg_ParseTuple failure checks. (GH-3171) (#3235)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-08-29-14-24-34.bpo-31243.tr0E4V.rst
M Lib/test/test_io.py
M Modules/_io/textio.c
M Modules/_testcapimodule.c

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index caca0333e0d..3dc6e9ffcac 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -2702,6 +2702,26 @@ def _make_illegal_wrapper():
             #t = _make_illegal_wrapper()
             #self.assertRaises(TypeError, t.read)
 
+        # Issue 31243: calling read() while the return value of decoder's
+        # getstate() is invalid should neither crash the interpreter nor
+        # raise a SystemError.
+        def _make_very_illegal_wrapper(getstate_ret_val):
+            class BadDecoder:
+                def getstate(self):
+                    return getstate_ret_val
+            def _get_bad_decoder(dummy):
+                return BadDecoder()
+            quopri = codecs.lookup("quopri_codec")
+            with support.swap_attr(quopri, 'incrementaldecoder',
+                                   _get_bad_decoder):
+                return _make_illegal_wrapper()
+        t = _make_very_illegal_wrapper(42)
+        with self.maybeRaises(TypeError):
+            t.read(42)
+        t = _make_very_illegal_wrapper(())
+        with self.maybeRaises(TypeError):
+            t.read(42)
+
 
 class CTextIOWrapperTest(TextIOWrapperTest):
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-29-14-24-34.bpo-31243.tr0E4V.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-29-14-24-34.bpo-31243.tr0E4V.rst
new file mode 100644
index 00000000000..166458f2b78
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-29-14-24-34.bpo-31243.tr0E4V.rst	
@@ -0,0 +1,2 @@
+Fix a crash in some methods of `io.TextIOWrapper`, when the decoder's state
+is invalid. Patch by Oren Milman.
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index f13dcb4366e..d9e036db386 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -1416,7 +1416,7 @@ textiowrapper_read_chunk(textio *self)
         /* Given this, we know there was a valid snapshot point
          * len(dec_buffer) bytes ago with decoder state (b'', dec_flags).
          */
-        if (PyArg_Parse(state, "(OO)", &dec_buffer, &dec_flags) < 0) {
+        if (!PyArg_Parse(state, "(OO)", &dec_buffer, &dec_flags)) {
             Py_DECREF(state);
             return -1;
         }
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index a5e3f07667d..ecc473cf4c1 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -911,8 +911,9 @@ test_L_code(PyObject *self)
     PyTuple_SET_ITEM(tuple, 0, num);
 
     value = -1;
-    if (PyArg_ParseTuple(tuple, "L:test_L_code", &value) < 0)
+    if (!PyArg_ParseTuple(tuple, "L:test_L_code", &value)) {
         return NULL;
+    }
     if (value != 42)
         return raiseTestError("test_L_code",
             "L code returned wrong value for long 42");
@@ -925,8 +926,9 @@ test_L_code(PyObject *self)
     PyTuple_SET_ITEM(tuple, 0, num);
 
     value = -1;
-    if (PyArg_ParseTuple(tuple, "L:test_L_code", &value) < 0)
+    if (!PyArg_ParseTuple(tuple, "L:test_L_code", &value)) {
         return NULL;
+    }
     if (value != 42)
         return raiseTestError("test_L_code",
             "L code returned wrong value for int 42");
@@ -1207,8 +1209,9 @@ test_k_code(PyObject *self)
     PyTuple_SET_ITEM(tuple, 0, num);
 
     value = 0;
-    if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0)
+    if (!PyArg_ParseTuple(tuple, "k:test_k_code", &value)) {
         return NULL;
+    }
     if (value != ULONG_MAX)
         return raiseTestError("test_k_code",
             "k code returned wrong value for long 0xFFF...FFF");
@@ -1226,8 +1229,9 @@ test_k_code(PyObject *self)
     PyTuple_SET_ITEM(tuple, 0, num);
 
     value = 0;
-    if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0)
+    if (!PyArg_ParseTuple(tuple, "k:test_k_code", &value)) {
         return NULL;
+    }
     if (value != (unsigned long)-0x42)
         return raiseTestError("test_k_code",
             "k code returned wrong value for long -0xFFF..000042");
@@ -1587,14 +1591,16 @@ test_u_code(PyObject *self)
     PyTuple_SET_ITEM(tuple, 0, obj);
 
     value = 0;
-    if (PyArg_ParseTuple(tuple, "u:test_u_code", &value) < 0)
+    if (!PyArg_ParseTuple(tuple, "u:test_u_code", &value)) {
         return NULL;
+    }
     if (value != PyUnicode_AS_UNICODE(obj))
         return raiseTestError("test_u_code",
             "u code returned wrong value for u'test'");
     value = 0;
-    if (PyArg_ParseTuple(tuple, "u#:test_u_code", &value, &len) < 0)
+    if (!PyArg_ParseTuple(tuple, "u#:test_u_code", &value, &len)) {
         return NULL;
+    }
     if (value != PyUnicode_AS_UNICODE(obj) ||
         len != PyUnicode_GET_SIZE(obj))
         return raiseTestError("test_u_code",
@@ -1692,8 +1698,9 @@ test_empty_argparse(PyObject *self)
     tuple = PyTuple_New(0);
     if (!tuple)
         return NULL;
-    if ((result = PyArg_ParseTuple(tuple, "|:test_empty_argparse")) < 0)
+    if (!(result = PyArg_ParseTuple(tuple, "|:test_empty_argparse"))) {
         goto done;
+    }
     dict = PyDict_New();
     if (!dict)
         goto done;
@@ -1701,8 +1708,9 @@ test_empty_argparse(PyObject *self)
   done:
     Py_DECREF(tuple);
     Py_XDECREF(dict);
-    if (result < 0)
+    if (!result) {
         return NULL;
+    }
     else {
         Py_RETURN_NONE;
     }
@@ -2494,8 +2502,9 @@ test_raise_signal(PyObject* self, PyObject *args)
 {
     int signum, err;
 
-    if (PyArg_ParseTuple(args, "i:raise_signal", &signum) < 0)
+    if (!PyArg_ParseTuple(args, "i:raise_signal", &signum)) {
         return NULL;
+    }
 
     err = raise(signum);
     if (err)


From webhook-mailer at python.org  Tue Aug 29 13:40:18 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 29 Aug 2017 17:40:18 -0000
Subject: [Python-checkins] bpo-31291: Fixed an assertion failure in
 zipimport.zipimporter.get_data() (#3226)
Message-ID: <mailman.133.1504028420.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/631fdee6e61b4ba8ce800f827fecdd536bfb04f3
commit: 631fdee6e61b4ba8ce800f827fecdd536bfb04f3
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-29T20:40:15+03:00
summary:

bpo-31291: Fixed an assertion failure in zipimport.zipimporter.get_data() (#3226)

if pathname.replace('/', '\\') returns non-string.

files:
A Misc/NEWS.d/next/Core and Builtins/2017-08-28-11-51-29.bpo-31291.t8QggK.rst
M Lib/test/test_zipimport.py
M Modules/zipimport.c

diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
index 7ddbc509f9b..daa5138751b 100644
--- a/Lib/test/test_zipimport.py
+++ b/Lib/test/test_zipimport.py
@@ -521,6 +521,23 @@ def testGetData(self):
             z.close()
             os.remove(TEMP_ZIP)
 
+    def test_issue31291(self):
+        # There shouldn't be an assertion failure in get_data().
+        class FunnyStr(str):
+            def replace(self, old, new):
+                return 42
+        z = ZipFile(TEMP_ZIP, "w")
+        try:
+            name = "test31291.dat"
+            data = b'foo'
+            z.writestr(name, data)
+            z.close()
+            zi = zipimport.zipimporter(TEMP_ZIP)
+            self.assertEqual(data, zi.get_data(FunnyStr(name)))
+        finally:
+            z.close()
+            os.remove(TEMP_ZIP)
+
     def testImporterAttr(self):
         src = """if 1:  # indent hack
         def get_file():
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-28-11-51-29.bpo-31291.t8QggK.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-28-11-51-29.bpo-31291.t8QggK.rst
new file mode 100644
index 00000000000..0576785c7df
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-28-11-51-29.bpo-31291.t8QggK.rst	
@@ -0,0 +1,3 @@
+Fix an assertion failure in `zipimport.zipimporter.get_data` on Windows,
+when the return value of ``pathname.replace('/','\\')`` isn't a string.
+Patch by Oren Milman.
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index c01ee55840b..d710360f95d 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -651,7 +651,8 @@ zipimport_zipimporter_get_data_impl(ZipImporter *self, PyObject *path)
     Py_ssize_t path_start, path_len, len;
 
 #ifdef ALTSEP
-    path = _PyObject_CallMethodId(path, &PyId_replace, "CC", ALTSEP, SEP);
+    path = _PyObject_CallMethodId((PyObject *)&PyUnicode_Type, &PyId_replace,
+                                  "OCC", path, ALTSEP, SEP);
     if (!path)
         return NULL;
 #else


From lp_benchmark_robot at intel.com  Tue Aug 29 18:37:49 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Tue, 29 Aug 2017 15:37:49 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-29
Message-ID: <2d9272b8-ab75-431d-b718-1514303f0ade@orsmsx152.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-29 03:04:28-07:00.
  - commit:		ba7d736
  - previous commit:	a30f6d4
  - revision date:	2017-08-29 11:58:27+03:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.020% |  +1.174%   |  +4.348%   |  +7.328%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.898% |  +0.045%   |  +22.982%  |  +10.105%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 2.010% |  -0.229%   |  +23.675%  |  +11.233%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.388% |  -0.057%   |  +22.017%  |  +8.866%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.252% |  +0.215%   |  +3.163%   |  +13.426%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 2.551% |  +0.254%   |  +12.084%  |  +6.789%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 1.598% |  +0.288%   |  +6.172%   |  +11.219%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.496% |  +0.081%   |  +3.282%   |  +5.731%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.639% |  -0.384%   |  +6.108%   |  +19.248%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 7.423% |  +1.798%   |  +6.440%   |  +10.361%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.084% |  +1.363%   |  +4.563%   |  +6.881%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.460% |  +0.547%   |  +5.535%   |  +2.588%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.941% |  +0.102%   |  +3.593%   |  +5.871%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.498% |  +0.364%   |  +8.091%   |  +10.837%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.020% |  +1.758%   |  +6.907%   |  +8.155%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 1.028% |  +0.190%   |  +6.350%   |  +9.823%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 2.023% |  -0.174%   |  +9.268%   |  +10.801%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.577% |  +2.060%   |  +6.706%   |  +9.433%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 2.873% |  +0.731%   |  +4.167%   |  +8.247%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 4.272% |  +0.681%   |  +1.787%   |  +8.028%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.705% |  +3.116%   |  +7.335%   |  +10.787%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.582% |  -0.129%   |  +46.685%  |  +12.357%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.742% |  +3.006%   |  +7.929%   |  +11.733%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.379% |  +0.183%   |  +19.151%  |  +11.157%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 5.274% |  +0.652%   |  +6.281%   |  +12.484%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.603% |  -0.006%   |  +4.416%   |  +4.171%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.918% |  -0.011%   |  -3.926%   |  +4.561%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.702% |  -0.168%   |  +2.922%   |  +7.050%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.174% |  +2.490%   |  +1.939%   |  +10.537%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 2.674% |  +0.947%   |  +0.301%   |  +22.780%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.343% |  +0.088%   |  +2.572%   |  +19.991%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.806% |  -0.049%   |  +6.582%   |  +18.419%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 1.828% |  +2.773%   |  +12.421%  |  +9.048%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.159% |  +0.082%   |  +0.429%   |  +10.092%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.131% |  +0.570%   |  +8.759%   |  +4.360%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.103% |  +0.548%   |  +0.901%   |  +4.225%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.423% |  +0.508%   |  +8.752%   |  +14.207%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.310% |  -0.471%   |  -8.909%   |  +10.681%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 1.076% |  +0.018%   |  +2.266%   |  +8.075%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.915% |  +0.234%   |  +0.500%   |  -0.106%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 0.739% |  +0.065%   |  +12.042%  |  +2.856%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 4.440% |  -0.740%   |  +6.701%   |  +15.955%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.629% |  +0.261%   |  +1.326%   |  -0.684%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 2.566% |  +0.607%   |  +25.980%  |  +8.772%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.334% |  -0.265%   |  +2.840%   |  +7.908%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.479% |  +0.030%   |  +14.391%  |  +8.504%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 0.935% |  -0.135%   |  +0.952%   |  -3.934%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.804% |  +0.469%   |  +5.760%   |  +1.052%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.257% |  +0.292%   |  +4.713%   |  +7.463%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.809% |  +0.686%   |  +4.999%   |  +4.861%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.084% |  +2.697%   |  -2.233%   |  +12.523%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.256% |  +1.039%   |  +12.213%  |  +7.276%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 2.182% |  +0.485%   |  +9.736%   |  +6.187%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.924% |  +1.083%   |  +12.041%  |  +7.361%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.814% |  +1.751%   |  +13.341%  |  +8.097%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 4.431% |  +0.953%   |  +21.692%  |  +12.694%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.215% |  +0.857%   |  +5.552%   |  +6.515%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.074% |  -0.172%   |  +2.577%   |  -1.516%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle|10.391% |  -3.098%   |  +6.260%   |  +22.447%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 2.107% |  -0.449%   |  -3.069%   |  +20.594%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 1.311% |  +0.699%   |  +7.018%   |  +6.583%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.057% |  +0.218%   |  +6.143%   |  +6.329%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.143% |  +0.049%   |  +3.546%   |  +4.424%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 2.004% |  -0.584%   |  -4.932%   |  +9.499%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.356% |  +0.518%   |  +7.223%   |  +6.732%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-29

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Tue Aug 29 18:52:23 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Tue, 29 Aug 2017 22:52:23 -0000
Subject: [Python-checkins] bpo-5001: More-informative multiprocessing error
 messages (#3079)
Message-ID: <mailman.134.1504047147.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/bd73e72b4a9f019be514954b1d40e64dc3a5e81c
commit: bd73e72b4a9f019be514954b1d40e64dc3a5e81c
branch: master
author: Allen W. Smith, Ph.D <drallensmith at users.noreply.github.com>
committer: Antoine Pitrou <pitrou at free.fr>
date: 2017-08-30T00:52:18+02:00
summary:

bpo-5001: More-informative multiprocessing error messages (#3079)

* Make error message more informative

Replace assertions in error-reporting code with more-informative version that doesn't cause confusion over where and what the error is.

* Additional clarification + get travis to check

* Change from SystemError to TypeError

As suggested in PR comment by @pitrou, changing from SystemError; TypeError appears appropriate.

* NEWS file installation; ACKS addition (will do my best to justify it by additional work)

* Making current AssertionErrors in multiprocessing more informative

* Blurb added re multiprocessing managers.py, queues.py cleanup

* Further multiprocessing cleanup - went through pool.py

* Fix two asserts in multiprocessing/util.py

* Most asserts in multiprocessing more informative

* Didn't save right version

* Further work on multiprocessing error messages

* Correct typo

* Correct typo v2

* Blasted colon... serves me right for trying to work on two things at once

* Simplify NEWS entry

* Update 2017-08-18-17-16-38.bpo-5001.gwnthq.rst

* Update 2017-08-18-17-16-38.bpo-5001.gwnthq.rst

OK, never mind.

* Corrected (thanks to pitrou) error messages for notify

* Remove extraneous backslash in docstring.

files:
A Misc/NEWS.d/next/Library/2017-08-18-17-16-38.bpo-5001.gwnthq.rst
M Lib/multiprocessing/connection.py
M Lib/multiprocessing/dummy/__init__.py
M Lib/multiprocessing/forkserver.py
M Lib/multiprocessing/heap.py
M Lib/multiprocessing/managers.py
M Lib/multiprocessing/pool.py
M Lib/multiprocessing/popen_fork.py
M Lib/multiprocessing/queues.py
M Lib/multiprocessing/reduction.py
M Lib/multiprocessing/resource_sharer.py
M Lib/multiprocessing/semaphore_tracker.py
M Lib/multiprocessing/spawn.py
M Lib/multiprocessing/synchronize.py
M Lib/multiprocessing/util.py

diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index ba9b17cee1b..7a621a55f46 100644
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -720,7 +720,9 @@ def PipeClient(address):
 
 def deliver_challenge(connection, authkey):
     import hmac
-    assert isinstance(authkey, bytes)
+    if not isinstance(authkey, bytes):
+        raise ValueError(
+            "Authkey must be bytes, not {0!s}".format(type(authkey)))
     message = os.urandom(MESSAGE_LENGTH)
     connection.send_bytes(CHALLENGE + message)
     digest = hmac.new(authkey, message, 'md5').digest()
@@ -733,7 +735,9 @@ def deliver_challenge(connection, authkey):
 
 def answer_challenge(connection, authkey):
     import hmac
-    assert isinstance(authkey, bytes)
+    if not isinstance(authkey, bytes):
+        raise ValueError(
+            "Authkey must be bytes, not {0!s}".format(type(authkey)))
     message = connection.recv_bytes(256)         # reject large message
     assert message[:len(CHALLENGE)] == CHALLENGE, 'message = %r' % message
     message = message[len(CHALLENGE):]
diff --git a/Lib/multiprocessing/dummy/__init__.py b/Lib/multiprocessing/dummy/__init__.py
index cbb7f4909cb..403f5e5198e 100644
--- a/Lib/multiprocessing/dummy/__init__.py
+++ b/Lib/multiprocessing/dummy/__init__.py
@@ -41,7 +41,10 @@ def __init__(self, group=None, target=None, name=None, args=(), kwargs={}):
         self._parent = current_process()
 
     def start(self):
-        assert self._parent is current_process()
+        if self._parent is not current_process():
+            raise RuntimeError(
+                "Parent is {0!r} but current_process is {1!r}".format(
+                    self._parent, current_process()))
         self._start_called = True
         if hasattr(self._parent, '_children'):
             self._parent._children[self] = None
diff --git a/Lib/multiprocessing/forkserver.py b/Lib/multiprocessing/forkserver.py
index 69b842aa939..7a952e2ba69 100644
--- a/Lib/multiprocessing/forkserver.py
+++ b/Lib/multiprocessing/forkserver.py
@@ -189,7 +189,7 @@ def sigchld_handler(*_unused):
 
                 if alive_r in rfds:
                     # EOF because no more client processes left
-                    assert os.read(alive_r, 1) == b''
+                    assert os.read(alive_r, 1) == b'', "Not at EOF?"
                     raise SystemExit
 
                 if sig_r in rfds:
@@ -208,7 +208,10 @@ def sigchld_handler(*_unused):
                             if os.WIFSIGNALED(sts):
                                 returncode = -os.WTERMSIG(sts)
                             else:
-                                assert os.WIFEXITED(sts)
+                                if not os.WIFEXITED(sts):
+                                    raise AssertionError(
+                                        "Child {0:n} status is {1:n}".format(
+                                            pid,sts))
                                 returncode = os.WEXITSTATUS(sts)
                             # Send exit code to client process
                             try:
@@ -227,7 +230,10 @@ def sigchld_handler(*_unused):
                     with listener.accept()[0] as s:
                         # Receive fds from client
                         fds = reduction.recvfds(s, MAXFDS_TO_SEND + 1)
-                        assert len(fds) <= MAXFDS_TO_SEND
+                        if len(fds) > MAXFDS_TO_SEND:
+                            raise RuntimeError(
+                                "Too many ({0:n}) fds to send".format(
+                                    len(fds)))
                         child_r, child_w, *fds = fds
                         s.close()
                         pid = os.fork()
diff --git a/Lib/multiprocessing/heap.py b/Lib/multiprocessing/heap.py
index ee3ed551d0c..566173a1b0a 100644
--- a/Lib/multiprocessing/heap.py
+++ b/Lib/multiprocessing/heap.py
@@ -211,7 +211,10 @@ def free(self, block):
         # synchronously sometimes later from malloc() or free(), by calling
         # _free_pending_blocks() (appending and retrieving from a list is not
         # strictly thread-safe but under cPython it's atomic thanks to the GIL).
-        assert os.getpid() == self._lastpid
+        if os.getpid() != self._lastpid:
+            raise ValueError(
+                "My pid ({0:n}) is not last pid {1:n}".format(
+                    os.getpid(),self._lastpid))
         if not self._lock.acquire(False):
             # can't acquire the lock right now, add the block to the list of
             # pending blocks to free
@@ -227,7 +230,10 @@ def free(self, block):
 
     def malloc(self, size):
         # return a block of right size (possibly rounded up)
-        assert 0 <= size < sys.maxsize
+        if size < 0:
+            raise ValueError("Size {0:n} out of range".format(size))
+        if sys.maxsize <= size:
+            raise OverflowError("Size {0:n} too large".format(size))
         if os.getpid() != self._lastpid:
             self.__init__()                     # reinitialize after fork
         with self._lock:
@@ -250,7 +256,10 @@ class BufferWrapper(object):
     _heap = Heap()
 
     def __init__(self, size):
-        assert 0 <= size < sys.maxsize
+        if size < 0:
+            raise ValueError("Size {0:n} out of range".format(size))
+        if sys.maxsize <= size:
+            raise OverflowError("Size {0:n} too large".format(size))
         block = BufferWrapper._heap.malloc(size)
         self._state = (block, size)
         util.Finalize(self, BufferWrapper._heap.free, args=(block,))
diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index c6722771b05..04df26bac66 100644
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -23,7 +23,7 @@
 from traceback import format_exc
 
 from . import connection
-from .context import reduction, get_spawning_popen
+from .context import reduction, get_spawning_popen, ProcessError
 from . import pool
 from . import process
 from . import util
@@ -133,7 +133,10 @@ class Server(object):
               'debug_info', 'number_of_objects', 'dummy', 'incref', 'decref']
 
     def __init__(self, registry, address, authkey, serializer):
-        assert isinstance(authkey, bytes)
+        if not isinstance(authkey, bytes):
+            raise TypeError(
+                "Authkey {0!r} is type {1!s}, not bytes".format(
+                    authkey, type(authkey)))
         self.registry = registry
         self.authkey = process.AuthenticationString(authkey)
         Listener, Client = listener_client[serializer]
@@ -163,7 +166,7 @@ def serve_forever(self):
             except (KeyboardInterrupt, SystemExit):
                 pass
         finally:
-            if sys.stdout != sys.__stdout__:
+            if sys.stdout != sys.__stdout__: # what about stderr?
                 util.debug('resetting stdout, stderr')
                 sys.stdout = sys.__stdout__
                 sys.stderr = sys.__stderr__
@@ -316,6 +319,7 @@ def debug_info(self, c):
         '''
         Return some info --- useful to spot problems with refcounting
         '''
+        # Perhaps include debug info about 'c'?
         with self.mutex:
             result = []
             keys = list(self.id_to_refcount.keys())
@@ -356,7 +360,9 @@ def create(self, c, typeid, *args, **kwds):
                       self.registry[typeid]
 
             if callable is None:
-                assert len(args) == 1 and not kwds
+                if kwds or (len(args) != 1):
+                    raise ValueError(
+                        "Without callable, must have one non-keyword argument")
                 obj = args[0]
             else:
                 obj = callable(*args, **kwds)
@@ -364,7 +370,10 @@ def create(self, c, typeid, *args, **kwds):
             if exposed is None:
                 exposed = public_methods(obj)
             if method_to_typeid is not None:
-                assert type(method_to_typeid) is dict
+                if not isinstance(method_to_typeid, dict):
+                    raise TypeError(
+                        "Method_to_typeid {0!r}: type {1!s}, not dict".format(
+                            method_to_typeid, type(method_to_typeid)))
                 exposed = list(exposed) + list(method_to_typeid)
 
             ident = '%x' % id(obj)  # convert to string because xmlrpclib
@@ -417,7 +426,11 @@ def decref(self, c, ident):
             return
 
         with self.mutex:
-            assert self.id_to_refcount[ident] >= 1
+            if self.id_to_refcount[ident] <= 0:
+                raise AssertionError(
+                    "Id {0!s} ({1!r}) has refcount {2:n}, not 1+".format(
+                        ident, self.id_to_obj[ident],
+                        self.id_to_refcount[ident]))
             self.id_to_refcount[ident] -= 1
             if self.id_to_refcount[ident] == 0:
                 del self.id_to_refcount[ident]
@@ -480,7 +493,14 @@ def get_server(self):
         '''
         Return server object with serve_forever() method and address attribute
         '''
-        assert self._state.value == State.INITIAL
+        if self._state.value != State.INITIAL:
+            if self._state.value == State.STARTED:
+                raise ProcessError("Already started server")
+            elif self._state.value == State.SHUTDOWN:
+                raise ProcessError("Manager has shut down")
+            else:
+                raise ProcessError(
+                    "Unknown state {!r}".format(self._state.value))
         return Server(self._registry, self._address,
                       self._authkey, self._serializer)
 
@@ -497,7 +517,14 @@ def start(self, initializer=None, initargs=()):
         '''
         Spawn a server process for this manager object
         '''
-        assert self._state.value == State.INITIAL
+        if self._state.value != State.INITIAL:
+            if self._state.value == State.STARTED:
+                raise ProcessError("Already started server")
+            elif self._state.value == State.SHUTDOWN:
+                raise ProcessError("Manager has shut down")
+            else:
+                raise ProcessError(
+                    "Unknown state {!r}".format(self._state.value))
 
         if initializer is not None and not callable(initializer):
             raise TypeError('initializer must be a callable')
@@ -593,7 +620,14 @@ def _number_of_objects(self):
     def __enter__(self):
         if self._state.value == State.INITIAL:
             self.start()
-        assert self._state.value == State.STARTED
+        if self._state.value != State.STARTED:
+            if self._state.value == State.INITIAL:
+                raise ProcessError("Unable to start server")
+            elif self._state.value == State.SHUTDOWN:
+                raise ProcessError("Manager has shut down")
+            else:
+                raise ProcessError(
+                    "Unknown state {!r}".format(self._state.value))
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
@@ -653,7 +687,7 @@ def register(cls, typeid, callable=None, proxytype=None, exposed=None,
                            getattr(proxytype, '_method_to_typeid_', None)
 
         if method_to_typeid:
-            for key, value in list(method_to_typeid.items()):
+            for key, value in list(method_to_typeid.items()): # isinstance?
                 assert type(key) is str, '%r is not a string' % key
                 assert type(value) is str, '%r is not a string' % value
 
diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py
index c2364ab186c..e457f0a576f 100644
--- a/Lib/multiprocessing/pool.py
+++ b/Lib/multiprocessing/pool.py
@@ -92,7 +92,9 @@ def __repr__(self):
 
 def worker(inqueue, outqueue, initializer=None, initargs=(), maxtasks=None,
            wrap_exception=False):
-    assert maxtasks is None or (type(maxtasks) == int and maxtasks > 0)
+    if (maxtasks is not None) and not (isinstance(maxtasks, int)
+                                       and maxtasks >= 1):
+        raise AssertionError("Maxtasks {!r} is not valid".format(maxtasks))
     put = outqueue.put
     get = inqueue.get
     if hasattr(inqueue, '_writer'):
@@ -254,8 +256,8 @@ def _setup_queues(self):
     def apply(self, func, args=(), kwds={}):
         '''
         Equivalent of `func(*args, **kwds)`.
+        Pool must be running.
         '''
-        assert self._state == RUN
         return self.apply_async(func, args, kwds).get()
 
     def map(self, func, iterable, chunksize=None):
@@ -307,6 +309,10 @@ def imap(self, func, iterable, chunksize=1):
                 ))
             return result
         else:
+            if chunksize < 1:
+                raise ValueError(
+                    "Chunksize must be 1+, not {0:n}".format(
+                        chunksize))
             assert chunksize > 1
             task_batches = Pool._get_tasks(func, iterable, chunksize)
             result = IMapIterator(self._cache)
@@ -334,7 +340,9 @@ def imap_unordered(self, func, iterable, chunksize=1):
                 ))
             return result
         else:
-            assert chunksize > 1
+            if chunksize < 1:
+                raise ValueError(
+                    "Chunksize must be 1+, not {0!r}".format(chunksize))
             task_batches = Pool._get_tasks(func, iterable, chunksize)
             result = IMapUnorderedIterator(self._cache)
             self._taskqueue.put(
@@ -466,7 +474,7 @@ def _handle_results(outqueue, get, cache):
                 return
 
             if thread._state:
-                assert thread._state == TERMINATE
+                assert thread._state == TERMINATE, "Thread not in TERMINATE"
                 util.debug('result handler found thread._state=TERMINATE')
                 break
 
@@ -542,7 +550,10 @@ def terminate(self):
 
     def join(self):
         util.debug('joining pool')
-        assert self._state in (CLOSE, TERMINATE)
+        if self._state == RUN:
+            raise ValueError("Pool is still running")
+        elif self._state not in (CLOSE, TERMINATE):
+            raise ValueError("In unknown state")
         self._worker_handler.join()
         self._task_handler.join()
         self._result_handler.join()
@@ -570,7 +581,9 @@ def _terminate_pool(cls, taskqueue, inqueue, outqueue, pool,
         util.debug('helping task handler/workers to finish')
         cls._help_stuff_finish(inqueue, task_handler, len(pool))
 
-        assert result_handler.is_alive() or len(cache) == 0
+        if (not result_handler.is_alive()) and (len(cache) != 0):
+            raise AssertionError(
+                "Cannot have cache with result_hander not alive")
 
         result_handler._state = TERMINATE
         outqueue.put(None)                  # sentinel
@@ -628,7 +641,8 @@ def ready(self):
         return self._event.is_set()
 
     def successful(self):
-        assert self.ready()
+        if not self.ready():
+            raise ValueError("{0!r} not ready".format(self))
         return self._success
 
     def wait(self, timeout=None):
diff --git a/Lib/multiprocessing/popen_fork.py b/Lib/multiprocessing/popen_fork.py
index 44ce9a9e79b..cbdbfa79cf3 100644
--- a/Lib/multiprocessing/popen_fork.py
+++ b/Lib/multiprocessing/popen_fork.py
@@ -35,7 +35,7 @@ def poll(self, flag=os.WNOHANG):
                 if os.WIFSIGNALED(sts):
                     self.returncode = -os.WTERMSIG(sts)
                 else:
-                    assert os.WIFEXITED(sts)
+                    assert os.WIFEXITED(sts), "Status is {:n}".format(sts)
                     self.returncode = os.WEXITSTATUS(sts)
         return self.returncode
 
diff --git a/Lib/multiprocessing/queues.py b/Lib/multiprocessing/queues.py
index 513807cafec..328efbd95fe 100644
--- a/Lib/multiprocessing/queues.py
+++ b/Lib/multiprocessing/queues.py
@@ -78,7 +78,7 @@ def _after_fork(self):
         self._poll = self._reader.poll
 
     def put(self, obj, block=True, timeout=None):
-        assert not self._closed
+        assert not self._closed, "Queue {0!r} has been closed".format(self)
         if not self._sem.acquire(block, timeout):
             raise Full
 
@@ -140,7 +140,7 @@ def close(self):
 
     def join_thread(self):
         debug('Queue.join_thread()')
-        assert self._closed
+        assert self._closed, "Queue {0!r} not closed".format(self)
         if self._jointhread:
             self._jointhread()
 
@@ -281,7 +281,7 @@ def __setstate__(self, state):
         self._cond, self._unfinished_tasks = state[-2:]
 
     def put(self, obj, block=True, timeout=None):
-        assert not self._closed
+        assert not self._closed, "Queue {0!r} is closed".format(self)
         if not self._sem.acquire(block, timeout):
             raise Full
 
diff --git a/Lib/multiprocessing/reduction.py b/Lib/multiprocessing/reduction.py
index 7f65947379f..deca19ccad7 100644
--- a/Lib/multiprocessing/reduction.py
+++ b/Lib/multiprocessing/reduction.py
@@ -165,7 +165,10 @@ def recvfds(sock, size):
                 if len(cmsg_data) % a.itemsize != 0:
                     raise ValueError
                 a.frombytes(cmsg_data)
-                assert len(a) % 256 == msg[0]
+                if len(a) % 256 != msg[0]:
+                    raise AssertionError(
+                        "Len is {0:n} but msg[0] is {1!r}".format(
+                            len(a), msg[0]))
                 return list(a)
         except (ValueError, IndexError):
             pass
diff --git a/Lib/multiprocessing/resource_sharer.py b/Lib/multiprocessing/resource_sharer.py
index e44a728fa9a..6d99da102ff 100644
--- a/Lib/multiprocessing/resource_sharer.py
+++ b/Lib/multiprocessing/resource_sharer.py
@@ -125,7 +125,7 @@ def _afterfork(self):
 
     def _start(self):
         from .connection import Listener
-        assert self._listener is None
+        assert self._listener is None, "Already have Listener"
         util.debug('starting listener and thread for sending handles')
         self._listener = Listener(authkey=process.current_process().authkey)
         self._address = self._listener.address
diff --git a/Lib/multiprocessing/semaphore_tracker.py b/Lib/multiprocessing/semaphore_tracker.py
index de7738eeee8..d5f259c246b 100644
--- a/Lib/multiprocessing/semaphore_tracker.py
+++ b/Lib/multiprocessing/semaphore_tracker.py
@@ -80,7 +80,8 @@ def _send(self, cmd, name):
             # bytes are atomic, and that PIPE_BUF >= 512
             raise ValueError('name too long')
         nbytes = os.write(self._fd, msg)
-        assert nbytes == len(msg)
+        assert nbytes == len(msg), "nbytes {0:n} but len(msg) {1:n}".format(
+            nbytes, len(msg))
 
 
 _semaphore_tracker = SemaphoreTracker()
diff --git a/Lib/multiprocessing/spawn.py b/Lib/multiprocessing/spawn.py
index 4aba372e48e..1f4f3f496f5 100644
--- a/Lib/multiprocessing/spawn.py
+++ b/Lib/multiprocessing/spawn.py
@@ -93,7 +93,7 @@ def spawn_main(pipe_handle, parent_pid=None, tracker_fd=None):
     '''
     Run code specified by data received over pipe
     '''
-    assert is_forking(sys.argv)
+    assert is_forking(sys.argv), "Not forking"
     if sys.platform == 'win32':
         import msvcrt
         new_handle = reduction.steal_handle(parent_pid, pipe_handle)
diff --git a/Lib/multiprocessing/synchronize.py b/Lib/multiprocessing/synchronize.py
index 0590ed68f53..038f73f6b76 100644
--- a/Lib/multiprocessing/synchronize.py
+++ b/Lib/multiprocessing/synchronize.py
@@ -270,13 +270,16 @@ def wait(self, timeout=None):
 
     def notify(self, n=1):
         assert self._lock._semlock._is_mine(), 'lock is not owned'
-        assert not self._wait_semaphore.acquire(False)
+        assert not self._wait_semaphore.acquire(
+            False), ('notify: Should not have been able to acquire'
+                     + '_wait_semaphore')
 
         # to take account of timeouts since last notify*() we subtract
         # woken_count from sleeping_count and rezero woken_count
         while self._woken_count.acquire(False):
             res = self._sleeping_count.acquire(False)
-            assert res
+            assert res, ('notify: Bug in sleeping_count.acquire'
+                         + '- res should not be False')
 
         sleepers = 0
         while sleepers < n and self._sleeping_count.acquire(False):
diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
index b490caa7e64..f0827f0a969 100644
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -149,12 +149,15 @@ class Finalize(object):
     Class which supports object finalization using weakrefs
     '''
     def __init__(self, obj, callback, args=(), kwargs=None, exitpriority=None):
-        assert exitpriority is None or type(exitpriority) is int
+        if (exitpriority is not None) and not isinstance(exitpriority,int):
+            raise TypeError(
+                "Exitpriority ({0!r}) must be None or int, not {1!s}".format(
+                    exitpriority, type(exitpriority)))
 
         if obj is not None:
             self._weakref = weakref.ref(obj, self)
-        else:
-            assert exitpriority is not None
+        elif exitpriority is None:
+            raise ValueError("Without object, exitpriority cannot be None")
 
         self._callback = callback
         self._args = args
diff --git a/Misc/NEWS.d/next/Library/2017-08-18-17-16-38.bpo-5001.gwnthq.rst b/Misc/NEWS.d/next/Library/2017-08-18-17-16-38.bpo-5001.gwnthq.rst
new file mode 100644
index 00000000000..640b801c9b3
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-18-17-16-38.bpo-5001.gwnthq.rst
@@ -0,0 +1 @@
+Many asserts in `multiprocessing` are now more informative, and some error types have been changed to more specific ones.


From webhook-mailer at python.org  Wed Aug 30 00:59:16 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Wed, 30 Aug 2017 04:59:16 -0000
Subject: [Python-checkins] bpo-31051: Rearrange IDLE condigdialog GenPage
 into Window, Editor, and Help sections. (#3239)
Message-ID: <mailman.135.1504069157.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/390eadd6d041611511dc761bc7d4581530dbd287
commit: 390eadd6d041611511dc761bc7d4581530dbd287
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-30T00:59:11-04:00
summary:

bpo-31051:  Rearrange IDLE condigdialog GenPage into Window, Editor, and Help sections. (#3239)

files:
A Misc/NEWS.d/next/IDLE/2017-08-30-00-06-58.bpo-31051.50Jp_Q.rst
M Lib/idlelib/configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 8afc9e6d692..4ef6197e714 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -1739,20 +1739,22 @@ def create_page_general(self):
         rewrite changes['main']['HelpFiles'].
 
         Widgets for GenPage(Frame):  (*) widgets bound to self
-            frame_run: LabelFrame
-                startup_title: Label
-                (*)startup_editor_on: Radiobutton - startup_edit
-                (*)startup_shell_on: Radiobutton - startup_edit
-            frame_save: LabelFrame
-                run_save_title: Label
-                (*)save_ask_on: Radiobutton - autosave
-                (*)save_auto_on: Radiobutton - autosave
-            frame_win_size: LabelFrame
-                win_size_title: Label
-                win_width_title: Label
-                (*)win_width_int: Entry - win_width
-                win_height_title: Label
-                (*)win_height_int: Entry - win_height
+            frame_window: LabelFrame
+                frame_run: Frame
+                    startup_title: Label
+                    (*)startup_editor_on: Radiobutton - startup_edit
+                    (*)startup_shell_on: Radiobutton - startup_edit
+                frame_win_size: Frame
+                    win_size_title: Label
+                    win_width_title: Label
+                    (*)win_width_int: Entry - win_width
+                    win_height_title: Label
+                    (*)win_height_int: Entry - win_height
+            frame_editor: LabelFrame
+                frame_save: Frame
+                    run_save_title: Label
+                    (*)save_ask_on: Radiobutton - autosave
+                    (*)save_auto_on: Radiobutton - autosave
             frame_help: LabelFrame
                 frame_helplist: Frame
                     frame_helplist_buttons: Frame
@@ -1771,16 +1773,15 @@ def create_page_general(self):
         self.win_height = tracers.add(
                 StringVar(self), ('main', 'EditorWindow', 'height'))
 
-        # Create widgets:
         # Section frames.
-        frame_run = LabelFrame(self, borderwidth=2, relief=GROOVE,
-                              text=' Startup Preferences ')
-        frame_save = LabelFrame(self, borderwidth=2, relief=GROOVE,
-                               text=' autosave Preferences ')
-        frame_win_size = Frame(self, borderwidth=2, relief=GROOVE)
+        frame_window = LabelFrame(self, borderwidth=2, relief=GROOVE,
+                                  text=' Window Preferences')
+        frame_editor = LabelFrame(self, borderwidth=2, relief=GROOVE,
+                                  text=' Editor Preferences')
         frame_help = LabelFrame(self, borderwidth=2, relief=GROOVE,
                                text=' Additional Help Sources ')
-        # frame_run.
+        # Frame_window.
+        frame_run = Frame(frame_window, borderwidth=0)
         startup_title = Label(frame_run, text='At Startup')
         self.startup_editor_on = Radiobutton(
                 frame_run, variable=self.startup_edit, value=1,
@@ -1788,15 +1789,8 @@ def create_page_general(self):
         self.startup_shell_on = Radiobutton(
                 frame_run, variable=self.startup_edit, value=0,
                 text='Open Shell Window')
-        # frame_save.
-        run_save_title = Label(frame_save, text='At Start of Run (F5)  ')
-        self.save_ask_on = Radiobutton(
-                frame_save, variable=self.autosave, value=0,
-                text="Prompt to Save")
-        self.save_auto_on = Radiobutton(
-                frame_save, variable=self.autosave, value=1,
-                text='No Prompt')
-        # frame_win_size.
+
+        frame_win_size = Frame(frame_window, borderwidth=0,)
         win_size_title = Label(
                 frame_win_size, text='Initial Window Size  (in characters)')
         win_width_title = Label(frame_win_size, text='Width')
@@ -1805,6 +1799,17 @@ def create_page_general(self):
         win_height_title = Label(frame_win_size, text='Height')
         self.win_height_int = Entry(
                 frame_win_size, textvariable=self.win_height, width=3)
+
+        # Frame_editor.
+        frame_save = Frame(frame_editor, borderwidth=0)
+        run_save_title = Label(frame_save, text='At Start of Run (F5)  ')
+        self.save_ask_on = Radiobutton(
+                frame_save, variable=self.autosave, value=0,
+                text="Prompt to Save")
+        self.save_auto_on = Radiobutton(
+                frame_save, variable=self.autosave, value=1,
+                text='No Prompt')
+
         # frame_help.
         frame_helplist = Frame(frame_help)
         frame_helplist_buttons = Frame(frame_helplist)
@@ -1826,25 +1831,27 @@ def create_page_general(self):
                 width=8, command=self.helplist_item_remove)
 
         # Pack widgets:
-        # body.
-        frame_run.pack(side=TOP, padx=5, pady=5, fill=X)
-        frame_save.pack(side=TOP, padx=5, pady=5, fill=X)
-        frame_win_size.pack(side=TOP, padx=5, pady=5, fill=X)
+        # Body.
+        frame_window.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
+        frame_editor.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
         frame_help.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
         # frame_run.
+        frame_run.pack(side=TOP, padx=5, pady=0, fill=X)
         startup_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
         self.startup_shell_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
         self.startup_editor_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
-        # frame_save.
-        run_save_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
-        self.save_auto_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
-        self.save_ask_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
         # frame_win_size.
+        frame_win_size.pack(side=TOP, padx=5, pady=0, fill=X)
         win_size_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
         self.win_height_int.pack(side=RIGHT, anchor=E, padx=10, pady=5)
         win_height_title.pack(side=RIGHT, anchor=E, pady=5)
         self.win_width_int.pack(side=RIGHT, anchor=E, padx=10, pady=5)
         win_width_title.pack(side=RIGHT, anchor=E, pady=5)
+        # frame_save.
+        frame_save.pack(side=TOP, padx=5, pady=0, fill=X)
+        run_save_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
+        self.save_auto_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
+        self.save_ask_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
         # frame_help.
         frame_helplist_buttons.pack(side=RIGHT, padx=5, pady=5, fill=Y)
         frame_helplist.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-30-00-06-58.bpo-31051.50Jp_Q.rst b/Misc/NEWS.d/next/IDLE/2017-08-30-00-06-58.bpo-31051.50Jp_Q.rst
new file mode 100644
index 00000000000..fe515911b0d
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-30-00-06-58.bpo-31051.50Jp_Q.rst
@@ -0,0 +1 @@
+Rearrange IDLE condigdialog GenPage into Window, Editor, and Help sections.


From webhook-mailer at python.org  Wed Aug 30 02:47:30 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Wed, 30 Aug 2017 06:47:30 -0000
Subject: [Python-checkins] [3.6] bpo-31051: Rearrange IDLE condigdialog
 GenPage into Window, Editor, and Help sections. (GH-3239) (#3240)
Message-ID: <mailman.136.1504075654.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/87c50245b1ba21469cc2e4e84cd5e5cd54ff954d
commit: 87c50245b1ba21469cc2e4e84cd5e5cd54ff954d
branch: 3.6
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-30T02:47:24-04:00
summary:

[3.6] bpo-31051:  Rearrange IDLE condigdialog GenPage into Window, Editor, and Help sections. (GH-3239) (#3240)

(cherry picked from commit 390ead)

files:
A Misc/NEWS.d/next/IDLE/2017-08-30-00-06-58.bpo-31051.50Jp_Q.rst
M Lib/idlelib/configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 8afc9e6d692..4ef6197e714 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -1739,20 +1739,22 @@ def create_page_general(self):
         rewrite changes['main']['HelpFiles'].
 
         Widgets for GenPage(Frame):  (*) widgets bound to self
-            frame_run: LabelFrame
-                startup_title: Label
-                (*)startup_editor_on: Radiobutton - startup_edit
-                (*)startup_shell_on: Radiobutton - startup_edit
-            frame_save: LabelFrame
-                run_save_title: Label
-                (*)save_ask_on: Radiobutton - autosave
-                (*)save_auto_on: Radiobutton - autosave
-            frame_win_size: LabelFrame
-                win_size_title: Label
-                win_width_title: Label
-                (*)win_width_int: Entry - win_width
-                win_height_title: Label
-                (*)win_height_int: Entry - win_height
+            frame_window: LabelFrame
+                frame_run: Frame
+                    startup_title: Label
+                    (*)startup_editor_on: Radiobutton - startup_edit
+                    (*)startup_shell_on: Radiobutton - startup_edit
+                frame_win_size: Frame
+                    win_size_title: Label
+                    win_width_title: Label
+                    (*)win_width_int: Entry - win_width
+                    win_height_title: Label
+                    (*)win_height_int: Entry - win_height
+            frame_editor: LabelFrame
+                frame_save: Frame
+                    run_save_title: Label
+                    (*)save_ask_on: Radiobutton - autosave
+                    (*)save_auto_on: Radiobutton - autosave
             frame_help: LabelFrame
                 frame_helplist: Frame
                     frame_helplist_buttons: Frame
@@ -1771,16 +1773,15 @@ def create_page_general(self):
         self.win_height = tracers.add(
                 StringVar(self), ('main', 'EditorWindow', 'height'))
 
-        # Create widgets:
         # Section frames.
-        frame_run = LabelFrame(self, borderwidth=2, relief=GROOVE,
-                              text=' Startup Preferences ')
-        frame_save = LabelFrame(self, borderwidth=2, relief=GROOVE,
-                               text=' autosave Preferences ')
-        frame_win_size = Frame(self, borderwidth=2, relief=GROOVE)
+        frame_window = LabelFrame(self, borderwidth=2, relief=GROOVE,
+                                  text=' Window Preferences')
+        frame_editor = LabelFrame(self, borderwidth=2, relief=GROOVE,
+                                  text=' Editor Preferences')
         frame_help = LabelFrame(self, borderwidth=2, relief=GROOVE,
                                text=' Additional Help Sources ')
-        # frame_run.
+        # Frame_window.
+        frame_run = Frame(frame_window, borderwidth=0)
         startup_title = Label(frame_run, text='At Startup')
         self.startup_editor_on = Radiobutton(
                 frame_run, variable=self.startup_edit, value=1,
@@ -1788,15 +1789,8 @@ def create_page_general(self):
         self.startup_shell_on = Radiobutton(
                 frame_run, variable=self.startup_edit, value=0,
                 text='Open Shell Window')
-        # frame_save.
-        run_save_title = Label(frame_save, text='At Start of Run (F5)  ')
-        self.save_ask_on = Radiobutton(
-                frame_save, variable=self.autosave, value=0,
-                text="Prompt to Save")
-        self.save_auto_on = Radiobutton(
-                frame_save, variable=self.autosave, value=1,
-                text='No Prompt')
-        # frame_win_size.
+
+        frame_win_size = Frame(frame_window, borderwidth=0,)
         win_size_title = Label(
                 frame_win_size, text='Initial Window Size  (in characters)')
         win_width_title = Label(frame_win_size, text='Width')
@@ -1805,6 +1799,17 @@ def create_page_general(self):
         win_height_title = Label(frame_win_size, text='Height')
         self.win_height_int = Entry(
                 frame_win_size, textvariable=self.win_height, width=3)
+
+        # Frame_editor.
+        frame_save = Frame(frame_editor, borderwidth=0)
+        run_save_title = Label(frame_save, text='At Start of Run (F5)  ')
+        self.save_ask_on = Radiobutton(
+                frame_save, variable=self.autosave, value=0,
+                text="Prompt to Save")
+        self.save_auto_on = Radiobutton(
+                frame_save, variable=self.autosave, value=1,
+                text='No Prompt')
+
         # frame_help.
         frame_helplist = Frame(frame_help)
         frame_helplist_buttons = Frame(frame_helplist)
@@ -1826,25 +1831,27 @@ def create_page_general(self):
                 width=8, command=self.helplist_item_remove)
 
         # Pack widgets:
-        # body.
-        frame_run.pack(side=TOP, padx=5, pady=5, fill=X)
-        frame_save.pack(side=TOP, padx=5, pady=5, fill=X)
-        frame_win_size.pack(side=TOP, padx=5, pady=5, fill=X)
+        # Body.
+        frame_window.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
+        frame_editor.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
         frame_help.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
         # frame_run.
+        frame_run.pack(side=TOP, padx=5, pady=0, fill=X)
         startup_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
         self.startup_shell_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
         self.startup_editor_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
-        # frame_save.
-        run_save_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
-        self.save_auto_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
-        self.save_ask_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
         # frame_win_size.
+        frame_win_size.pack(side=TOP, padx=5, pady=0, fill=X)
         win_size_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
         self.win_height_int.pack(side=RIGHT, anchor=E, padx=10, pady=5)
         win_height_title.pack(side=RIGHT, anchor=E, pady=5)
         self.win_width_int.pack(side=RIGHT, anchor=E, padx=10, pady=5)
         win_width_title.pack(side=RIGHT, anchor=E, pady=5)
+        # frame_save.
+        frame_save.pack(side=TOP, padx=5, pady=0, fill=X)
+        run_save_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
+        self.save_auto_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
+        self.save_ask_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
         # frame_help.
         frame_helplist_buttons.pack(side=RIGHT, padx=5, pady=5, fill=Y)
         frame_helplist.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-30-00-06-58.bpo-31051.50Jp_Q.rst b/Misc/NEWS.d/next/IDLE/2017-08-30-00-06-58.bpo-31051.50Jp_Q.rst
new file mode 100644
index 00000000000..fe515911b0d
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-30-00-06-58.bpo-31051.50Jp_Q.rst
@@ -0,0 +1 @@
+Rearrange IDLE condigdialog GenPage into Window, Editor, and Help sections.


From webhook-mailer at python.org  Wed Aug 30 05:01:13 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Wed, 30 Aug 2017 09:01:13 -0000
Subject: [Python-checkins] bpo-30581: Windows: os.cpu_count() returns wrong
 number of processors (#2934)
Message-ID: <mailman.137.1504083675.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/c67bae04780f9d7590f9f91b4ee5f31c5d75b3c3
commit: c67bae04780f9d7590f9f91b4ee5f31c5d75b3c3
branch: master
author: Christopher Wilcox <git at crwilcox.com>
committer: Antoine Pitrou <pitrou at free.fr>
date: 2017-08-30T11:01:08+02:00
summary:

bpo-30581: Windows: os.cpu_count() returns wrong number of processors (#2934)

* Fixes #30581 by adding a path to use newer GetMaximumProcessorCount API on Windows calls to os.cpu_count()

* Add NEWS.d entry for bpo-30581, os.cpu_count on Windows.

* Tweak NEWS entry

files:
A Misc/NEWS.d/next/Windows/2017-08-04-10-05-19.bpo-30581.OQhR7l.rst
M Modules/posixmodule.c

diff --git a/Misc/NEWS.d/next/Windows/2017-08-04-10-05-19.bpo-30581.OQhR7l.rst b/Misc/NEWS.d/next/Windows/2017-08-04-10-05-19.bpo-30581.OQhR7l.rst
new file mode 100644
index 00000000000..6591fa0df00
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2017-08-04-10-05-19.bpo-30581.OQhR7l.rst
@@ -0,0 +1,2 @@
+os.cpu_count() now returns the correct number of processors on Windows
+when the number of logical processors is greater than 64.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index f0577874334..e8138d5d3c3 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -11174,9 +11174,22 @@ os_cpu_count_impl(PyObject *module)
 {
     int ncpu = 0;
 #ifdef MS_WINDOWS
-    SYSTEM_INFO sysinfo;
-    GetSystemInfo(&sysinfo);
-    ncpu = sysinfo.dwNumberOfProcessors;
+    /* Vista is supported and the GetMaximumProcessorCount API is Win7+
+       Need to fallback to Vista behavior if this call isn't present */
+    HINSTANCE hKernel32;
+    hKernel32 = GetModuleHandleW(L"KERNEL32");
+
+    static DWORD(CALLBACK *_GetMaximumProcessorCount)(WORD) = NULL;
+    *(FARPROC*)&_GetMaximumProcessorCount = GetProcAddress(hKernel32,
+        "GetMaximumProcessorCount");
+    if (_GetMaximumProcessorCount != NULL) {
+        ncpu = _GetMaximumProcessorCount(ALL_PROCESSOR_GROUPS);
+    }
+    else {
+        SYSTEM_INFO sysinfo;
+        GetSystemInfo(&sysinfo);
+        ncpu = sysinfo.dwNumberOfProcessors;
+    }
 #elif defined(__hpux)
     ncpu = mpctl(MPC_GETNUMSPUS, NULL, NULL);
 #elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)


From solipsis at pitrou.net  Wed Aug 30 05:05:42 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 30 Aug 2017 09:05:42 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=11
Message-ID: <20170830090540.26166.B787FDC7E967BCEF@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_collections leaked [0, 0, 7] memory blocks, sum=7
test_functools leaked [0, 3, 1] memory blocks, sum=4


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogdxNLxz', '--timeout', '7200']

From webhook-mailer at python.org  Wed Aug 30 05:40:08 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Wed, 30 Aug 2017 09:40:08 -0000
Subject: [Python-checkins] [3.6] bpo-10746: Fix ctypes PEP 3118 type codes
 for c_long, c_bool, c_int (GH-31) (#3241)
Message-ID: <mailman.138.1504086009.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/2d1653aa43cf02e6b74f9d4f178fac9969a293e2
commit: 2d1653aa43cf02e6b74f9d4f178fac9969a293e2
branch: 3.6
author: Pauli Virtanen <pav at iki.fi>
committer: Antoine Pitrou <pitrou at free.fr>
date: 2017-08-30T11:40:05+02:00
summary:

[3.6] bpo-10746: Fix ctypes PEP 3118 type codes for c_long, c_bool, c_int (GH-31) (#3241)

Ctypes currently produces wrong pep3118 type codes for several types.
E.g. memoryview(ctypes.c_long()).format gives "<l" on 64-bit platforms,
but it should be "<q" instead for sizeof(c_long) == 8

The problem is that the '<>' endian specification in the struct syntax
also turns on the "standard size" mode, which makes type characters have
a platform-independent meaning, which does not match with the codes used
internally in ctypes.  The struct module format syntax also does not
allow specifying native-size non-native-endian items.

This commit adds a converter function that maps the internal ctypes
codes to appropriate struct module standard-size codes in the pep3118
format strings. The tests are modified to check for this.
(cherry picked from commit 07f1658aa09f6798793c473c72b2951b7fefe220)

files:
A Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst
M Lib/ctypes/test/test_pep3118.py
M Modules/_ctypes/_ctypes.c

diff --git a/Lib/ctypes/test/test_pep3118.py b/Lib/ctypes/test/test_pep3118.py
index d68397ea802..f3c0e23e53e 100644
--- a/Lib/ctypes/test/test_pep3118.py
+++ b/Lib/ctypes/test/test_pep3118.py
@@ -112,6 +112,34 @@ class Complete(Structure):
 # This table contains format strings as they look on little endian
 # machines.  The test replaces '<' with '>' on big endian machines.
 #
+
+# Platform-specific type codes
+s_bool = {1: '?', 2: 'H', 4: 'L', 8: 'Q'}[sizeof(c_bool)]
+s_short = {2: 'h', 4: 'l', 8: 'q'}[sizeof(c_short)]
+s_ushort = {2: 'H', 4: 'L', 8: 'Q'}[sizeof(c_ushort)]
+s_int = {2: 'h', 4: 'i', 8: 'q'}[sizeof(c_int)]
+s_uint = {2: 'H', 4: 'I', 8: 'Q'}[sizeof(c_uint)]
+s_long = {4: 'l', 8: 'q'}[sizeof(c_long)]
+s_ulong = {4: 'L', 8: 'Q'}[sizeof(c_ulong)]
+s_longlong = "q"
+s_ulonglong = "Q"
+s_float = "f"
+s_double = "d"
+s_longdouble = "g"
+
+# Alias definitions in ctypes/__init__.py
+if c_int is c_long:
+    s_int = s_long
+if c_uint is c_ulong:
+    s_uint = s_ulong
+if c_longlong is c_long:
+    s_longlong = s_long
+if c_ulonglong is c_ulong:
+    s_ulonglong = s_ulong
+if c_longdouble is c_double:
+    s_longdouble = s_double
+
+
 native_types = [
     # type                      format                  shape           calc itemsize
 
@@ -120,52 +148,51 @@ class Complete(Structure):
     (c_char,                    "<c",                   (),           c_char),
     (c_byte,                    "<b",                   (),           c_byte),
     (c_ubyte,                   "<B",                   (),           c_ubyte),
-    (c_short,                   "<h",                   (),           c_short),
-    (c_ushort,                  "<H",                   (),           c_ushort),
+    (c_short,                   "<" + s_short,          (),           c_short),
+    (c_ushort,                  "<" + s_ushort,         (),           c_ushort),
 
-    # c_int and c_uint may be aliases to c_long
-    #(c_int,                     "<i",                   (),           c_int),
-    #(c_uint,                    "<I",                   (),           c_uint),
+    (c_int,                     "<" + s_int,            (),           c_int),
+    (c_uint,                    "<" + s_uint,           (),           c_uint),
 
-    (c_long,                    "<l",                   (),           c_long),
-    (c_ulong,                   "<L",                   (),           c_ulong),
+    (c_long,                    "<" + s_long,           (),           c_long),
+    (c_ulong,                   "<" + s_ulong,          (),           c_ulong),
 
-    # c_longlong and c_ulonglong are aliases on 64-bit platforms
-    #(c_longlong,                "<q",                   None,           c_longlong),
-    #(c_ulonglong,               "<Q",                   None,           c_ulonglong),
+    (c_longlong,                "<" + s_longlong,       (),           c_longlong),
+    (c_ulonglong,               "<" + s_ulonglong,      (),           c_ulonglong),
 
     (c_float,                   "<f",                   (),           c_float),
     (c_double,                  "<d",                   (),           c_double),
-    # c_longdouble may be an alias to c_double
 
-    (c_bool,                    "<?",                   (),           c_bool),
+    (c_longdouble,              "<" + s_longdouble,     (),           c_longdouble),
+
+    (c_bool,                    "<" + s_bool,           (),           c_bool),
     (py_object,                 "<O",                   (),           py_object),
 
     ## pointers
 
     (POINTER(c_byte),           "&<b",                  (),           POINTER(c_byte)),
-    (POINTER(POINTER(c_long)),  "&&<l",                 (),           POINTER(POINTER(c_long))),
+    (POINTER(POINTER(c_long)),  "&&<" + s_long,         (),           POINTER(POINTER(c_long))),
 
     ## arrays and pointers
 
     (c_double * 4,              "<d",                   (4,),           c_double),
     (c_float * 4 * 3 * 2,       "<f",                   (2,3,4),        c_float),
-    (POINTER(c_short) * 2,      "&<h",                  (2,),           POINTER(c_short)),
-    (POINTER(c_short) * 2 * 3,  "&<h",                  (3,2,),         POINTER(c_short)),
-    (POINTER(c_short * 2),      "&(2)<h",               (),           POINTER(c_short)),
+    (POINTER(c_short) * 2,      "&<" + s_short,         (2,),           POINTER(c_short)),
+    (POINTER(c_short) * 2 * 3,  "&<" + s_short,         (3,2,),         POINTER(c_short)),
+    (POINTER(c_short * 2),      "&(2)<" + s_short,      (),             POINTER(c_short)),
 
     ## structures and unions
 
-    (Point,                     "T{<l:x:<l:y:}",        (),           Point),
+    (Point,                     "T{<l:x:<l:y:}".replace('l', s_long),  (),  Point),
     # packed structures do not implement the pep
-    (PackedPoint,               "B",                    (),           PackedPoint),
-    (Point2,                    "T{<l:x:<l:y:}",        (),           Point2),
-    (EmptyStruct,               "T{}",                  (),           EmptyStruct),
+    (PackedPoint,               "B",                                   (),  PackedPoint),
+    (Point2,                    "T{<l:x:<l:y:}".replace('l', s_long),  (),  Point2),
+    (EmptyStruct,               "T{}",                                 (),  EmptyStruct),
     # the pep does't support unions
-    (aUnion,                    "B",                    (),           aUnion),
+    (aUnion,                    "B",                                   (),  aUnion),
     # structure with sub-arrays
-    (StructWithArrays,          "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}", (),  StructWithArrays),
-    (StructWithArrays * 3,      "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}", (3,),  StructWithArrays),
+    (StructWithArrays, "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}".replace('l', s_long), (), StructWithArrays),
+    (StructWithArrays * 3, "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}".replace('l', s_long), (3,), StructWithArrays),
 
     ## pointer to incomplete structure
     (Incomplete,                "B",                    (),           Incomplete),
@@ -173,7 +200,7 @@ class Complete(Structure):
 
     # 'Complete' is a structure that starts incomplete, but is completed after the
     # pointer type to it has been created.
-    (Complete,                  "T{<l:a:}",             (),           Complete),
+    (Complete,                  "T{<l:a:}".replace('l', s_long), (), Complete),
     # Unfortunately the pointer format string is not fixed...
     (POINTER(Complete),         "&B",                   (),           POINTER(Complete)),
 
@@ -196,10 +223,10 @@ class LEPoint(LittleEndianStructure):
 # and little endian machines.
 #
 endian_types = [
-    (BEPoint,                   "T{>l:x:>l:y:}",        (),           BEPoint),
-    (LEPoint,                   "T{<l:x:<l:y:}",        (),           LEPoint),
-    (POINTER(BEPoint),          "&T{>l:x:>l:y:}",       (),           POINTER(BEPoint)),
-    (POINTER(LEPoint),          "&T{<l:x:<l:y:}",       (),           POINTER(LEPoint)),
+    (BEPoint, "T{>l:x:>l:y:}".replace('l', s_long), (), BEPoint),
+    (LEPoint, "T{<l:x:<l:y:}".replace('l', s_long), (), LEPoint),
+    (POINTER(BEPoint), "&T{>l:x:>l:y:}".replace('l', s_long), (), POINTER(BEPoint)),
+    (POINTER(LEPoint), "&T{<l:x:<l:y:}".replace('l', s_long), (), POINTER(LEPoint)),
     ]
 
 if __name__ == "__main__":
diff --git a/Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst b/Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst
new file mode 100644
index 00000000000..e7625631002
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst
@@ -0,0 +1 @@
+Fix ctypes producing wrong PEP 3118 type codes for integer types.
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 12234e254e1..2c01e374f19 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -250,6 +250,71 @@ PyDict_GetItemProxy(PyObject *dict, PyObject *key)
 }
 
 /******************************************************************/
+
+/*
+  Allocate a memory block for a pep3118 format string, filled with
+  a suitable PEP 3118 type code corresponding to the given ctypes
+  type. Returns NULL on failure, with the error indicator set.
+
+  This produces type codes in the standard size mode (cf. struct module),
+  since the endianness may need to be swapped to a non-native one
+  later on.
+ */
+static char *
+_ctypes_alloc_format_string_for_type(char code, int big_endian)
+{
+    char *result;
+    char pep_code = '\0';
+
+    switch (code) {
+#if SIZEOF_INT == 2
+    case 'i': pep_code = 'h'; break;
+    case 'I': pep_code = 'H'; break;
+#elif SIZEOF_INT == 4
+    case 'i': pep_code = 'i'; break;
+    case 'I': pep_code = 'I'; break;
+#elif SIZEOF_INT == 8
+    case 'i': pep_code = 'q'; break;
+    case 'I': pep_code = 'Q'; break;
+#else
+# error SIZEOF_INT has an unexpected value
+#endif /* SIZEOF_INT */
+#if SIZEOF_LONG == 4
+    case 'l': pep_code = 'l'; break;
+    case 'L': pep_code = 'L'; break;
+#elif SIZEOF_LONG == 8
+    case 'l': pep_code = 'q'; break;
+    case 'L': pep_code = 'Q'; break;
+#else
+# error SIZEOF_LONG has an unexpected value
+#endif /* SIZEOF_LONG */
+#if SIZEOF__BOOL == 1
+    case '?': pep_code = '?'; break;
+#elif SIZEOF__BOOL == 2
+    case '?': pep_code = 'H'; break;
+#elif SIZEOF__BOOL == 4
+    case '?': pep_code = 'L'; break;
+#elif SIZEOF__BOOL == 8
+    case '?': pep_code = 'Q'; break;
+#else
+# error SIZEOF__BOOL has an unexpected value
+#endif /* SIZEOF__BOOL */
+    default:
+        /* The standard-size code is the same as the ctypes one */
+        pep_code = code;
+        break;
+    }
+
+    result = PyMem_Malloc(3);
+    if (result == NULL)
+        return NULL;
+
+    result[0] = big_endian ? '>' : '<';
+    result[1] = pep_code;
+    result[2] = '\0';
+    return result;
+}
+
 /*
   Allocate a memory block for a pep3118 format string, copy prefix (if
   non-null) and suffix into it.  Returns NULL on failure, with the error
@@ -1926,9 +1991,9 @@ PyCSimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     stgdict->setfunc = fmt->setfunc;
     stgdict->getfunc = fmt->getfunc;
 #ifdef WORDS_BIGENDIAN
-    stgdict->format = _ctypes_alloc_format_string(">", proto_str);
+    stgdict->format = _ctypes_alloc_format_string_for_type(proto_str[0], 1);
 #else
-    stgdict->format = _ctypes_alloc_format_string("<", proto_str);
+    stgdict->format = _ctypes_alloc_format_string_for_type(proto_str[0], 0);
 #endif
     if (stgdict->format == NULL) {
         Py_DECREF(result);


From webhook-mailer at python.org  Wed Aug 30 07:08:45 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 30 Aug 2017 11:08:45 -0000
Subject: [Python-checkins] [3.6] bpo-31291: Fixed an assertion failure in
 zipimport.zipimporter.get_data() (GH-3226) (#3243)
Message-ID: <mailman.139.1504091329.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/095a421b1606ee27e00a5d9d253b05a9f0cfadb8
commit: 095a421b1606ee27e00a5d9d253b05a9f0cfadb8
branch: 3.6
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-30T14:08:39+03:00
summary:

[3.6] bpo-31291: Fixed an assertion failure in zipimport.zipimporter.get_data() (GH-3226) (#3243)

if pathname.replace('/', '\\') returns non-string.
(cherry picked from commit 631fdee6e61b4ba8ce800f827fecdd536bfb04f3)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-08-28-11-51-29.bpo-31291.t8QggK.rst
M Lib/test/test_zipimport.py
M Modules/zipimport.c

diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
index 7ddbc509f9b..daa5138751b 100644
--- a/Lib/test/test_zipimport.py
+++ b/Lib/test/test_zipimport.py
@@ -521,6 +521,23 @@ def testGetData(self):
             z.close()
             os.remove(TEMP_ZIP)
 
+    def test_issue31291(self):
+        # There shouldn't be an assertion failure in get_data().
+        class FunnyStr(str):
+            def replace(self, old, new):
+                return 42
+        z = ZipFile(TEMP_ZIP, "w")
+        try:
+            name = "test31291.dat"
+            data = b'foo'
+            z.writestr(name, data)
+            z.close()
+            zi = zipimport.zipimporter(TEMP_ZIP)
+            self.assertEqual(data, zi.get_data(FunnyStr(name)))
+        finally:
+            z.close()
+            os.remove(TEMP_ZIP)
+
     def testImporterAttr(self):
         src = """if 1:  # indent hack
         def get_file():
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-28-11-51-29.bpo-31291.t8QggK.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-28-11-51-29.bpo-31291.t8QggK.rst
new file mode 100644
index 00000000000..0576785c7df
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-28-11-51-29.bpo-31291.t8QggK.rst	
@@ -0,0 +1,3 @@
+Fix an assertion failure in `zipimport.zipimporter.get_data` on Windows,
+when the return value of ``pathname.replace('/','\\')`` isn't a string.
+Patch by Oren Milman.
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index cccc033d2d9..5bf31cc0605 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -580,7 +580,8 @@ zipimporter_get_data(PyObject *obj, PyObject *args)
         return NULL;
 
 #ifdef ALTSEP
-    path = _PyObject_CallMethodId(path, &PyId_replace, "CC", ALTSEP, SEP);
+    path = _PyObject_CallMethodId((PyObject *)&PyUnicode_Type, &PyId_replace,
+                                  "OCC", path, ALTSEP, SEP);
     if (!path)
         return NULL;
 #else


From webhook-mailer at python.org  Wed Aug 30 07:43:19 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Wed, 30 Aug 2017 11:43:19 -0000
Subject: [Python-checkins] Removed noop branch from ctypes code (#3234)
Message-ID: <mailman.140.1504093400.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/cb76029b47f26e969317f21d118392a699d1329e
commit: cb76029b47f26e969317f21d118392a699d1329e
branch: master
author: Alex Gaynor <alex.gaynor at gmail.com>
committer: Antoine Pitrou <pitrou at free.fr>
date: 2017-08-30T13:43:14+02:00
summary:

Removed noop branch from ctypes code (#3234)

files:
M Lib/ctypes/__init__.py

diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
index f8709683fb6..972ea0ac879 100644
--- a/Lib/ctypes/__init__.py
+++ b/Lib/ctypes/__init__.py
@@ -440,10 +440,7 @@ def LoadLibrary(self, name):
     windll = LibraryLoader(WinDLL)
     oledll = LibraryLoader(OleDLL)
 
-    if _os.name == "nt":
-        GetLastError = windll.kernel32.GetLastError
-    else:
-        GetLastError = windll.coredll.GetLastError
+    GetLastError = windll.kernel32.GetLastError
     from _ctypes import get_last_error, set_last_error
 
     def WinError(code=None, descr=None):


From webhook-mailer at python.org  Wed Aug 30 10:50:43 2017
From: webhook-mailer at python.org (Mariatta)
Date: Wed, 30 Aug 2017 14:50:43 -0000
Subject: [Python-checkins] Fix the indentation in Extending Python code
 example (GH-3244)
Message-ID: <mailman.141.1504104644.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/d9a2b99ac45b5529d2a6227b0d529397be831dab
commit: d9a2b99ac45b5529d2a6227b0d529397be831dab
branch: master
author: Sergey Fedoseev <fedoseev.sergey at gmail.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-08-30T07:50:40-07:00
summary:

Fix the indentation in Extending Python code example (GH-3244)

Code was indented with three spaces.
Fixed using four spaces.

files:
M Doc/extending/extending.rst

diff --git a/Doc/extending/extending.rst b/Doc/extending/extending.rst
index 2dc20fed131..7c273533aba 100644
--- a/Doc/extending/extending.rst
+++ b/Doc/extending/extending.rst
@@ -333,12 +333,12 @@ function.
 The method table must be referenced in the module definition structure::
 
    static struct PyModuleDef spammodule = {
-      PyModuleDef_HEAD_INIT,
-      "spam",   /* name of module */
-      spam_doc, /* module documentation, may be NULL */
-      -1,       /* size of per-interpreter state of the module,
-                   or -1 if the module keeps state in global variables. */
-      SpamMethods
+       PyModuleDef_HEAD_INIT,
+       "spam",   /* name of module */
+       spam_doc, /* module documentation, may be NULL */
+       -1,       /* size of per-interpreter state of the module,
+                    or -1 if the module keeps state in global variables. */
+       SpamMethods
    };
 
 This structure, in turn, must be passed to the interpreter in the module's


From webhook-mailer at python.org  Wed Aug 30 10:57:15 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Wed, 30 Aug 2017 14:57:15 -0000
Subject: [Python-checkins] [Trivial] Remove now redundant assert (#3245)
Message-ID: <mailman.142.1504105035.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/e91c2a5086c8fea64ad33d5f334da13ed0d5648a
commit: e91c2a5086c8fea64ad33d5f334da13ed0d5648a
branch: master
author: Antoine Pitrou <pitrou at free.fr>
committer: GitHub <noreply at github.com>
date: 2017-08-30T16:57:12+02:00
summary:

[Trivial] Remove now redundant assert (#3245)

files:
M Lib/multiprocessing/pool.py

diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py
index e457f0a576f..b1ee725fac6 100644
--- a/Lib/multiprocessing/pool.py
+++ b/Lib/multiprocessing/pool.py
@@ -313,7 +313,6 @@ def imap(self, func, iterable, chunksize=1):
                 raise ValueError(
                     "Chunksize must be 1+, not {0:n}".format(
                         chunksize))
-            assert chunksize > 1
             task_batches = Pool._get_tasks(func, iterable, chunksize)
             result = IMapIterator(self._cache)
             self._taskqueue.put(


From webhook-mailer at python.org  Wed Aug 30 12:37:46 2017
From: webhook-mailer at python.org (Mariatta)
Date: Wed, 30 Aug 2017 16:37:46 -0000
Subject: [Python-checkins] bpo-30737: Update DevGuide links to new URL
 (GH-3228)
Message-ID: <mailman.143.1504111069.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/384899dfaeb83db38a6d3846d3cbc2f58a6605cd
commit: 384899dfaeb83db38a6d3846d3cbc2f58a6605cd
branch: master
author: Lisa Hewus Fresh <bugzPDX at users.noreply.github.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-08-30T09:37:43-07:00
summary:

bpo-30737: Update DevGuide links to new URL (GH-3228)

Update old devguide links from https://docs.python.org/devguide to https://devguide.python.org

files:
M Doc/README.rst
M Doc/bugs.rst
M Doc/faq/general.rst
M Doc/howto/curses.rst
M Doc/using/unix.rst
M Doc/using/windows.rst
M Doc/whatsnew/2.6.rst
M Doc/whatsnew/3.4.rst
M Grammar/Grammar
M Mac/README
M Misc/ACKS
M Misc/Porting
M Misc/python.man
M README.rst

diff --git a/Doc/README.rst b/Doc/README.rst
index dcd3d6e80ff..9156e7df672 100644
--- a/Doc/README.rst
+++ b/Doc/README.rst
@@ -7,7 +7,7 @@ available <https://docs.python.org/dev/download.html>`_.
 
 Documentation on authoring Python documentation, including information about
 both style and markup, is available in the "`Documenting Python
-<https://docs.python.org/devguide/documenting.html>`_" chapter of the
+<https://devguide.python.org/documenting/>`_" chapter of the
 developers guide.
 
 
@@ -109,10 +109,10 @@ see the make targets above).
 Contributing
 ============
 
-Bugs in the content should be reported to the 
+Bugs in the content should be reported to the
 `Python bug tracker <https://bugs.python.org>`_.
 
-Bugs in the toolset should be reported in the 
+Bugs in the toolset should be reported in the
 `Sphinx bug tracker <https://github.com/sphinx-doc/sphinx/issues>`_.
 
 You can also send a mail to the Python Documentation Team at docs at python.org,
diff --git a/Doc/bugs.rst b/Doc/bugs.rst
index 1b0a5a9a937..bc1d10f379c 100644
--- a/Doc/bugs.rst
+++ b/Doc/bugs.rst
@@ -88,5 +88,5 @@ the `core-mentorship mailing list`_ is a friendly place to get answers to
 any and all questions pertaining to the process of fixing issues in Python.
 
 .. _Documentation bugs: https://bugs.python.org/issue?@filter=status&@filter=components&components=4&status=1&@columns=id,activity,title,status&@sort=-activity
-.. _Python Developer's Guide: https://docs.python.org/devguide/
+.. _Python Developer's Guide: https://devguide.python.org/
 .. _core-mentorship mailing list: https://mail.python.org/mailman/listinfo/core-mentorship/
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index 8f6a907a8a2..d4a97fd81af 100644
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -167,7 +167,7 @@ several useful pieces of freely distributable software.  The source will compile
 and run out of the box on most UNIX platforms.
 
 Consult the `Getting Started section of the Python Developer's Guide
-<https://docs.python.org/devguide/setup.html>`__ for more
+<https://devguide.python.org/setup/>`__ for more
 information on getting the source code and compiling it.
 
 
@@ -223,7 +223,7 @@ newsgroups and on the Python home page at https://www.python.org/; an RSS feed o
 news is available.
 
 You can also access the development version of Python through Git.  See
-`The Python Developer's Guide <https://docs.python.org/devguide/>`_ for details.
+`The Python Developer's Guide <https://devguide.python.org/>`_ for details.
 
 
 How do I submit bug reports and patches for Python?
@@ -239,7 +239,7 @@ report bugs to Python, you can obtain your Roundup password through Roundup's
 `password reset procedure <https://bugs.python.org/user?@template=forgotten>`_.
 
 For more information on how Python is developed, consult `the Python Developer's
-Guide <https://docs.python.org/devguide/>`_.
+Guide <https://devguide.python.org/>`_.
 
 
 Are there any published articles about Python that I can reference?
diff --git a/Doc/howto/curses.rst b/Doc/howto/curses.rst
index cbff84160ff..1d3bfb87dc0 100644
--- a/Doc/howto/curses.rst
+++ b/Doc/howto/curses.rst
@@ -538,7 +538,7 @@ the Python interface.  Often this isn't because they're difficult to
 implement, but because no one has needed them yet.  Also, Python
 doesn't yet support the menu library associated with ncurses.
 Patches adding support for these would be welcome; see
-`the Python Developer's Guide <https://docs.python.org/devguide/>`_ to
+`the Python Developer's Guide <https://devguide.python.org/>`_ to
 learn more about submitting patches to Python.
 
 * `Writing Programs with NCURSES <http://invisible-island.net/ncurses/ncurses-intro.html>`_:
diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst
index 604688ce94c..8b96ebea396 100644
--- a/Doc/using/unix.rst
+++ b/Doc/using/unix.rst
@@ -67,7 +67,7 @@ Building Python
 If you want to compile CPython yourself, first thing you should do is get the
 `source <https://www.python.org/downloads/source/>`_. You can download either the
 latest release's source or just grab a fresh `clone
-<https://docs.python.org/devguide/setup.html#getting-the-source-code>`_.  (If you want
+<https://devguide.python.org/setup/#getting-the-source-code>`_.  (If you want
 to contribute patches, you will need a clone.)
 
 The build process consists in the usual ::
@@ -140,4 +140,4 @@ Many editors and IDEs provide syntax highlighting, debugging tools, and PEP-8 ch
 
 Please go to `Python Editors <https://wiki.python.org/moin/PythonEditors>`_ and
 `Integrated Development Environments <https://wiki.python.org/moin/IntegratedDevelopmentEnvironments>`_
-for a comprehensive list.
\ No newline at end of file
+for a comprehensive list.
diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index 68687e9f3ec..3d47d7c5154 100644
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -896,7 +896,7 @@ Compiling Python on Windows
 If you want to compile CPython yourself, first thing you should do is get the
 `source <https://www.python.org/downloads/source/>`_. You can download either the
 latest release's source or just grab a fresh `checkout
-<https://docs.python.org/devguide/setup.html#getting-the-source-code>`_.
+<https://devguide.python.org/setup/#getting-the-source-code>`_.
 
 The source tree contains a build solution and project files for Microsoft
 Visual Studio 2015, which is the compiler used to build the official Python
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index cc2fa3dcfa5..45b0ab9f345 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -232,7 +232,7 @@ have adopted Sphinx as their documentation tool.
 
 .. seealso::
 
-   `Documenting Python <https://docs.python.org/devguide/documenting.html>`__
+   `Documenting Python <https://devguide.python.org/documenting/>`__
        Describes how to write for Python's documentation.
 
    `Sphinx <http://sphinx-doc.org/>`__
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 72398f9250f..65971700c8b 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -1960,7 +1960,7 @@ Other Improvements
   ``.py`` extension.  (Contributed by Paul Moore in :issue:`18569`.)
 
 * A new ``make`` target `coverage-report
-  <https://docs.python.org/devguide/coverage.html#measuring-coverage-of-c-code-with-gcov-and-lcov>`_
+  <https://devguide.python.org/coverage/#measuring-coverage-of-c-code-with-gcov-and-lcov>`_
   will build python, run the test suite, and generate an HTML coverage report
   for the C codebase using ``gcov`` and `lcov
   <http://ltp.sourceforge.net/coverage/lcov.php>`_.
@@ -2176,7 +2176,7 @@ The following obsolete and previously deprecated APIs and features have been
 removed:
 
 * The unmaintained ``Misc/TextMate`` and ``Misc/vim`` directories have been
-  removed (see the `devguide <https://docs.python.org/devguide>`_
+  removed (see the `devguide <https://devguide.python.org>`_
   for suggestions on what to use instead).
 
 * The ``SO`` makefile macro is removed (it was replaced by the
diff --git a/Grammar/Grammar b/Grammar/Grammar
index 59c807ef0c8..90582434bee 100644
--- a/Grammar/Grammar
+++ b/Grammar/Grammar
@@ -1,7 +1,7 @@
 # Grammar for Python
 
 # NOTE WELL: You should also follow all the steps listed at
-# https://docs.python.org/devguide/grammar.html
+# https://devguide.python.org/grammar/
 
 # Start symbols for the grammar:
 #       single_input is a single interactive statement;
diff --git a/Mac/README b/Mac/README
index 07f09fa8366..d4194747ebb 100644
--- a/Mac/README
+++ b/Mac/README
@@ -98,7 +98,7 @@ In general, universal builds depend on specific features provided by the
 Apple-supplied compilers and other build tools included in Apple's Xcode
 development tools.  You should install Xcode and the command line tools
 component appropriate for the OS X release you are running on.  See the
-Python Developer's Guide (http://docs.python.org/devguide/setup.html)
+Python Developer's Guide (https://devguide.python.org/setup/)
 for more information.
 
 2.1 Flavors of universal binaries
@@ -355,4 +355,4 @@ Resources
 
   *  http://www.python.org/community/sigs/current/pythonmac-sig/
 
-  *  http://docs.python.org/devguide/
\ No newline at end of file
+  *  https://devguide.python.org/
diff --git a/Misc/ACKS b/Misc/ACKS
index 91e04246f73..e1127bcc72b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -627,6 +627,7 @@ Thomas Herve
 Bernhard Herzog
 Magnus L. Hetland
 Raymond Hettinger
+Lisa Hewus Fresh
 Kevan Heydon
 Wouter van Heyst
 Kelsey Hightower
diff --git a/Misc/Porting b/Misc/Porting
index c43b1129788..f16c4600521 100644
--- a/Misc/Porting
+++ b/Misc/Porting
@@ -1 +1 @@
-This document is moved to https://docs.python.org/devguide/faq.html#how-do-i-port-python-to-a-new-platform
+This document is moved to https://devguide.python.org/porting/
diff --git a/Misc/python.man b/Misc/python.man
index 385b6546c8a..075b974e904 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -438,7 +438,7 @@ Main website:  https://www.python.org/
 .br
 Documentation:  https://docs.python.org/
 .br
-Developer resources:  https://docs.python.org/devguide/
+Developer resources:  https://devguide.python.org/
 .br
 Downloads:  https://www.python.org/downloads/
 .br
diff --git a/README.rst b/README.rst
index 9c95815d9e9..4829271416e 100644
--- a/README.rst
+++ b/README.rst
@@ -28,7 +28,7 @@ General Information
 - Source code: https://github.com/python/cpython
 - Issue tracker: https://bugs.python.org
 - Documentation: https://docs.python.org
-- Developer's Guide: https://docs.python.org/devguide/
+- Developer's Guide: https://devguide.python.org/
 
 Contributing to CPython
 -----------------------
@@ -36,7 +36,7 @@ Contributing to CPython
 For more complete instructions on contributing to CPython development,
 see the `Developer Guide`_.
 
-.. _Developer Guide: https://docs.python.org/devguide/
+.. _Developer Guide: https://devguide.python.org/
 
 Using Python
 ------------


From webhook-mailer at python.org  Wed Aug 30 18:47:57 2017
From: webhook-mailer at python.org (=?utf-8?q?=C3=89ric?= Araujo)
Date: Wed, 30 Aug 2017 22:47:57 -0000
Subject: [Python-checkins] bpo-30096: Use ABC in abc reference examples
 (#1220)
Message-ID: <mailman.144.1504133280.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/122e88a8354e3f75aeaf6211232dac88ac296d54
commit: 122e88a8354e3f75aeaf6211232dac88ac296d54
branch: master
author: Eric Appelt <eric.appelt at gmail.com>
committer: ?ric Araujo <merwok at users.noreply.github.com>
date: 2017-08-30T18:47:52-04:00
summary:

bpo-30096: Use ABC in abc reference examples (#1220)

Use base class rather than metaclass in examples.

files:
M Doc/library/abc.rst

diff --git a/Doc/library/abc.rst b/Doc/library/abc.rst
index 966003bd45a..6001db32df4 100644
--- a/Doc/library/abc.rst
+++ b/Doc/library/abc.rst
@@ -24,7 +24,33 @@ a class or instance provides a particular interface, for example, is it
 hashable or a mapping.
 
 
-This module provides the following classes:
+This module provides the metaclass :class:`ABCMeta` for defining ABCs and
+a helper class :class:`ABC` to alternatively define ABCs through inheritance:
+
+.. class:: ABC
+
+   A helper class that has :class:`ABCMeta` as its metaclass.  With this class,
+   an abstract base class can be created by simply deriving from :class:`ABC`
+   avoiding sometimes confusing metaclass usage, for example::
+
+     from abc import ABC
+
+     class MyABC(ABC):
+         pass
+
+   Note that the type of :class:`ABC` is still :class:`ABCMeta`, therefore
+   inheriting from :class:`ABC` requires the usual precautions regarding
+   metaclass usage, as multiple inheritance may lead to metaclass conflicts.
+   One may also define an abstract base class by passing the metaclass
+   keyword and using :class:`ABCMeta` directly, for example::
+
+     from abc import ABCMeta
+
+     class MyABC(metaclass=ABCMeta):
+         pass
+
+   .. versionadded:: 3.4
+
 
 .. class:: ABCMeta
 
@@ -46,15 +72,15 @@ This module provides the following classes:
       Register *subclass* as a "virtual subclass" of this ABC. For
       example::
 
-        from abc import ABCMeta
+         from abc import ABC
 
-        class MyABC(metaclass=ABCMeta):
-            pass
+         class MyABC(ABC):
+             pass
 
-        MyABC.register(tuple)
+         MyABC.register(tuple)
 
-        assert issubclass(tuple, MyABC)
-        assert isinstance((), MyABC)
+         assert issubclass(tuple, MyABC)
+         assert isinstance((), MyABC)
 
       .. versionchanged:: 3.3
          Returns the registered subclass, to allow usage as a class decorator.
@@ -95,7 +121,7 @@ This module provides the following classes:
           def get_iterator(self):
               return iter(self)
 
-      class MyIterable(metaclass=ABCMeta):
+      class MyIterable(ABC):
 
           @abstractmethod
           def __iter__(self):
@@ -132,17 +158,6 @@ This module provides the following classes:
    available as a method of ``Foo``, so it is provided separately.
 
 
-.. class:: ABC
-
-   A helper class that has :class:`ABCMeta` as its metaclass.  With this class,
-   an abstract base class can be created by simply deriving from :class:`ABC`,
-   avoiding sometimes confusing metaclass usage.
-
-   Note that the type of :class:`ABC` is still :class:`ABCMeta`, therefore
-   inheriting from :class:`ABC` requires the usual precautions regarding metaclass
-   usage, as multiple inheritance may lead to metaclass conflicts.
-
-   .. versionadded:: 3.4
 
 
 The :mod:`abc` module also provides the following decorators:
@@ -168,7 +183,7 @@ The :mod:`abc` module also provides the following decorators:
    descriptors, it should be applied as the innermost decorator, as shown in
    the following usage examples::
 
-      class C(metaclass=ABCMeta):
+      class C(ABC):
           @abstractmethod
           def my_abstract_method(self, ...):
               ...
@@ -230,7 +245,7 @@ The :mod:`abc` module also provides the following decorators:
    is now correctly identified as abstract when applied to an abstract
    method::
 
-      class C(metaclass=ABCMeta):
+      class C(ABC):
           @classmethod
           @abstractmethod
           def my_abstract_classmethod(cls, ...):
@@ -251,7 +266,7 @@ The :mod:`abc` module also provides the following decorators:
    is now correctly identified as abstract when applied to an abstract
    method::
 
-      class C(metaclass=ABCMeta):
+      class C(ABC):
           @staticmethod
           @abstractmethod
           def my_abstract_staticmethod(...):
@@ -278,7 +293,7 @@ The :mod:`abc` module also provides the following decorators:
    is now correctly identified as abstract when applied to an abstract
    method::
 
-      class C(metaclass=ABCMeta):
+      class C(ABC):
           @property
           @abstractmethod
           def my_abstract_property(self):
@@ -288,7 +303,7 @@ The :mod:`abc` module also provides the following decorators:
    read-write abstract property by appropriately marking one or more of the
    underlying methods as abstract::
 
-      class C(metaclass=ABCMeta):
+      class C(ABC):
           @property
           def x(self):
               ...


From lp_benchmark_robot at intel.com  Wed Aug 30 22:14:43 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Wed, 30 Aug 2017 19:14:43 -0700
Subject: [Python-checkins] [1 down,
 64 flat] Results for Python (master branch) 2017-08-30
Message-ID: <101be056-5a59-48d5-a10c-1d26d679125d@orsmsx104.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-30 03:04:29-07:00.
  - commit:		c67bae0
  - previous commit:	ba7d736
  - revision date:	2017-08-30 11:01:08+02:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.048% |  -1.346%   |  +3.061%   |  +9.359%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.202% |  +0.039%   |  +23.012%  |  +7.570%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 1.327% |  +0.307%   |  +23.910%  |  +7.272%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.674% |  -0.149%   |  +21.901%  |  +4.726%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.585% |  -0.213%   |  +2.956%   |  +15.939%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.813% |  +0.047%   |  +12.125%  |  +10.327%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.886% |  +0.384%   |  +6.533%   |  +10.625%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.545% |  -0.515%   |  +2.784%   |  +6.513%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.388% |  -0.579%   |  +5.565%   |  +20.314%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 6.340% |  -0.493%   |  +5.978%   |  +16.912%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.356% |  -0.771%   |  +3.828%   |  +6.606%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.603% |  +0.318%   |  +5.835%   |  +4.004%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.714% |  +0.009%   |  +3.601%   |  +5.402%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 0.934% |  +0.056%   |  +8.142%   |  +11.716%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.989% |  -1.184%   |  +5.805%   |  +11.112%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.729% |  +0.088%   |  +6.432%   |  +11.533%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 1.285% |  +0.074%   |  +9.335%   |  +11.494%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.444% |  -1.106%   |  +5.674%   |  +12.485%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 2.675% |  +0.171%   |  +4.330%   |  +8.050%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 2.109% |  -0.635%   |  +1.164%   |  +11.747%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.477% |  -2.210%   |  +5.287%   |  +14.598%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.608% |  +0.005%   |  +46.688%  |  +11.464%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.929% |  -1.229%   |  +6.797%   |  +14.644%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.417% |  -0.376%   |  +18.847%  |  +10.590%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 4.484% |  +0.860%   |  +7.087%   |  +12.092%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.940% |  -0.342%   |  +4.089%   |  +5.592%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.713% |  -1.017%   |  -4.983%   |  +9.026%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.712% |  -0.256%   |  +2.673%   |  +6.380%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.380% |  +1.127%   |  +3.044%   |  +11.652%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 2.559% |  -0.819%   |  -0.516%   |  +24.265%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.624% |  -0.070%   |  +2.504%   |  +20.513%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.839% |  -0.133%   |  +6.458%   |  +18.623%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.336% |  -0.506%   |  +11.978%  |  +8.962%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.145% |  +0.001%   |  +0.430%   |  +9.609%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.146% |  -0.200%   |  +8.577%   |  +5.512%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.104% |  -0.251%   |  +0.652%   |  +5.080%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.955% |  -0.310%   |  +8.469%   |  +12.826%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.273% |  -0.248%   |  -9.178%   |  +11.707%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 1.406% |  -0.423%   |  +1.852%   |  +7.680%   |
+-----+------------------------+--------+------------+------------+------------+
| :-( |            regex_effbot|15.048% |  -24.514%  |  -23.891%  |  +18.880%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.280% |  -0.790%   |  +11.348%  |  +5.416%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.852% |  +0.810%   |  +7.457%   |  +14.507%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.394% |  -0.111%   |  +1.217%   |  +2.188%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.214% |  +0.946%   |  +26.680%  |  +9.452%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.329% |  +0.287%   |  +3.118%   |  +7.866%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 1.680% |  -0.192%   |  +14.227%  |  +9.717%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 1.225% |  -0.194%   |  +0.760%   |  -3.308%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.731% |  -0.445%   |  +5.341%   |  +3.281%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.453% |  -0.009%   |  +4.704%   |  +9.015%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.026% |  +0.237%   |  +5.225%   |  +5.929%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 3.926% |  +3.372%   |  +1.214%   |  +9.586%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 1.905% |  -0.100%   |  +12.125%  |  +9.478%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.738% |  -0.419%   |  +9.358%   |  +8.118%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.556% |  -0.842%   |  +11.301%  |  +10.473%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.225% |  +0.195%   |  +13.510%  |  +10.671%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 5.261% |  +0.587%   |  +22.151%  |  +10.186%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.191% |  -0.115%   |  +5.443%   |  +7.402%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 0.900% |  +0.136%   |  +2.709%   |  +0.089%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 8.464% |  +1.609%   |  +7.768%   |  +20.435%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.839% |  +0.471%   |  -2.583%   |  +15.756%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 4.024% |  -1.671%   |  +5.465%   |  +8.192%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 0.952% |  +0.400%   |  +6.519%   |  +7.249%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.295% |  -0.905%   |  +2.673%   |  +6.584%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 2.827% |  -0.097%   |  -5.034%   |  +10.794%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.297% |  +0.213%   |  +7.421%   |  +7.603%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/1-down-64-flat-results-for-python-master-branch-2017-08-30

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.

From webhook-mailer at python.org  Thu Aug 31 02:11:05 2017
From: webhook-mailer at python.org (Mariatta)
Date: Thu, 31 Aug 2017 06:11:05 -0000
Subject: [Python-checkins] [3.6] Fix the indentation in Extending Python
 code example (GH-3244) (GH-3250)
Message-ID: <mailman.145.1504159866.2685.python-checkins@python.org>

https://github.com/python/cpython/commit/b5db7bb9da1120912a1795fbc6106d0eba5a01c7
commit: b5db7bb9da1120912a1795fbc6106d0eba5a01c7
branch: 3.6
author: Mariatta <Mariatta at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-08-30T23:11:02-07:00
summary:

[3.6] Fix the indentation in Extending Python code example (GH-3244) (GH-3250)

Code was indented with three spaces.
Fixed using four spaces.
(cherry picked from commit d9a2b99ac45b5529d2a6227b0d529397be831dab)

files:
M Doc/extending/extending.rst

diff --git a/Doc/extending/extending.rst b/Doc/extending/extending.rst
index 4ac820a432b..93584627a29 100644
--- a/Doc/extending/extending.rst
+++ b/Doc/extending/extending.rst
@@ -333,12 +333,12 @@ function.
 The method table must be referenced in the module definition structure::
 
    static struct PyModuleDef spammodule = {
-      PyModuleDef_HEAD_INIT,
-      "spam",   /* name of module */
-      spam_doc, /* module documentation, may be NULL */
-      -1,       /* size of per-interpreter state of the module,
-                   or -1 if the module keeps state in global variables. */
-      SpamMethods
+       PyModuleDef_HEAD_INIT,
+       "spam",   /* name of module */
+       spam_doc, /* module documentation, may be NULL */
+       -1,       /* size of per-interpreter state of the module,
+                    or -1 if the module keeps state in global variables. */
+       SpamMethods
    };
 
 This structure, in turn, must be passed to the interpreter in the module's


From solipsis at pitrou.net  Thu Aug 31 05:05:40 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 31 Aug 2017 09:05:40 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=4
Message-ID: <20170831090539.108045.FE648102D4D67490@psf.io>

results for 4243df51fe43 on branch "default"
--------------------------------------------

test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_forkserver leaked [-2, 2, 0] memory blocks, sum=0


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogEapExk', '--timeout', '7200']

From lp_benchmark_robot at intel.com  Thu Aug 31 20:22:12 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Thu, 31 Aug 2017 17:22:12 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-08-31
Message-ID: <b67d6541-0b32-4b96-85da-41d2c6f74101@orsmsx154.amr.corp.intel.com>

Results for project python/master, build date: 2017-08-31 11:13:10-07:00.
  - commit:		122e88a
  - previous commit:	c67bae0
  - revision date:	2017-08-30 18:47:52-04:00
  - environment:	Broadwell-EP
      - cpu:		Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz  2x22 cores,
        stepping 1, LLC 55 MB
      - mem:		128 GB
      - os:		Ubuntu 16.04.2 LTS
      - kernel:	4.4.0-62-generic  x86_64 GNU/Linux

Baseline results were generated using release v3.6.0, with hash 5c4568a from
2016-12-22 23:38:47+00:00.

+-----+------------------------+--------+------------+------------+------------+
|     |                        |relative|change since|change since|current rev |
|     |               benchmark|std_dev*|  last run  |  baseline  |run with PGO|
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    2to3| 1.023% |  +0.088%   |  +3.146%   |  +9.054%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 0.903% |  +0.084%   |  +23.077%  |  +11.461%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 1.232% |  -0.387%   |  +23.616%  |  +11.169%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 2.372% |  -0.444%   |  +21.554%  |  +9.814%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 3.972% |  -0.547%   |  +2.425%   |  +18.297%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.817% |  +0.364%   |  +12.445%  |  +9.397%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.800% |  -0.210%   |  +6.336%   |  +11.091%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.491% |  +0.249%   |  +3.026%   |  +6.840%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 5.768% |  +0.418%   |  +5.960%   |  +19.298%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 6.807% |  -1.338%   |  +4.720%   |  +16.231%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.749% |  +0.314%   |  +4.129%   |  +6.812%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.629% |  -0.053%   |  +5.785%   |  +4.841%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.684% |  -0.075%   |  +3.529%   |  +5.218%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.429% |  -0.374%   |  +7.798%   |  +10.804%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.073% |  -0.043%   |  +5.765%   |  +9.750%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.836% |  -0.140%   |  +6.301%   |  +10.835%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 1.254% |  -0.016%   |  +9.321%   |  +10.432%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.522% |  -0.702%   |  +5.011%   |  +12.589%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.329% |  +1.065%   |  +5.349%   |  +8.369%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 3.761% |  -0.130%   |  +1.035%   |  +12.374%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.880% |  +0.292%   |  +5.564%   |  +12.931%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 3.861% |  -0.139%   |  +46.613%  |  +12.516%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.615% |  -1.082%   |  +5.789%   |  +14.775%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.442% |  +0.025%   |  +18.868%  |  +11.565%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 5.006% |  -0.895%   |  +6.256%   |  +13.933%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.504% |  +0.159%   |  +4.242%   |  +5.276%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.911% |  -0.264%   |  -5.260%   |  +5.653%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.486% |  +0.314%   |  +2.979%   |  +5.870%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.266% |  +0.392%   |  +3.423%   |  +10.550%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 3.534% |  +0.230%   |  -0.285%   |  +23.125%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.369% |  +0.097%   |  +2.599%   |  +19.113%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 1.239% |  +0.069%   |  +6.522%   |  +18.646%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.211% |  +0.201%   |  +12.155%  |  +9.719%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.261% |  -0.033%   |  +0.398%   |  +9.944%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.138% |  -0.028%   |  +8.551%   |  +5.380%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.094% |  -0.038%   |  +0.614%   |  +5.061%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.671% |  +0.027%   |  +8.493%   |  +13.791%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.283% |  +1.265%   |  -7.797%   |  +10.590%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.183% |  +0.265%   |  +2.112%   |  +9.243%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot|15.151% |  +1.982%   |  -21.435%  |  +16.979%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 0.485% |  +0.425%   |  +11.724%  |  +4.703%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 2.117% |  +0.056%   |  +7.510%   |  +14.410%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 2.515% |  -0.481%   |  +0.741%   |  +2.331%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.848% |  -0.265%   |  +26.486%  |  +8.038%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.106% |  -0.442%   |  +2.690%   |  +7.779%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.533% |  +0.210%   |  +14.407%  |  +8.401%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 1.101% |  +0.099%   |  +0.859%   |  -4.071%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 1.215% |  -0.048%   |  +5.296%   |  +3.103%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.175% |  -0.291%   |  +4.427%   |  +9.721%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.712% |  -0.125%   |  +5.106%   |  +6.137%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.326% |  -0.131%   |  +1.084%   |  +10.563%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 1.960% |  -0.290%   |  +11.870%  |  +9.420%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 2.068% |  +0.245%   |  +9.579%   |  +7.952%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.606% |  +0.325%   |  +11.589%  |  +10.423%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.231% |  -1.519%   |  +12.196%  |  +11.521%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 3.719% |  +1.383%   |  +23.228%  |  +10.797%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.063% |  +0.049%   |  +5.490%   |  +7.496%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 0.712% |  +0.064%   |  +2.772%   |  -0.465%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 6.898% |  +2.271%   |  +9.862%   |  +17.348%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.826% |  +0.217%   |  -2.361%   |  +19.448%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 3.633% |  +0.420%   |  +5.861%   |  +7.438%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.243% |  -0.202%   |  +6.330%   |  +6.879%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.571% |  -0.125%   |  +2.551%   |  +5.494%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 2.041% |  +0.256%   |  -4.765%   |  +10.102%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.172% |  +0.170%   |  +7.579%   |  +6.956%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/65-flat-results-for-python-master-branch-2017-08-31

Our lab does a nightly source pull and build of the Python project and measures
performance changes against the previous stable version and the previous nightly
measurement. This is provided as a service to the community so that quality
issues with current hardware can be identified quickly.

Intel technologies' features and benefits depend on system configuration and may
require enabled hardware, software or service activation. Performance varies
depending on system configuration.