From webhook-mailer at python.org  Sun Oct  1 04:37:53 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sun, 01 Oct 2017 08:37:53 -0000
Subject: [Python-checkins] bpo-31336: Speed up type creation. (#3279)
Message-ID: <mailman.0.1506847075.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/2102c789035ccacbac4362589402ac68baa2cd29
commit: 2102c789035ccacbac4362589402ac68baa2cd29
branch: master
author: scoder <stefan_ml at behnel.de>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-01T11:37:47+03:00
summary:

bpo-31336: Speed up type creation. (#3279)

Speed up class creation by 10-20% by reducing the overhead in the
necessary special method lookups.

files:
A Misc/NEWS.d/next/Core and Builtins/2017-09-13-12-04-23.bpo-31336.gi2ahY.rst
M Objects/typeobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-13-12-04-23.bpo-31336.gi2ahY.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-13-12-04-23.bpo-31336.gi2ahY.rst
new file mode 100644
index 00000000000..e62b065af17
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-09-13-12-04-23.bpo-31336.gi2ahY.rst	
@@ -0,0 +1,2 @@
+Speed up class creation by 10-20% by reducing the overhead in the
+necessary special method lookups.  Patch by Stefan Behnel.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 5e0d81f6859..e72460bfbb3 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2367,35 +2367,39 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
                           &bases, &PyDict_Type, &orig_dict))
         return NULL;
 
-    /* Determine the proper metatype to deal with this: */
-    winner = _PyType_CalculateMetaclass(metatype, bases);
-    if (winner == NULL) {
-        return NULL;
-    }
-
-    if (winner != metatype) {
-        if (winner->tp_new != type_new) /* Pass it to the winner */
-            return winner->tp_new(winner, args, kwds);
-        metatype = winner;
-    }
-
     /* Adjust for empty tuple bases */
     nbases = PyTuple_GET_SIZE(bases);
     if (nbases == 0) {
-        bases = PyTuple_Pack(1, &PyBaseObject_Type);
+        base = &PyBaseObject_Type;
+        bases = PyTuple_Pack(1, base);
         if (bases == NULL)
-            goto error;
+            return NULL;
         nbases = 1;
     }
-    else
-        Py_INCREF(bases);
+    else {
+        /* Search the bases for the proper metatype to deal with this: */
+        winner = _PyType_CalculateMetaclass(metatype, bases);
+        if (winner == NULL) {
+            return NULL;
+        }
 
-    /* Calculate best base, and check that all bases are type objects */
-    base = best_base(bases);
-    if (base == NULL) {
-        goto error;
+        if (winner != metatype) {
+            if (winner->tp_new != type_new) /* Pass it to the winner */
+                return winner->tp_new(winner, args, kwds);
+            metatype = winner;
+        }
+
+        /* Calculate best base, and check that all bases are type objects */
+        base = best_base(bases);
+        if (base == NULL) {
+            return NULL;
+        }
+
+        Py_INCREF(bases);
     }
 
+    /* Use "goto error" from this point on as we now own the reference to "bases". */
+
     dict = PyDict_Copy(orig_dict);
     if (dict == NULL)
         goto error;
@@ -2945,25 +2949,23 @@ PyType_GetSlot(PyTypeObject *type, int slot)
     return  *(void**)(((char*)type) + slotoffsets[slot]);
 }
 
-/* Internal API to look for a name through the MRO.
-   This returns a borrowed reference, and doesn't set an exception! */
-PyObject *
-_PyType_Lookup(PyTypeObject *type, PyObject *name)
+/* Internal API to look for a name through the MRO, bypassing the method cache.
+   This returns a borrowed reference, and might set an exception.
+   'error' is set to: -1: error with exception; 1: error without exception; 0: ok */
+static PyObject *
+find_name_in_mro(PyTypeObject *type, PyObject *name, int *error)
 {
     Py_ssize_t i, n;
     PyObject *mro, *res, *base, *dict;
-    unsigned int h;
+    Py_hash_t hash;
 
-    if (MCACHE_CACHEABLE_NAME(name) &&
-        PyType_HasFeature(type, Py_TPFLAGS_VALID_VERSION_TAG)) {
-        /* fast path */
-        h = MCACHE_HASH_METHOD(type, name);
-        if (method_cache[h].version == type->tp_version_tag &&
-            method_cache[h].name == name) {
-#if MCACHE_STATS
-            method_cache_hits++;
-#endif
-            return method_cache[h].value;
+    if (!PyUnicode_CheckExact(name) ||
+        (hash = ((PyASCIIObject *) name)->hash) == -1)
+    {
+        hash = PyObject_Hash(name);
+        if (hash == -1) {
+            *error = -1;
+            return NULL;
         }
     }
 
@@ -2971,28 +2973,22 @@ _PyType_Lookup(PyTypeObject *type, PyObject *name)
     mro = type->tp_mro;
 
     if (mro == NULL) {
-        if ((type->tp_flags & Py_TPFLAGS_READYING) == 0 &&
-            PyType_Ready(type) < 0) {
-            /* It's not ideal to clear the error condition,
-               but this function is documented as not setting
-               an exception, and I don't want to change that.
-               When PyType_Ready() can't proceed, it won't
-               set the "ready" flag, so future attempts to ready
-               the same type will call it again -- hopefully
-               in a context that propagates the exception out.
-            */
-            PyErr_Clear();
-            return NULL;
+        if ((type->tp_flags & Py_TPFLAGS_READYING) == 0) {
+            if (PyType_Ready(type) < 0) {
+                *error = -1;
+                return NULL;
+            }
+            mro = type->tp_mro;
         }
-        mro = type->tp_mro;
         if (mro == NULL) {
+            *error = 1;
             return NULL;
         }
     }
 
     res = NULL;
-    /* keep a strong reference to mro because type->tp_mro can be replaced
-       during PyDict_GetItem(dict, name)  */
+    /* Keep a strong reference to mro because type->tp_mro can be replaced
+       during dict lookup, e.g. when comparing to non-string keys. */
     Py_INCREF(mro);
     assert(PyTuple_Check(mro));
     n = PyTuple_GET_SIZE(mro);
@@ -3001,11 +2997,61 @@ _PyType_Lookup(PyTypeObject *type, PyObject *name)
         assert(PyType_Check(base));
         dict = ((PyTypeObject *)base)->tp_dict;
         assert(dict && PyDict_Check(dict));
-        res = PyDict_GetItem(dict, name);
+        res = _PyDict_GetItem_KnownHash(dict, name, hash);
         if (res != NULL)
             break;
+        if (PyErr_Occurred()) {
+            *error = -1;
+            goto done;
+        }
     }
+    *error = 0;
+done:
     Py_DECREF(mro);
+    return res;
+}
+
+/* Internal API to look for a name through the MRO.
+   This returns a borrowed reference, and doesn't set an exception! */
+PyObject *
+_PyType_Lookup(PyTypeObject *type, PyObject *name)
+{
+    PyObject *res;
+    int error;
+    unsigned int h;
+
+    if (MCACHE_CACHEABLE_NAME(name) &&
+        PyType_HasFeature(type, Py_TPFLAGS_VALID_VERSION_TAG)) {
+        /* fast path */
+        h = MCACHE_HASH_METHOD(type, name);
+        if (method_cache[h].version == type->tp_version_tag &&
+            method_cache[h].name == name) {
+#if MCACHE_STATS
+            method_cache_hits++;
+#endif
+            return method_cache[h].value;
+        }
+    }
+
+    /* We may end up clearing live exceptions below, so make sure it's ours. */
+    assert(!PyErr_Occurred());
+
+    res = find_name_in_mro(type, name, &error);
+    /* Only put NULL results into cache if there was no error. */
+    if (error) {
+        /* It's not ideal to clear the error condition,
+           but this function is documented as not setting
+           an exception, and I don't want to change that.
+           E.g., when PyType_Ready() can't proceed, it won't
+           set the "ready" flag, so future attempts to ready
+           the same type will call it again -- hopefully
+           in a context that propagates the exception out.
+        */
+        if (error == -1) {
+            PyErr_Clear();
+        }
+        return NULL;
+    }
 
     if (MCACHE_CACHEABLE_NAME(name) && assign_version_tag(type)) {
         h = MCACHE_HASH_METHOD(type, name);
@@ -6965,6 +7011,7 @@ update_one_slot(PyTypeObject *type, slotdef *p)
     void *generic = NULL, *specific = NULL;
     int use_generic = 0;
     int offset = p->offset;
+    int error;
     void **ptr = slotptr(type, offset);
 
     if (ptr == NULL) {
@@ -6973,9 +7020,18 @@ update_one_slot(PyTypeObject *type, slotdef *p)
         } while (p->offset == offset);
         return p;
     }
+    /* We may end up clearing live exceptions below, so make sure it's ours. */
+    assert(!PyErr_Occurred());
     do {
-        descr = _PyType_Lookup(type, p->name_strobj);
+        /* Use faster uncached lookup as we won't get any cache hits during type setup. */
+        descr = find_name_in_mro(type, p->name_strobj, &error);
         if (descr == NULL) {
+            if (error == -1) {
+                /* It is unlikely by not impossible that there has been an exception
+                   during lookup. Since this function originally expected no errors,
+                   we ignore them here in order to keep up the interface. */
+                PyErr_Clear();
+            }
             if (ptr == (void**)&type->tp_iternext) {
                 specific = (void *)_PyObject_NextNotImplemented;
             }


From solipsis at pitrou.net  Sun Oct  1 05:06:11 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 01 Oct 2017 09:06:11 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=3
Message-ID: <20171001090609.91619.1E23ED78A7D049E4@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_spawn leaked [0, 0, -2] memory blocks, sum=-2


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

From webhook-mailer at python.org  Sun Oct  1 19:01:30 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 01 Oct 2017 23:01:30 -0000
Subject: [Python-checkins] IDLE: make filetypes a tuple constant. (#3847)
Message-ID: <mailman.1.1506898891.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/5961e7c156f90c7f9444ae95b9d3e55114ca2169
commit: 5961e7c156f90c7f9444ae95b9d3e55114ca2169
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-10-01T19:01:27-04:00
summary:

IDLE: make filetypes a tuple constant. (#3847)

Save a bit of code, plus non-tuples get converted anyway to tuples by tkinter for the tk call.

files:
M Lib/idlelib/iomenu.py

diff --git a/Lib/idlelib/iomenu.py b/Lib/idlelib/iomenu.py
index 3414c7b3aff..f9b6907b40c 100644
--- a/Lib/idlelib/iomenu.py
+++ b/Lib/idlelib/iomenu.py
@@ -487,11 +487,11 @@ def print_window(self, event):
     opendialog = None
     savedialog = None
 
-    filetypes = [
+    filetypes = (
         ("Python files", "*.py *.pyw", "TEXT"),
         ("Text files", "*.txt", "TEXT"),
         ("All files", "*"),
-        ]
+        )
 
     defaultextension = '.py' if sys.platform == 'darwin' else ''
 


From webhook-mailer at python.org  Sun Oct  1 19:37:22 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 01 Oct 2017 23:37:22 -0000
Subject: [Python-checkins] [3.6] IDLE: make filetypes a tuple constant.
 (GH-3847) (#3848)
Message-ID: <mailman.2.1506901042.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/c0418160457970c4654ad8d910cd0ad21a02f3f7
commit: c0418160457970c4654ad8d910cd0ad21a02f3f7
branch: 3.6
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-10-01T19:37:19-04:00
summary:

[3.6] IDLE: make filetypes a tuple constant. (GH-3847) (#3848)

Save a bit of code, plus non-tuples get converted anyway to tuples by tkinter for the tk call.
(cherry picked from commit 5961e7c156f90c7f9444ae95b9d3e55114ca2169)

files:
M Lib/idlelib/iomenu.py

diff --git a/Lib/idlelib/iomenu.py b/Lib/idlelib/iomenu.py
index 3414c7b3aff..f9b6907b40c 100644
--- a/Lib/idlelib/iomenu.py
+++ b/Lib/idlelib/iomenu.py
@@ -487,11 +487,11 @@ def print_window(self, event):
     opendialog = None
     savedialog = None
 
-    filetypes = [
+    filetypes = (
         ("Python files", "*.py *.pyw", "TEXT"),
         ("Text files", "*.txt", "TEXT"),
         ("All files", "*"),
-        ]
+        )
 
     defaultextension = '.py' if sys.platform == 'darwin' else ''
 


From webhook-mailer at python.org  Mon Oct  2 02:38:00 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Mon, 02 Oct 2017 06:38:00 -0000
Subject: [Python-checkins] remove comment about long-gone SGI modules (#3850)
Message-ID: <mailman.3.1506926282.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/edc05c5d88c1ce853b3d04b34679ed7d69c2142a
commit: edc05c5d88c1ce853b3d04b34679ed7d69c2142a
branch: master
author: Benjamin Peterson <benjamin at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-01T23:37:57-07:00
summary:

remove comment about long-gone SGI modules (#3850)

files:
M setup.py

diff --git a/setup.py b/setup.py
index 0b536c8ca32..11c4ec67f43 100644
--- a/setup.py
+++ b/setup.py
@@ -615,8 +615,6 @@ def detect_modules(self):
 
         math_libs = self.detect_math_libs()
 
-        # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-
         #
         # The following modules are all pretty straightforward, and compile
         # on pretty much any POSIXish platform.


From webhook-mailer at python.org  Mon Oct  2 03:33:47 2017
From: webhook-mailer at python.org (INADA Naoki)
Date: Mon, 02 Oct 2017 07:33:47 -0000
Subject: [Python-checkins] bpo-31659: Use simple slicing to format PEM cert
 (GH-3849)
Message-ID: <mailman.4.1506929628.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/b75a228af8c0553aef44e4e03763af90fbc8737f
commit: b75a228af8c0553aef44e4e03763af90fbc8737f
branch: master
author: INADA Naoki <methane at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-10-02T16:33:42+09:00
summary:

bpo-31659: Use simple slicing to format PEM cert (GH-3849)

DER_cert_to_PEM_cert() used textwrap.fill() to format PEM.
But it's library to wrap lines on word boundary, while PEM is
base64 encoded string.

Additionally, importing textwrap is little slow.

files:
M Lib/ssl.py

diff --git a/Lib/ssl.py b/Lib/ssl.py
index 24f24b17bf1..75caae0c440 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -91,7 +91,6 @@
 """
 
 import ipaddress
-import textwrap
 import re
 import sys
 import os
@@ -1201,9 +1200,10 @@ def DER_cert_to_PEM_cert(der_cert_bytes):
     PEM version of it as a string."""
 
     f = str(base64.standard_b64encode(der_cert_bytes), 'ASCII', 'strict')
-    return (PEM_HEADER + '\n' +
-            textwrap.fill(f, 64) + '\n' +
-            PEM_FOOTER + '\n')
+    ss = [PEM_HEADER]
+    ss += [f[i:i+64] for i in range(0, len(f), 64)]
+    ss.append(PEM_FOOTER + '\n')
+    return '\n'.join(ss)
 
 def PEM_cert_to_DER_cert(pem_cert_string):
     """Takes a certificate in ASCII PEM format and returns the


From solipsis at pitrou.net  Mon Oct  2 05:06:33 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 02 Oct 2017 09:06:33 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=11
Message-ID: <20171002090632.131021.FFFA3617301E09E8@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=0


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

From webhook-mailer at python.org  Mon Oct  2 05:39:58 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 02 Oct 2017 09:39:58 -0000
Subject: [Python-checkins] bpo-31158: Fix nondeterministic read in test_pty
 (#3808)
Message-ID: <mailman.5.1506937199.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/e6f62f69f07892b993910ff03c9db3ffa5cb9ca5
commit: e6f62f69f07892b993910ff03c9db3ffa5cb9ca5
branch: master
author: Cornelius Diekmann <c.diekmann at googlemail.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-10-02T02:39:55-07:00
summary:

bpo-31158: Fix nondeterministic read in test_pty (#3808)

* bpo-31158: Fix nondeterministic read in test_pty

* Reuse existing readline implementation from io.

Thx to @pitrou

* Updated comment

Ideally, this commit is fixuped into the previous commit. Since there is
already a comment on github, I won't rebase.

files:
M Lib/test/test_pty.py

diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index f283e1930b7..3b448569a2f 100644
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -10,6 +10,7 @@
 import select
 import signal
 import socket
+import io # readline
 import unittest
 
 TEST_STRING_1 = b"I wish to buy a fish license.\n"
@@ -23,6 +24,16 @@ def debug(msg):
         pass
 
 
+# Note that os.read() is nondeterministic so we need to be very careful
+# to make the test suite deterministic.  A normal call to os.read() may
+# give us less than expected.
+#
+# Beware, on my Linux system, if I put 'foo\n' into a terminal fd, I get
+# back 'foo\r\n' at the other end.  The behavior depends on the termios
+# setting.  The newline translation may be OS-specific.  To make the
+# test suite deterministic and OS-independent, the functions _readline
+# and normalize_output can be used.
+
 def normalize_output(data):
     # Some operating systems do conversions on newline.  We could possibly fix
     # that by doing the appropriate termios.tcsetattr()s.  I couldn't figure out
@@ -43,6 +54,12 @@ def normalize_output(data):
 
     return data
 
+def _readline(fd):
+    """Read one line.  May block forever if no newline is read."""
+    reader = io.FileIO(fd, mode='rb', closefd=False)
+    return reader.readline()
+
+
 
 # Marginal testing of pty suite. Cannot do extensive 'do or fail' testing
 # because pty code is not too portable.
@@ -94,14 +111,14 @@ def test_basic(self):
 
         debug("Writing to slave_fd")
         os.write(slave_fd, TEST_STRING_1)
-        s1 = os.read(master_fd, 1024)
+        s1 = _readline(master_fd)
         self.assertEqual(b'I wish to buy a fish license.\n',
                          normalize_output(s1))
 
         debug("Writing chunked output")
         os.write(slave_fd, TEST_STRING_2[:5])
         os.write(slave_fd, TEST_STRING_2[5:])
-        s2 = os.read(master_fd, 1024)
+        s2 = _readline(master_fd)
         self.assertEqual(b'For my pet fish, Eric.\n', normalize_output(s2))
 
         os.close(slave_fd)


From webhook-mailer at python.org  Mon Oct  2 05:57:59 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 02 Oct 2017 09:57:59 -0000
Subject: [Python-checkins] [3.6] bpo-31158: Fix nondeterministic read in
 test_pty (GH-3808) (GH-3852)
Message-ID: <mailman.6.1506938280.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/66fb5ef3bb9e36187a0e5052dfd99899447df671
commit: 66fb5ef3bb9e36187a0e5052dfd99899447df671
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-10-02T02:57:56-07:00
summary:

[3.6] bpo-31158: Fix nondeterministic read in test_pty (GH-3808) (GH-3852)

(cherry picked from commit e6f62f69f07892b993910ff03c9db3ffa5cb9ca5)

files:
M Lib/test/test_pty.py

diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index 15f88e4fcd7..45ebea51a05 100644
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -10,6 +10,7 @@
 import select
 import signal
 import socket
+import io # readline
 import unittest
 
 TEST_STRING_1 = b"I wish to buy a fish license.\n"
@@ -23,6 +24,16 @@ def debug(msg):
         pass
 
 
+# Note that os.read() is nondeterministic so we need to be very careful
+# to make the test suite deterministic.  A normal call to os.read() may
+# give us less than expected.
+#
+# Beware, on my Linux system, if I put 'foo\n' into a terminal fd, I get
+# back 'foo\r\n' at the other end.  The behavior depends on the termios
+# setting.  The newline translation may be OS-specific.  To make the
+# test suite deterministic and OS-independent, the functions _readline
+# and normalize_output can be used.
+
 def normalize_output(data):
     # Some operating systems do conversions on newline.  We could possibly
     # fix that by doing the appropriate termios.tcsetattr()s.  I couldn't
@@ -44,6 +55,12 @@ def normalize_output(data):
 
     return data
 
+def _readline(fd):
+    """Read one line.  May block forever if no newline is read."""
+    reader = io.FileIO(fd, mode='rb', closefd=False)
+    return reader.readline()
+
+
 
 # Marginal testing of pty suite. Cannot do extensive 'do or fail' testing
 # because pty code is not too portable.
@@ -98,14 +115,14 @@ def test_basic(self):
 
         debug("Writing to slave_fd")
         os.write(slave_fd, TEST_STRING_1)
-        s1 = os.read(master_fd, 1024)
+        s1 = _readline(master_fd)
         self.assertEqual(b'I wish to buy a fish license.\n',
                          normalize_output(s1))
 
         debug("Writing chunked output")
         os.write(slave_fd, TEST_STRING_2[:5])
         os.write(slave_fd, TEST_STRING_2[5:])
-        s2 = os.read(master_fd, 1024)
+        s2 = _readline(master_fd)
         self.assertEqual(b'For my pet fish, Eric.\n', normalize_output(s2))
 
         os.close(slave_fd)


From webhook-mailer at python.org  Mon Oct  2 05:58:11 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 02 Oct 2017 09:58:11 -0000
Subject: [Python-checkins] bpo-31158: Fix nondeterministic read in test_pty
 (#3808) (#3853)
Message-ID: <mailman.7.1506938293.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/20cbc1d29facead32c2da06c81a09af0e057015c
commit: 20cbc1d29facead32c2da06c81a09af0e057015c
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-02T02:58:09-07:00
summary:

bpo-31158: Fix nondeterministic read in test_pty (#3808) (#3853)

(cherry picked from commit e6f62f69f07892b993910ff03c9db3ffa5cb9ca5)

files:
M Lib/test/test_pty.py

diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index bec38c45456..f623aa09620 100644
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -11,6 +11,7 @@
 import select
 import signal
 import socket
+import io # readline
 import unittest
 
 TEST_STRING_1 = "I wish to buy a fish license.\n"
@@ -24,6 +25,16 @@ def debug(msg):
         pass
 
 
+# Note that os.read() is nondeterministic so we need to be very careful
+# to make the test suite deterministic.  A normal call to os.read() may
+# give us less than expected.
+#
+# Beware, on my Linux system, if I put 'foo\n' into a terminal fd, I get
+# back 'foo\r\n' at the other end.  The behavior depends on the termios
+# setting.  The newline translation may be OS-specific.  To make the
+# test suite deterministic and OS-independent, the functions _readline
+# and normalize_output can be used.
+
 def normalize_output(data):
     # Some operating systems do conversions on newline.  We could possibly
     # fix that by doing the appropriate termios.tcsetattr()s.  I couldn't
@@ -45,6 +56,12 @@ def normalize_output(data):
 
     return data
 
+def _readline(fd):
+    """Read one line.  May block forever if no newline is read."""
+    reader = io.FileIO(fd, mode='rb', closefd=False)
+    return reader.readline()
+
+
 
 # Marginal testing of pty suite. Cannot do extensive 'do or fail' testing
 # because pty code is not too portable.
@@ -97,14 +114,14 @@ def test_basic(self):
 
         debug("Writing to slave_fd")
         os.write(slave_fd, TEST_STRING_1)
-        s1 = os.read(master_fd, 1024)
+        s1 = _readline(master_fd)
         self.assertEqual('I wish to buy a fish license.\n',
                          normalize_output(s1))
 
         debug("Writing chunked output")
         os.write(slave_fd, TEST_STRING_2[:5])
         os.write(slave_fd, TEST_STRING_2[5:])
-        s2 = os.read(master_fd, 1024)
+        s2 = _readline(master_fd)
         self.assertEqual('For my pet fish, Eric.\n', normalize_output(s2))
 
         os.close(slave_fd)


From webhook-mailer at python.org  Mon Oct  2 10:42:18 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Mon, 02 Oct 2017 14:42:18 -0000
Subject: [Python-checkins] bpo-31516: current_thread() should not return a
 dummy thread at shutdown (#3673)
Message-ID: <mailman.8.1506955340.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/1023dbbcb7f05e76053486ae7ef7f73b4cdc5398
commit: 1023dbbcb7f05e76053486ae7ef7f73b4cdc5398
branch: master
author: Antoine Pitrou <pitrou at free.fr>
committer: GitHub <noreply at github.com>
date: 2017-10-02T16:42:15+02:00
summary:

bpo-31516: current_thread() should not return a dummy thread at shutdown (#3673)

bpo-31516: current_thread() should not return a dummy thread at shutdown

files:
A Misc/NEWS.d/next/Library/2017-09-20-18-43-01.bpo-31516.23Yuq3.rst
M Lib/test/test_threading.py
M Lib/threading.py

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index f7c3680bda3..6e1ae06f792 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -547,6 +547,35 @@ def f():
         self.assertEqual(err, b"")
         self.assertEqual(data, "Thread-1\nTrue\nTrue\n")
 
+    def test_main_thread_during_shutdown(self):
+        # bpo-31516: current_thread() should still point to the main thread
+        # at shutdown
+        code = """if 1:
+            import gc, threading
+
+            main_thread = threading.current_thread()
+            assert main_thread is threading.main_thread()  # sanity check
+
+            class RefCycle:
+                def __init__(self):
+                    self.cycle = self
+
+                def __del__(self):
+                    print("GC:",
+                          threading.current_thread() is main_thread,
+                          threading.main_thread() is main_thread,
+                          threading.enumerate() == [main_thread])
+
+            RefCycle()
+            gc.collect()  # sanity check
+            x = RefCycle()
+        """
+        _, out, err = assert_python_ok("-c", code)
+        data = out.decode()
+        self.assertEqual(err, b"")
+        self.assertEqual(data.splitlines(),
+                         ["GC: True True True"] * 2)
+
     def test_tstate_lock(self):
         # Test an implementation detail of Thread objects.
         started = _thread.allocate_lock()
diff --git a/Lib/threading.py b/Lib/threading.py
index e4bf974495b..418116faceb 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -1158,8 +1158,8 @@ def run(self):
             self.function(*self.args, **self.kwargs)
         self.finished.set()
 
+
 # Special thread class to represent the main thread
-# This is garbage collected through an exit handler
 
 class _MainThread(Thread):
 
@@ -1272,7 +1272,6 @@ def _shutdown():
     while t:
         t.join()
         t = _pickSomeNonDaemonThread()
-    _main_thread._delete()
 
 def _pickSomeNonDaemonThread():
     for t in enumerate():
diff --git a/Misc/NEWS.d/next/Library/2017-09-20-18-43-01.bpo-31516.23Yuq3.rst b/Misc/NEWS.d/next/Library/2017-09-20-18-43-01.bpo-31516.23Yuq3.rst
new file mode 100644
index 00000000000..af48d159fef
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-09-20-18-43-01.bpo-31516.23Yuq3.rst
@@ -0,0 +1 @@
+``threading.current_thread()`` should not return a dummy thread at shutdown.


From webhook-mailer at python.org  Mon Oct  2 10:58:03 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 02 Oct 2017 14:58:03 -0000
Subject: [Python-checkins] bpo-11063: Fix _uuid module on macOS (#3855)
Message-ID: <mailman.9.1506956284.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/4337a0d9955f0855ba38ef30feec3858d304abf0
commit: 4337a0d9955f0855ba38ef30feec3858d304abf0
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-02T07:57:59-07:00
summary:

bpo-11063: Fix _uuid module on macOS (#3855)

On macOS, use uuid_generate_time() instead of
uuid_generate_time_safe() of libuuid, since uuid_generate_time_safe()
is not available.

files:
M Lib/uuid.py
M Modules/_uuidmodule.c

diff --git a/Lib/uuid.py b/Lib/uuid.py
index b2fbd38c353..3123ff88a16 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -509,7 +509,7 @@ def _load_system_functions():
         pass
     elif _uuid is not None:
         _generate_time_safe = _uuid.generate_time_safe
-        _has_uuid_generate_time_safe = True
+        _has_uuid_generate_time_safe = _uuid.has_uuid_generate_time_safe
         return
 
     try:
diff --git a/Modules/_uuidmodule.c b/Modules/_uuidmodule.c
index e263b40d8ff..88c40ce3537 100644
--- a/Modules/_uuidmodule.c
+++ b/Modules/_uuidmodule.c
@@ -4,14 +4,27 @@
 #include <uuid/uuid.h>
 
 
+/* bpo-11063: libuuid on macOS doesn't provide uuid_generate_time_safe(),
+   only uuid_generate_time(). */
+#ifndef __APPLE__
+#  define HAVE_TIME_SAFE
+#endif
+
+
 static PyObject *
 py_uuid_generate_time_safe(void)
 {
+#ifdef HAVE_TIME_SAFE
     uuid_t out;
     int res;
 
     res = uuid_generate_time_safe(out);
     return Py_BuildValue("y#i", (const char *) out, sizeof(out), res);
+#else
+    uuid_t out;
+    uuid_generate_time(out);
+    return Py_BuildValue("y#O", (const char *) out, sizeof(out), Py_None);
+#endif
 }
 
 
@@ -30,6 +43,21 @@ static struct PyModuleDef uuidmodule = {
 PyMODINIT_FUNC
 PyInit__uuid(void)
 {
+    PyObject *mod;
     assert(sizeof(uuid_t) == 16);
-    return PyModule_Create(&uuidmodule);
+#ifdef HAVE_TIME_SAFE
+    int has_uuid_generate_time_safe = 1;
+#else
+    int has_uuid_generate_time_safe = 0;
+#endif
+    mod = PyModule_Create(&uuidmodule);
+    if (mod == NULL) {
+        return NULL;
+    }
+    if (PyModule_AddIntConstant(mod, "has_uuid_generate_time_safe",
+                                has_uuid_generate_time_safe) < 0) {
+        return NULL;
+    }
+
+    return mod;
 }


From webhook-mailer at python.org  Mon Oct  2 11:20:05 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Mon, 02 Oct 2017 15:20:05 -0000
Subject: [Python-checkins] [3.6] bpo-31516: current_thread() should not
 return a dummy thread at shutdown (GH-3673) (#3856)
Message-ID: <mailman.10.1506957607.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/ac6245a31f9a757db0520722c592cb7fdcb55eb0
commit: ac6245a31f9a757db0520722c592cb7fdcb55eb0
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Antoine Pitrou <pitrou at free.fr>
date: 2017-10-02T17:20:01+02:00
summary:

[3.6] bpo-31516: current_thread() should not return a dummy thread at shutdown (GH-3673) (#3856)

bpo-31516: current_thread() should not return a dummy thread at shutdown
(cherry picked from commit 1023dbbcb7f05e76053486ae7ef7f73b4cdc5398)

files:
A Misc/NEWS.d/next/Library/2017-09-20-18-43-01.bpo-31516.23Yuq3.rst
M Lib/test/test_threading.py
M Lib/threading.py

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 9cadc0f1c02..b42314fdbb2 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -542,6 +542,35 @@ def f():
         self.assertEqual(err, b"")
         self.assertEqual(data, "Thread-1\nTrue\nTrue\n")
 
+    def test_main_thread_during_shutdown(self):
+        # bpo-31516: current_thread() should still point to the main thread
+        # at shutdown
+        code = """if 1:
+            import gc, threading
+
+            main_thread = threading.current_thread()
+            assert main_thread is threading.main_thread()  # sanity check
+
+            class RefCycle:
+                def __init__(self):
+                    self.cycle = self
+
+                def __del__(self):
+                    print("GC:",
+                          threading.current_thread() is main_thread,
+                          threading.main_thread() is main_thread,
+                          threading.enumerate() == [main_thread])
+
+            RefCycle()
+            gc.collect()  # sanity check
+            x = RefCycle()
+        """
+        _, out, err = assert_python_ok("-c", code)
+        data = out.decode()
+        self.assertEqual(err, b"")
+        self.assertEqual(data.splitlines(),
+                         ["GC: True True True"] * 2)
+
     def test_tstate_lock(self):
         # Test an implementation detail of Thread objects.
         started = _thread.allocate_lock()
diff --git a/Lib/threading.py b/Lib/threading.py
index 95978d310a2..bb2556544b0 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -1182,8 +1182,8 @@ def run(self):
             self.function(*self.args, **self.kwargs)
         self.finished.set()
 
+
 # Special thread class to represent the main thread
-# This is garbage collected through an exit handler
 
 class _MainThread(Thread):
 
@@ -1293,7 +1293,6 @@ def _shutdown():
     while t:
         t.join()
         t = _pickSomeNonDaemonThread()
-    _main_thread._delete()
 
 def _pickSomeNonDaemonThread():
     for t in enumerate():
diff --git a/Misc/NEWS.d/next/Library/2017-09-20-18-43-01.bpo-31516.23Yuq3.rst b/Misc/NEWS.d/next/Library/2017-09-20-18-43-01.bpo-31516.23Yuq3.rst
new file mode 100644
index 00000000000..af48d159fef
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-09-20-18-43-01.bpo-31516.23Yuq3.rst
@@ -0,0 +1 @@
+``threading.current_thread()`` should not return a dummy thread at shutdown.


From webhook-mailer at python.org  Mon Oct  2 11:27:38 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 02 Oct 2017 15:27:38 -0000
Subject: [Python-checkins] bpo-31510: Fix multiprocessing
 test_many_processes() on macOS (#3857)
Message-ID: <mailman.11.1506958058.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/e6cfdefa0c2f5bda177e49b228c2c7528f7c239c
commit: e6cfdefa0c2f5bda177e49b228c2c7528f7c239c
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-02T08:27:34-07:00
summary:

bpo-31510: Fix multiprocessing test_many_processes() on macOS (#3857)

On macOS, a process can exit with -SIGKILL if it is killed "early"
with SIGTERM.

files:
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index fda20f1f408..8e004e21a4f 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -501,8 +501,13 @@ def test_many_processes(self):
         for p in procs:
             join_process(p)
         if os.name != 'nt':
+            exitcodes = [-signal.SIGTERM]
+            if sys.platform == 'darwin':
+                # bpo-31510: On macOS, killing a freshly started process with
+                # SIGTERM sometimes kills the process with SIGKILL.
+                exitcodes.append(-signal.SIGKILL)
             for p in procs:
-                self.assertEqual(p.exitcode, -signal.SIGTERM)
+                self.assertIn(p.exitcode, exitcodes)
 
     def test_lose_target_ref(self):
         c = DummyCallable()


From webhook-mailer at python.org  Mon Oct  2 11:54:00 2017
From: webhook-mailer at python.org (Steve Dower)
Date: Mon, 02 Oct 2017 15:54:00 -0000
Subject: [Python-checkins] bpo-31662: Fix typos in uploadrelease.bat script
Message-ID: <mailman.12.1506959641.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/efb560eee28b6b2418e1231573ca62574d6dc07b
commit: efb560eee28b6b2418e1231573ca62574d6dc07b
branch: master
author: Anselm Kruis <a.kruis at science-computing.de>
committer: Steve Dower <steve.dower at microsoft.com>
date: 2017-10-02T08:53:55-07:00
summary:

bpo-31662: Fix typos in uploadrelease.bat script

files:
M Tools/msi/uploadrelease.bat

diff --git a/Tools/msi/uploadrelease.bat b/Tools/msi/uploadrelease.bat
index 4753fd35032..4902b6cf3f7 100644
--- a/Tools/msi/uploadrelease.bat
+++ b/Tools/msi/uploadrelease.bat
@@ -22,9 +22,9 @@ if "%1" EQU "-t" (set TARGET=%~2) && shift && shift && goto CheckOpts
 if "%1" EQU "--target" (set TARGET=%~2) && shift && shift && goto CheckOpts
 if "%1" EQU "--dry-run" (set DRYRUN=true) && shift && goto CheckOpts
 if "%1" EQU "--skip-gpg" (set NOGPG=true) && shift && goto CheckOpts
-if "%1" EQU "--skip-purge" (set PURGE_OPTION=) && shift && godo CheckOpts
-if "%1" EQU "--skip-test" (set NOTEST=true) && shift && godo CheckOpts
-if "%1" EQU "-T" (set NOTEST=true) && shift && godo CheckOpts
+if "%1" EQU "--skip-purge" (set PURGE_OPTION=) && shift && goto CheckOpts
+if "%1" EQU "--skip-test" (set NOTEST=true) && shift && goto CheckOpts
+if "%1" EQU "-T" (set NOTEST=true) && shift && goto CheckOpts
 if "%1" NEQ "" echo Unexpected argument "%1" & exit /B 1
 
 if not defined PLINK where plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc"


From webhook-mailer at python.org  Mon Oct  2 12:20:31 2017
From: webhook-mailer at python.org (Steve Dower)
Date: Mon, 02 Oct 2017 16:20:31 -0000
Subject: [Python-checkins] [3.6] bpo-31662: Fix typos in uploadrelease.bat
 script (#3858)
Message-ID: <mailman.13.1506961232.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/d6201cb0e865dad116ffe46e5ea3d02e8eeb42c1
commit: d6201cb0e865dad116ffe46e5ea3d02e8eeb42c1
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Steve Dower <steve.dower at microsoft.com>
date: 2017-10-02T09:20:28-07:00
summary:

[3.6] bpo-31662: Fix typos in uploadrelease.bat script (#3858)

(cherry picked from commit efb560eee28b6b2418e1231573ca62574d6dc07b)

files:
M Tools/msi/uploadrelease.bat

diff --git a/Tools/msi/uploadrelease.bat b/Tools/msi/uploadrelease.bat
index 610b092b863..6441db9ee6f 100644
--- a/Tools/msi/uploadrelease.bat
+++ b/Tools/msi/uploadrelease.bat
@@ -22,9 +22,9 @@ if "%1" EQU "-t" (set TARGET=%~2) && shift && shift && goto CheckOpts
 if "%1" EQU "--target" (set TARGET=%~2) && shift && shift && goto CheckOpts
 if "%1" EQU "--dry-run" (set DRYRUN=true) && shift && goto CheckOpts
 if "%1" EQU "--skip-gpg" (set NOGPG=true) && shift && goto CheckOpts
-if "%1" EQU "--skip-purge" (set PURGE_OPTION=) && shift && godo CheckOpts
-if "%1" EQU "--skip-test" (set NOTEST=true) && shift && godo CheckOpts
-if "%1" EQU "-T" (set NOTEST=true) && shift && godo CheckOpts
+if "%1" EQU "--skip-purge" (set PURGE_OPTION=) && shift && goto CheckOpts
+if "%1" EQU "--skip-test" (set NOTEST=true) && shift && goto CheckOpts
+if "%1" EQU "-T" (set NOTEST=true) && shift && goto CheckOpts
 if "%1" NEQ "" echo Unexpected argument "%1" & exit /B 1
 
 if not defined PLINK where plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc"


From webhook-mailer at python.org  Mon Oct  2 17:31:50 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Mon, 02 Oct 2017 21:31:50 -0000
Subject: [Python-checkins] [2.7] bpo-31478: Prevent unwanted behavior in
 _random.Random.seed() in case the arg has a bad __abs__() method (GH-3596)
 (#3845)
Message-ID: <mailman.14.1506979911.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/13da1a60f13e173f65bb0da5ab325641d5bb99ec
commit: 13da1a60f13e173f65bb0da5ab325641d5bb99ec
branch: 2.7
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-03T00:31:42+03:00
summary:

[2.7] bpo-31478: Prevent unwanted behavior in _random.Random.seed() in case the arg has a bad __abs__() method (GH-3596) (#3845)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-01-18-59-40.bpo-31478.owtqoO.rst
M Lib/test/test_random.py
M Modules/_randommodule.c

diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py
index 90d334a835a..d2a4f213f13 100644
--- a/Lib/test/test_random.py
+++ b/Lib/test/test_random.py
@@ -307,6 +307,22 @@ def test_randbelow_logic(self, _log=log, int=int):
 class MersenneTwister_TestBasicOps(TestBasicOps):
     gen = random.Random()
 
+    @test_support.cpython_only
+    def test_bug_31478(self):
+        # _random.Random.seed() should ignore the __abs__() method of a
+        # long/int subclass argument.
+        class BadInt(int):
+            def __abs__(self):
+                1/0
+        class BadLong(long):
+            def __abs__(self):
+                1/0
+        self.gen.seed(42)
+        expected_value = self.gen.random()
+        for seed_arg in [42L, BadInt(42), BadLong(42)]:
+            self.gen.seed(seed_arg)
+            self.assertEqual(self.gen.random(), expected_value)
+
     def test_setstate_first_arg(self):
         self.assertRaises(ValueError, self.gen.setstate, (1, None, None))
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-01-18-59-40.bpo-31478.owtqoO.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-01-18-59-40.bpo-31478.owtqoO.rst
new file mode 100644
index 00000000000..b5b32d6989f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-01-18-59-40.bpo-31478.owtqoO.rst	
@@ -0,0 +1,2 @@
+Prevent unwanted behavior in `_random.Random.seed()` in case the argument
+has a bad ``__abs__()`` method. Patch by Oren Milman.
diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c
index 852b810ae21..2e49db6ef73 100644
--- a/Modules/_randommodule.c
+++ b/Modules/_randommodule.c
@@ -230,9 +230,15 @@ random_seed(RandomObject *self, PyObject *args)
     }
     /* If the arg is an int or long, use its absolute value; else use
      * the absolute value of its hash code.
+     * Calling int.__abs__() or long.__abs__() prevents calling arg.__abs__(),
+     * which might return an invalid value. See issue #31478.
      */
-    if (PyInt_Check(arg) || PyLong_Check(arg))
-        n = PyNumber_Absolute(arg);
+    if (PyInt_Check(arg)) {
+        n = PyInt_Type.tp_as_number->nb_absolute(arg);
+    }
+    else if (PyLong_Check(arg)) {
+        n = PyLong_Type.tp_as_number->nb_absolute(arg);
+    }
     else {
         long hash = PyObject_Hash(arg);
         if (hash == -1)


From webhook-mailer at python.org  Tue Oct  3 04:48:31 2017
From: webhook-mailer at python.org (Ned Deily)
Date: Tue, 03 Oct 2017 08:48:31 -0000
Subject: [Python-checkins] Fix build issues in Doc/make.bat (#3663)
Message-ID: <mailman.15.1507020511.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/564747d91b08a0c53cfec6def85b7b3edb9c65e7
commit: 564747d91b08a0c53cfec6def85b7b3edb9c65e7
branch: 3.6
author: Steve Dower <steve.dower at microsoft.com>
committer: Ned Deily <nad at python.org>
date: 2017-10-02T20:27:33-04:00
summary:

Fix build issues in Doc/make.bat (#3663)

files:
M Doc/make.bat

diff --git a/Doc/make.bat b/Doc/make.bat
index 0472a3de82f..6cb315fda40 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -58,7 +58,7 @@ if "%1" EQU "help" goto help
 if "%1" EQU "check" goto check
 if "%1" EQU "serve" goto serve
 if "%1" == "clean" (
-    rmdir /q /s %BUILDDIR%
+    rmdir /q /s "%BUILDDIR%"
     goto end
 )
 
@@ -107,6 +107,8 @@ echo.be passed by setting the SPHINXOPTS environment variable.
 goto end
 
 :build
+if not exist "%BUILDDIR%" mkdir "%BUILDDIR%"
+
 if exist ..\Misc\NEWS (
     echo.Copying Misc\NEWS to build\NEWS
     copy ..\Misc\NEWS build\NEWS > nul
@@ -123,10 +125,10 @@ if exist ..\Misc\NEWS (
 if NOT "%PAPER%" == "" (
     set SPHINXOPTS=-D latex_elements.papersize=%PAPER% %SPHINXOPTS%
 )
-cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%*
+cmd /S /C "%SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . "%BUILDDIR%\%1" %2 %3 %4 %5 %6 %7 %8 %9"
 
 if "%1" EQU "htmlhelp" (
-    cmd /C "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp
+    "%HTMLHELP%" "%BUILDDIR%\htmlhelp\python%DISTVERSION:.=%.hhp"
     rem hhc.exe seems to always exit with code 1, reset to 0 for less than 2
     if not errorlevel 2 cmd /C exit /b 0
 )
@@ -146,19 +148,19 @@ if NOT "%2" EQU "" (
 )
 cmd /C %this% html
 
-if EXIST %BUILDDIR%\html\index.html (
-    echo.Opening %BUILDDIR%\html\index.html in the default web browser...
-    start %BUILDDIR%\html\index.html
+if EXIST "%BUILDDIR%\html\index.html" (
+    echo.Opening "%BUILDDIR%\html\index.html" in the default web browser...
+    start "%BUILDDIR%\html\index.html"
 )
 
 goto end
 
 :check
-cmd /C %PYTHON% tools\rstlint.py -i tools
+cmd /S /C "%PYTHON% tools\rstlint.py -i tools"
 goto end
 
 :serve
-cmd /C %PYTHON% ..\Tools\scripts\serve.py %BUILDDIR%\html
+cmd /S /C "%PYTHON% ..\Tools\scripts\serve.py "%BUILDDIR%\html""
 goto end
 
 :end


From solipsis at pitrou.net  Tue Oct  3 05:07:06 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 03 Oct 2017 09:07:06 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=4
Message-ID: <20171003090705.100623.79CB4B79EBD7D3F4@psf.io>

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

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


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

From webhook-mailer at python.org  Tue Oct  3 05:53:19 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Tue, 03 Oct 2017 09:53:19 -0000
Subject: [Python-checkins] bpo-31540: Allow passing multiprocessing context
 to ProcessPoolExecutor (#3682)
Message-ID: <mailman.16.1507024401.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/e8c368df22c344183627e7ef882bea1683fe6dbe
commit: e8c368df22c344183627e7ef882bea1683fe6dbe
branch: master
author: Thomas Moreau <thomas.moreau.2010 at gmail.com>
committer: Antoine Pitrou <pitrou at free.fr>
date: 2017-10-03T11:53:17+02:00
summary:

bpo-31540: Allow passing multiprocessing context to ProcessPoolExecutor (#3682)

files:
A Misc/NEWS.d/next/Library/2017-09-22-16-02-00.bpo-31540.ybDHT5.rst
M .travis.yml
M Doc/library/concurrent.futures.rst
M Lib/concurrent/futures/process.py
M Lib/test/test_concurrent_futures.py

diff --git a/.travis.yml b/.travis.yml
index 2e0ad87affb..185846029c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,7 +56,7 @@ matrix:
             ./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 --fail-env-changed -uall,-cpu -x test_multiprocessing_fork -x test_multiprocessing_forkserver -x test_multiprocessing_spawn
+        - ./venv/bin/python -m coverage run --pylib -m test --fail-env-changed -uall,-cpu -x test_multiprocessing_fork -x test_multiprocessing_forkserver -x test_multiprocessing_spawn -x test_concurrent_futures
       after_script:  # Probably should be after_success once test suite updated to run under coverage.py.
         # Make the `coverage` command available to Codecov w/ a version of Python that can parse all source files.
         - source ./venv/bin/activate
diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst
index d85576b8bed..30556fbb345 100644
--- a/Doc/library/concurrent.futures.rst
+++ b/Doc/library/concurrent.futures.rst
@@ -191,13 +191,16 @@ that :class:`ProcessPoolExecutor` will not work in the interactive interpreter.
 Calling :class:`Executor` or :class:`Future` methods from a callable submitted
 to a :class:`ProcessPoolExecutor` will result in deadlock.
 
-.. class:: ProcessPoolExecutor(max_workers=None)
+.. class:: ProcessPoolExecutor(max_workers=None, mp_context=None)
 
    An :class:`Executor` subclass that executes calls asynchronously using a pool
    of at most *max_workers* processes.  If *max_workers* is ``None`` or not
    given, it will default to the number of processors on the machine.
    If *max_workers* is lower or equal to ``0``, then a :exc:`ValueError`
    will be raised.
+   *mp_context* can be a multiprocessing context or None. It will be used to
+   launch the workers. If *mp_context* is ``None`` or not given, the default
+   multiprocessing context is used.
 
    .. versionchanged:: 3.3
       When one of the worker processes terminates abruptly, a
@@ -205,6 +208,10 @@ to a :class:`ProcessPoolExecutor` will result in deadlock.
       was undefined but operations on the executor or its futures would often
       freeze or deadlock.
 
+   .. versionchanged:: 3.7
+      The *mp_context* argument was added to allow users to control the
+      start_method for worker processes created by the pool.
+
 
 .. _processpoolexecutor-example:
 
diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py
index 50ee296ac89..67ebbf51521 100644
--- a/Lib/concurrent/futures/process.py
+++ b/Lib/concurrent/futures/process.py
@@ -50,8 +50,7 @@
 from concurrent.futures import _base
 import queue
 from queue import Full
-import multiprocessing
-from multiprocessing import SimpleQueue
+import multiprocessing as mp
 from multiprocessing.connection import wait
 import threading
 import weakref
@@ -74,11 +73,11 @@
 # threads/processes finish.
 
 _threads_queues = weakref.WeakKeyDictionary()
-_shutdown = False
+_global_shutdown = False
 
 def _python_exit():
-    global _shutdown
-    _shutdown = True
+    global _global_shutdown
+    _global_shutdown = True
     items = list(_threads_queues.items())
     for t, q in items:
         q.put(None)
@@ -158,12 +157,10 @@ def _process_worker(call_queue, result_queue):
     This worker is run in a separate process.
 
     Args:
-        call_queue: A multiprocessing.Queue of _CallItems that will be read and
+        call_queue: A ctx.Queue of _CallItems that will be read and
             evaluated by the worker.
-        result_queue: A multiprocessing.Queue of _ResultItems that will written
+        result_queue: A ctx.Queue of _ResultItems that will written
             to by the worker.
-        shutdown: A multiprocessing.Event that will be set as a signal to the
-            worker that it should exit when call_queue is empty.
     """
     while True:
         call_item = call_queue.get(block=True)
@@ -180,6 +177,11 @@ def _process_worker(call_queue, result_queue):
             result_queue.put(_ResultItem(call_item.work_id,
                                          result=r))
 
+        # Liberate the resource as soon as possible, to avoid holding onto
+        # open files or shared memory that is not needed anymore
+        del call_item
+
+
 def _add_call_item_to_queue(pending_work_items,
                             work_ids,
                             call_queue):
@@ -231,20 +233,21 @@ def _queue_management_worker(executor_reference,
         executor_reference: A weakref.ref to the ProcessPoolExecutor that owns
             this thread. Used to determine if the ProcessPoolExecutor has been
             garbage collected and that this function can exit.
-        process: A list of the multiprocessing.Process instances used as
+        process: A list of the ctx.Process instances used as
             workers.
         pending_work_items: A dict mapping work ids to _WorkItems e.g.
             {5: <_WorkItem...>, 6: <_WorkItem...>, ...}
         work_ids_queue: A queue.Queue of work ids e.g. Queue([5, 6, ...]).
-        call_queue: A multiprocessing.Queue that will be filled with _CallItems
+        call_queue: A ctx.Queue that will be filled with _CallItems
             derived from _WorkItems for processing by the process workers.
-        result_queue: A multiprocessing.Queue of _ResultItems generated by the
+        result_queue: A ctx.SimpleQueue of _ResultItems generated by the
             process workers.
     """
     executor = None
 
     def shutting_down():
-        return _shutdown or executor is None or executor._shutdown_thread
+        return (_global_shutdown or executor is None
+                or executor._shutdown_thread)
 
     def shutdown_worker():
         # This is an upper bound
@@ -254,7 +257,7 @@ def shutdown_worker():
         # Release the queue's resources as soon as possible.
         call_queue.close()
         # If .join() is not called on the created processes then
-        # some multiprocessing.Queue methods may deadlock on Mac OS X.
+        # some ctx.Queue methods may deadlock on Mac OS X.
         for p in processes.values():
             p.join()
 
@@ -377,13 +380,15 @@ class BrokenProcessPool(RuntimeError):
 
 
 class ProcessPoolExecutor(_base.Executor):
-    def __init__(self, max_workers=None):
+    def __init__(self, max_workers=None, mp_context=None):
         """Initializes a new ProcessPoolExecutor instance.
 
         Args:
             max_workers: The maximum number of processes that can be used to
                 execute the given calls. If None or not given then as many
                 worker processes will be created as the machine has processors.
+            mp_context: A multiprocessing context to launch the workers. This
+                object should provide SimpleQueue, Queue and Process.
         """
         _check_system_limits()
 
@@ -394,17 +399,20 @@ def __init__(self, max_workers=None):
                 raise ValueError("max_workers must be greater than 0")
 
             self._max_workers = max_workers
+        if mp_context is None:
+            mp_context = mp.get_context()
+        self._mp_context = mp_context
 
         # Make the call queue slightly larger than the number of processes to
         # prevent the worker processes from idling. But don't make it too big
         # because futures in the call queue cannot be cancelled.
-        self._call_queue = multiprocessing.Queue(self._max_workers +
-                                                 EXTRA_QUEUED_CALLS)
+        queue_size = self._max_workers + EXTRA_QUEUED_CALLS
+        self._call_queue = mp_context.Queue(queue_size)
         # Killed worker processes can produce spurious "broken pipe"
         # tracebacks in the queue's own worker thread. But we detect killed
         # processes anyway, so silence the tracebacks.
         self._call_queue._ignore_epipe = True
-        self._result_queue = SimpleQueue()
+        self._result_queue = mp_context.SimpleQueue()
         self._work_ids = queue.Queue()
         self._queue_management_thread = None
         # Map of pids to processes
@@ -426,23 +434,23 @@ def weakref_cb(_, q=self._result_queue):
             # Start the processes so that their sentinels are known.
             self._adjust_process_count()
             self._queue_management_thread = threading.Thread(
-                    target=_queue_management_worker,
-                    args=(weakref.ref(self, weakref_cb),
-                          self._processes,
-                          self._pending_work_items,
-                          self._work_ids,
-                          self._call_queue,
-                          self._result_queue))
+                target=_queue_management_worker,
+                args=(weakref.ref(self, weakref_cb),
+                      self._processes,
+                      self._pending_work_items,
+                      self._work_ids,
+                      self._call_queue,
+                      self._result_queue))
             self._queue_management_thread.daemon = True
             self._queue_management_thread.start()
             _threads_queues[self._queue_management_thread] = self._result_queue
 
     def _adjust_process_count(self):
         for _ in range(len(self._processes), self._max_workers):
-            p = multiprocessing.Process(
-                    target=_process_worker,
-                    args=(self._call_queue,
-                          self._result_queue))
+            p = self._mp_context.Process(
+                target=_process_worker,
+                args=(self._call_queue,
+                      self._result_queue))
             p.start()
             self._processes[p.pid] = p
 
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index e4c9ace9356..ed8ad41f8e6 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -19,6 +19,7 @@
 from concurrent.futures._base import (
     PENDING, RUNNING, CANCELLED, CANCELLED_AND_NOTIFIED, FINISHED, Future)
 from concurrent.futures.process import BrokenProcessPool
+from multiprocessing import get_context
 
 
 def create_future(state=PENDING, exception=None, result=None):
@@ -56,6 +57,15 @@ def my_method(self):
         pass
 
 
+class EventfulGCObj():
+    def __init__(self, ctx):
+        mgr = get_context(ctx).Manager()
+        self.event = mgr.Event()
+
+    def __del__(self):
+        self.event.set()
+
+
 def make_dummy_object(_):
     return MyObject()
 
@@ -77,7 +87,13 @@ def setUp(self):
 
         self.t1 = time.time()
         try:
-            self.executor = self.executor_type(max_workers=self.worker_count)
+            if hasattr(self, "ctx"):
+                self.executor = self.executor_type(
+                    max_workers=self.worker_count,
+                    mp_context=get_context(self.ctx))
+            else:
+                self.executor = self.executor_type(
+                    max_workers=self.worker_count)
         except NotImplementedError as e:
             self.skipTest(str(e))
         self._prime_executor()
@@ -107,8 +123,29 @@ class ThreadPoolMixin(ExecutorMixin):
     executor_type = futures.ThreadPoolExecutor
 
 
-class ProcessPoolMixin(ExecutorMixin):
+class ProcessPoolForkMixin(ExecutorMixin):
+    executor_type = futures.ProcessPoolExecutor
+    ctx = "fork"
+
+    def setUp(self):
+        if sys.platform == "win32":
+            self.skipTest("require unix system")
+        super().setUp()
+
+
+class ProcessPoolSpawnMixin(ExecutorMixin):
+    executor_type = futures.ProcessPoolExecutor
+    ctx = "spawn"
+
+
+class ProcessPoolForkserverMixin(ExecutorMixin):
     executor_type = futures.ProcessPoolExecutor
+    ctx = "forkserver"
+
+    def setUp(self):
+        if sys.platform == "win32":
+            self.skipTest("require unix system")
+        super().setUp()
 
 
 class ExecutorShutdownTest:
@@ -124,9 +161,17 @@ def test_interpreter_shutdown(self):
             from concurrent.futures import {executor_type}
             from time import sleep
             from test.test_concurrent_futures import sleep_and_print
-            t = {executor_type}(5)
-            t.submit(sleep_and_print, 1.0, "apple")
-            """.format(executor_type=self.executor_type.__name__))
+            if __name__ == "__main__":
+                context = '{context}'
+                if context == "":
+                    t = {executor_type}(5)
+                else:
+                    from multiprocessing import get_context
+                    context = get_context(context)
+                    t = {executor_type}(5, mp_context=context)
+                t.submit(sleep_and_print, 1.0, "apple")
+            """.format(executor_type=self.executor_type.__name__,
+                       context=getattr(self, "ctx", "")))
         # Errors in atexit hooks don't change the process exit code, check
         # stderr manually.
         self.assertFalse(err)
@@ -194,7 +239,7 @@ def test_thread_names_default(self):
             t.join()
 
 
-class ProcessPoolShutdownTest(ProcessPoolMixin, ExecutorShutdownTest, BaseTestCase):
+class ProcessPoolShutdownTest(ExecutorShutdownTest):
     def _prime_executor(self):
         pass
 
@@ -233,6 +278,22 @@ def test_del_shutdown(self):
         call_queue.join_thread()
 
 
+class ProcessPoolForkShutdownTest(ProcessPoolForkMixin, BaseTestCase,
+                                  ProcessPoolShutdownTest):
+    pass
+
+
+class ProcessPoolForkserverShutdownTest(ProcessPoolForkserverMixin,
+                                        BaseTestCase,
+                                        ProcessPoolShutdownTest):
+    pass
+
+
+class ProcessPoolSpawnShutdownTest(ProcessPoolSpawnMixin, BaseTestCase,
+                                   ProcessPoolShutdownTest):
+    pass
+
+
 class WaitTests:
 
     def test_first_completed(self):
@@ -352,7 +413,17 @@ def future_func():
             sys.setswitchinterval(oldswitchinterval)
 
 
-class ProcessPoolWaitTests(ProcessPoolMixin, WaitTests, BaseTestCase):
+class ProcessPoolForkWaitTests(ProcessPoolForkMixin, WaitTests, BaseTestCase):
+    pass
+
+
+class ProcessPoolForkserverWaitTests(ProcessPoolForkserverMixin, WaitTests,
+                                     BaseTestCase):
+    pass
+
+
+class ProcessPoolSpawnWaitTests(ProcessPoolSpawnMixin, BaseTestCase,
+                                WaitTests):
     pass
 
 
@@ -440,7 +511,19 @@ class ThreadPoolAsCompletedTests(ThreadPoolMixin, AsCompletedTests, BaseTestCase
     pass
 
 
-class ProcessPoolAsCompletedTests(ProcessPoolMixin, AsCompletedTests, BaseTestCase):
+class ProcessPoolForkAsCompletedTests(ProcessPoolForkMixin, AsCompletedTests,
+                                      BaseTestCase):
+    pass
+
+
+class ProcessPoolForkserverAsCompletedTests(ProcessPoolForkserverMixin,
+                                            AsCompletedTests,
+                                            BaseTestCase):
+    pass
+
+
+class ProcessPoolSpawnAsCompletedTests(ProcessPoolSpawnMixin, AsCompletedTests,
+                                       BaseTestCase):
     pass
 
 
@@ -540,7 +623,7 @@ def test_default_workers(self):
                          (os.cpu_count() or 1) * 5)
 
 
-class ProcessPoolExecutorTest(ProcessPoolMixin, ExecutorTest, BaseTestCase):
+class ProcessPoolExecutorTest(ExecutorTest):
     def test_killed_child(self):
         # When a child process is abruptly terminated, the whole pool gets
         # "broken".
@@ -595,6 +678,34 @@ def test_traceback(self):
         self.assertIn('raise RuntimeError(123) # some comment',
                       f1.getvalue())
 
+    def test_ressources_gced_in_workers(self):
+        # Ensure that argument for a job are correctly gc-ed after the job
+        # is finished
+        obj = EventfulGCObj(self.ctx)
+        future = self.executor.submit(id, obj)
+        future.result()
+
+        self.assertTrue(obj.event.wait(timeout=1))
+
+
+class ProcessPoolForkExecutorTest(ProcessPoolForkMixin,
+                                  ProcessPoolExecutorTest,
+                                  BaseTestCase):
+    pass
+
+
+class ProcessPoolForkserverExecutorTest(ProcessPoolForkserverMixin,
+                                        ProcessPoolExecutorTest,
+                                        BaseTestCase):
+    pass
+
+
+class ProcessPoolSpawnExecutorTest(ProcessPoolSpawnMixin,
+                                   ProcessPoolExecutorTest,
+                                   BaseTestCase):
+    pass
+
+
 
 class FutureTests(BaseTestCase):
     def test_done_callback_with_result(self):
diff --git a/Misc/NEWS.d/next/Library/2017-09-22-16-02-00.bpo-31540.ybDHT5.rst b/Misc/NEWS.d/next/Library/2017-09-22-16-02-00.bpo-31540.ybDHT5.rst
new file mode 100644
index 00000000000..0b4259f8847
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-09-22-16-02-00.bpo-31540.ybDHT5.rst
@@ -0,0 +1,4 @@
+Allow passing a context object in
+:class:`concurrent.futures.ProcessPoolExecutor` constructor.
+Also, free job ressources in :class:`concurrent.futures.ProcessPoolExecutor`
+earlier to improve memory usage when a worker waits for new jobs.


From webhook-mailer at python.org  Tue Oct  3 06:46:37 2017
From: webhook-mailer at python.org (INADA Naoki)
Date: Tue, 03 Oct 2017 10:46:37 -0000
Subject: [Python-checkins] bpo-31415: Add `-X importtime` option (GH-3490)
Message-ID: <mailman.17.1507027598.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/1a87de7fcfa3c19f08e29047337c350b4a32b259
commit: 1a87de7fcfa3c19f08e29047337c350b4a32b259
branch: master
author: INADA Naoki <methane at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-10-03T19:46:34+09:00
summary:

bpo-31415: Add `-X importtime` option (GH-3490)

It shows show import time of each module.
It's useful for optimizing startup time.

Typical usage: python -X importtime -c 'import requests'

files:
A Misc/NEWS.d/next/Core and Builtins/2017-09-11-14-28-56.bpo-31415.GBdz7o.rst
M Doc/using/cmdline.rst
M Python/import.c

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 5adad159e65..9c1c269d1df 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -407,6 +407,10 @@ Miscellaneous options
    * ``-X showalloccount`` to output the total count of allocated objects for
      each type when the program finishes. This only works when Python was built with
      ``COUNT_ALLOCS`` defined.
+   * ``-X importtime`` to show how long each import takes. It shows module name,
+     cumulative time (including nested imports) and self time (exluding nested
+     imports).  Note that its output may be broken in multi threaded application.
+     Typical usage is ``python3 -X importtime -c 'import asyncio'``.
 
    It also allows passing arbitrary values and retrieving them through the
    :data:`sys._xoptions` dictionary.
@@ -423,6 +427,9 @@ Miscellaneous options
    .. versionadded:: 3.6
       The ``-X showalloccount`` option.
 
+   .. versionadded:: 3.7
+      The ``-X importtime`` option.
+
 
 Options you shouldn't use
 ~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-11-14-28-56.bpo-31415.GBdz7o.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-11-14-28-56.bpo-31415.GBdz7o.rst
new file mode 100644
index 00000000000..52aa16a972b
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-09-11-14-28-56.bpo-31415.GBdz7o.rst	
@@ -0,0 +1,2 @@
+Add ``-X importtime`` option to show how long each import takes. It can
+be used to optimize application's startup time.
diff --git a/Python/import.c b/Python/import.c
index e50ea4d03cc..7554bf86272 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1667,8 +1667,38 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals,
         }
     }
     else {
+        static int ximporttime = 0;
+        static int import_level;
+        static _PyTime_t accumulated;
+        _Py_IDENTIFIER(importtime);
+
+        _PyTime_t t1 = 0, accumulated_copy = accumulated;
+
         Py_XDECREF(mod);
 
+        /* XOptions is initialized after first some imports.
+         * So we can't have negative cache.
+         * Anyway, importlib.__find_and_load is much slower than
+         * _PyDict_GetItemId()
+         */
+        if (ximporttime == 0) {
+            PyObject *xoptions = PySys_GetXOptions();
+            if (xoptions) {
+                PyObject *value = _PyDict_GetItemId(xoptions, &PyId_importtime);
+                ximporttime = (value == Py_True);
+            }
+            if (ximporttime) {
+                fputs("import time: self [us] | cumulative | imported package\n",
+                      stderr);
+            }
+        }
+
+        if (ximporttime) {
+            import_level++;
+            t1 = _PyTime_GetMonotonicClock();
+            accumulated = 0;
+        }
+
         if (PyDTrace_IMPORT_FIND_LOAD_START_ENABLED())
             PyDTrace_IMPORT_FIND_LOAD_START(PyUnicode_AsUTF8(abs_name));
 
@@ -1680,6 +1710,18 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals,
             PyDTrace_IMPORT_FIND_LOAD_DONE(PyUnicode_AsUTF8(abs_name),
                                            mod != NULL);
 
+        if (ximporttime) {
+            _PyTime_t cum = _PyTime_GetMonotonicClock() - t1;
+
+            import_level--;
+            fprintf(stderr, "import time: %9ld | %10ld | %*s%s\n",
+                    (long)_PyTime_AsMicroseconds(cum - accumulated, _PyTime_ROUND_CEILING),
+                    (long)_PyTime_AsMicroseconds(cum, _PyTime_ROUND_CEILING),
+                    import_level*2, "", PyUnicode_AsUTF8(abs_name));
+
+            accumulated = accumulated_copy + cum;
+        }
+
         if (mod == NULL) {
             goto error;
         }


From webhook-mailer at python.org  Tue Oct  3 07:13:47 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 03 Oct 2017 11:13:47 -0000
Subject: [Python-checkins] bpo-31619: Fixed a ValueError when convert a
 string with large number of underscores (#3827)
Message-ID: <mailman.18.1507029228.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/85c0b8941f0c8ef3ed787c9d504712c6ad3eb5d3
commit: 85c0b8941f0c8ef3ed787c9d504712c6ad3eb5d3
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-03T14:13:44+03:00
summary:

bpo-31619: Fixed a ValueError when convert a string with large number of underscores (#3827)

to integer with binary base.

files:
A Misc/NEWS.d/next/Core and Builtins/2017-09-29-20-32-24.bpo-31619.6gQ1kv.rst
M Lib/test/test_int.py
M Objects/longobject.c

diff --git a/Lib/test/test_int.py b/Lib/test/test_int.py
index 854117efd74..c048b712da8 100644
--- a/Lib/test/test_int.py
+++ b/Lib/test/test_int.py
@@ -508,5 +508,13 @@ def check(s, base=None):
         check('123\ud800')
         check('123\ud800', 10)
 
+    def test_issue31619(self):
+        self.assertEqual(int('1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1', 2),
+                         0b1010101010101010101010101010101)
+        self.assertEqual(int('1_2_3_4_5_6_7_0_1_2_3', 8), 0o12345670123)
+        self.assertEqual(int('1_2_3_4_5_6_7_8_9', 16), 0x123456789)
+        self.assertEqual(int('1_2_3_4_5_6_7', 32), 1144132807)
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-29-20-32-24.bpo-31619.6gQ1kv.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-29-20-32-24.bpo-31619.6gQ1kv.rst
new file mode 100644
index 00000000000..3efcc9d134d
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-09-29-20-32-24.bpo-31619.6gQ1kv.rst	
@@ -0,0 +1,2 @@
+Fixed a ValueError when convert a string with large number of underscores
+to integer with binary base.
diff --git a/Objects/longobject.c b/Objects/longobject.c
index 3b07585669e..c71b783cc03 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -2057,15 +2057,15 @@ long_from_binary_base(const char **str, int base, PyLongObject **res)
     }
 
     *str = p;
-    /* n <- # of Python digits needed, = ceiling(n/PyLong_SHIFT). */
-    n = digits * bits_per_char + PyLong_SHIFT - 1;
-    if (n / bits_per_char < p - start) {
+    /* n <- the number of Python digits needed,
+            = ceiling((digits * bits_per_char) / PyLong_SHIFT). */
+    if (digits > (PY_SSIZE_T_MAX - (PyLong_SHIFT - 1)) / bits_per_char) {
         PyErr_SetString(PyExc_ValueError,
                         "int string too large to convert");
         *res = NULL;
         return 0;
     }
-    n = n / PyLong_SHIFT;
+    n = (digits * bits_per_char + PyLong_SHIFT - 1) / PyLong_SHIFT;
     z = _PyLong_New(n);
     if (z == NULL) {
         *res = NULL;


From webhook-mailer at python.org  Tue Oct  3 08:38:49 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 03 Oct 2017 12:38:49 -0000
Subject: [Python-checkins] [3.6] bpo-31619: Fixed a ValueError when convert
 a string with large number of underscores (GH-3827) (#3863)
Message-ID: <mailman.19.1507034330.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/b5a630f3dd30ed628e088efe7523e650087adba2
commit: b5a630f3dd30ed628e088efe7523e650087adba2
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-03T15:38:46+03:00
summary:

[3.6] bpo-31619: Fixed a ValueError when convert a string with large number of underscores (GH-3827) (#3863)

to integer with binary base.
(cherry picked from commit 85c0b8941f0c8ef3ed787c9d504712c6ad3eb5d3)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-09-29-20-32-24.bpo-31619.6gQ1kv.rst
M Lib/test/test_int.py
M Objects/longobject.c

diff --git a/Lib/test/test_int.py b/Lib/test/test_int.py
index 14bbd6192a0..a36076e0104 100644
--- a/Lib/test/test_int.py
+++ b/Lib/test/test_int.py
@@ -506,5 +506,13 @@ def check(s, base=None):
         check('123\ud800')
         check('123\ud800', 10)
 
+    def test_issue31619(self):
+        self.assertEqual(int('1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1', 2),
+                         0b1010101010101010101010101010101)
+        self.assertEqual(int('1_2_3_4_5_6_7_0_1_2_3', 8), 0o12345670123)
+        self.assertEqual(int('1_2_3_4_5_6_7_8_9', 16), 0x123456789)
+        self.assertEqual(int('1_2_3_4_5_6_7', 32), 1144132807)
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-29-20-32-24.bpo-31619.6gQ1kv.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-29-20-32-24.bpo-31619.6gQ1kv.rst
new file mode 100644
index 00000000000..3efcc9d134d
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-09-29-20-32-24.bpo-31619.6gQ1kv.rst	
@@ -0,0 +1,2 @@
+Fixed a ValueError when convert a string with large number of underscores
+to integer with binary base.
diff --git a/Objects/longobject.c b/Objects/longobject.c
index ad239ce84e2..450087b5b15 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -2049,15 +2049,15 @@ long_from_binary_base(const char **str, int base, PyLongObject **res)
     }
 
     *str = p;
-    /* n <- # of Python digits needed, = ceiling(n/PyLong_SHIFT). */
-    n = digits * bits_per_char + PyLong_SHIFT - 1;
-    if (n / bits_per_char < p - start) {
+    /* n <- the number of Python digits needed,
+            = ceiling((digits * bits_per_char) / PyLong_SHIFT). */
+    if (digits > (PY_SSIZE_T_MAX - (PyLong_SHIFT - 1)) / bits_per_char) {
         PyErr_SetString(PyExc_ValueError,
                         "int string too large to convert");
         *res = NULL;
         return 0;
     }
-    n = n / PyLong_SHIFT;
+    n = (digits * bits_per_char + PyLong_SHIFT - 1) / PyLong_SHIFT;
     z = _PyLong_New(n);
     if (z == NULL) {
         *res = NULL;


From webhook-mailer at python.org  Tue Oct  3 12:46:59 2017
From: webhook-mailer at python.org (Mariatta)
Date: Tue, 03 Oct 2017 16:46:59 -0000
Subject: [Python-checkins] bpo-31657: Add test coverage for the __debug__
 case (GH-3450)
Message-ID: <mailman.20.1507049220.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/543386b7f077d210ea0722079d68beb6c066730a
commit: 543386b7f077d210ea0722079d68beb6c066730a
branch: master
author: diana <diana.joan.clarke at gmail.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-10-03T09:46:56-07:00
summary:

bpo-31657: Add test coverage for the __debug__ case (GH-3450)

Update the compile tests for optimization levels to also check that
__debug__ blocks are included or excluded based on the optimization
level.
Patch by Diana Clarke.

files:
M Lib/test/test_builtin.py

diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 9d949b74cb8..87dcda7b434 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -328,19 +328,22 @@ def test_compile(self):
 
         codestr = '''def f():
         """doc"""
+        debug_enabled = False
+        if __debug__:
+            debug_enabled = True
         try:
             assert False
         except AssertionError:
-            return (True, f.__doc__)
+            return (True, f.__doc__, debug_enabled)
         else:
-            return (False, f.__doc__)
+            return (False, f.__doc__, debug_enabled)
         '''
         def f(): """doc"""
-        values = [(-1, __debug__, f.__doc__),
-                  (0, True, 'doc'),
-                  (1, False, 'doc'),
-                  (2, False, None)]
-        for optval, debugval, docstring in values:
+        values = [(-1, __debug__, f.__doc__, __debug__),
+                  (0, True, 'doc', True),
+                  (1, False, 'doc', False),
+                  (2, False, None, False)]
+        for optval, assertval, docstring, debugval in values:
             # test both direct compilation and compilation via AST
             codeobjs = []
             codeobjs.append(compile(codestr, "<test>", "exec", optimize=optval))
@@ -350,7 +353,7 @@ def f(): """doc"""
                 ns = {}
                 exec(code, ns)
                 rv = ns['f']()
-                self.assertEqual(rv, (debugval, docstring))
+                self.assertEqual(rv, (assertval, docstring, debugval))
 
     def test_delattr(self):
         sys.spam = 1


From webhook-mailer at python.org  Tue Oct  3 14:37:26 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 03 Oct 2017 18:37:26 -0000
Subject: [Python-checkins] bpo-31673: Fixed typo in the name of Tkinter's
 method adderrorinfo(). (#3864)
Message-ID: <mailman.21.1507055880.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/929b40a601db868530d6beaafb3256822103a7fb
commit: 929b40a601db868530d6beaafb3256822103a7fb
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-03T21:37:22+03:00
summary:

bpo-31673: Fixed typo in the name of Tkinter's method adderrorinfo(). (#3864)

files:
A Misc/NEWS.d/next/Library/2017-10-03-14-37-46.bpo-31673.RFCrka.rst
M Modules/_tkinter.c
M Modules/clinic/_tkinter.c.h

diff --git a/Misc/NEWS.d/next/Library/2017-10-03-14-37-46.bpo-31673.RFCrka.rst b/Misc/NEWS.d/next/Library/2017-10-03-14-37-46.bpo-31673.RFCrka.rst
new file mode 100644
index 00000000000..8fce050c041
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-03-14-37-46.bpo-31673.RFCrka.rst
@@ -0,0 +1 @@
+Fixed typo in the name of Tkinter's method adderrorinfo().
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 91d3dd583ed..07ebaddd8c5 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1640,7 +1640,7 @@ _tkinter_tkapp_record_impl(TkappObject *self, const char *script)
 }
 
 /*[clinic input]
-_tkinter.tkapp.adderrinfo
+_tkinter.tkapp.adderrorinfo
 
     msg: str
     /
@@ -1648,8 +1648,8 @@ _tkinter.tkapp.adderrinfo
 [clinic start generated code]*/
 
 static PyObject *
-_tkinter_tkapp_adderrinfo_impl(TkappObject *self, const char *msg)
-/*[clinic end generated code: output=0e222ee2050eb357 input=4971399317d4c136]*/
+_tkinter_tkapp_adderrorinfo_impl(TkappObject *self, const char *msg)
+/*[clinic end generated code: output=52162eaca2ee53cb input=f4b37aec7c7e8c77]*/
 {
     CHECK_STRING_LENGTH(msg);
     CHECK_TCL_APPARTMENT;
@@ -3253,7 +3253,7 @@ static PyMethodDef Tkapp_methods[] =
     _TKINTER_TKAPP_EVAL_METHODDEF
     _TKINTER_TKAPP_EVALFILE_METHODDEF
     _TKINTER_TKAPP_RECORD_METHODDEF
-    _TKINTER_TKAPP_ADDERRINFO_METHODDEF
+    _TKINTER_TKAPP_ADDERRORINFO_METHODDEF
     {"setvar",                 Tkapp_SetVar, METH_VARARGS},
     {"globalsetvar",       Tkapp_GlobalSetVar, METH_VARARGS},
     {"getvar",       Tkapp_GetVar, METH_VARARGS},
diff --git a/Modules/clinic/_tkinter.c.h b/Modules/clinic/_tkinter.c.h
index 040a745b28e..6b8dabb0b56 100644
--- a/Modules/clinic/_tkinter.c.h
+++ b/Modules/clinic/_tkinter.c.h
@@ -80,27 +80,27 @@ _tkinter_tkapp_record(TkappObject *self, PyObject *arg)
     return return_value;
 }
 
-PyDoc_STRVAR(_tkinter_tkapp_adderrinfo__doc__,
-"adderrinfo($self, msg, /)\n"
+PyDoc_STRVAR(_tkinter_tkapp_adderrorinfo__doc__,
+"adderrorinfo($self, msg, /)\n"
 "--\n"
 "\n");
 
-#define _TKINTER_TKAPP_ADDERRINFO_METHODDEF    \
-    {"adderrinfo", (PyCFunction)_tkinter_tkapp_adderrinfo, METH_O, _tkinter_tkapp_adderrinfo__doc__},
+#define _TKINTER_TKAPP_ADDERRORINFO_METHODDEF    \
+    {"adderrorinfo", (PyCFunction)_tkinter_tkapp_adderrorinfo, METH_O, _tkinter_tkapp_adderrorinfo__doc__},
 
 static PyObject *
-_tkinter_tkapp_adderrinfo_impl(TkappObject *self, const char *msg);
+_tkinter_tkapp_adderrorinfo_impl(TkappObject *self, const char *msg);
 
 static PyObject *
-_tkinter_tkapp_adderrinfo(TkappObject *self, PyObject *arg)
+_tkinter_tkapp_adderrorinfo(TkappObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *msg;
 
-    if (!PyArg_Parse(arg, "s:adderrinfo", &msg)) {
+    if (!PyArg_Parse(arg, "s:adderrorinfo", &msg)) {
         goto exit;
     }
-    return_value = _tkinter_tkapp_adderrinfo_impl(self, msg);
+    return_value = _tkinter_tkapp_adderrorinfo_impl(self, msg);
 
 exit:
     return return_value;
@@ -638,4 +638,4 @@ _tkinter_getbusywaitinterval(PyObject *module, PyObject *Py_UNUSED(ignored))
 #ifndef _TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF
     #define _TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF
 #endif /* !defined(_TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF) */
-/*[clinic end generated code: output=3b9241f7c703ae4f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ca36236c57713ba0 input=a9049054013a1b77]*/


From webhook-mailer at python.org  Tue Oct  3 15:39:40 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 03 Oct 2017 19:39:40 -0000
Subject: [Python-checkins] [3.6] bpo-31673: Fixed typo in the name of
 Tkinter's method adderrorinfo(). (GH-3864). (#3873)
Message-ID: <mailman.22.1507059581.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/fcc832a4fafcbbaca5484ed0274935e14c9dcf6b
commit: fcc832a4fafcbbaca5484ed0274935e14c9dcf6b
branch: 3.6
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-03T22:39:37+03:00
summary:

[3.6] bpo-31673: Fixed typo in the name of Tkinter's method adderrorinfo(). (GH-3864). (#3873)

(cherry picked from commit 929b40a601db868530d6beaafb3256822103a7fb)

files:
A Misc/NEWS.d/next/Library/2017-10-03-14-37-46.bpo-31673.RFCrka.rst
M Modules/_tkinter.c
M Modules/clinic/_tkinter.c.h

diff --git a/Misc/NEWS.d/next/Library/2017-10-03-14-37-46.bpo-31673.RFCrka.rst b/Misc/NEWS.d/next/Library/2017-10-03-14-37-46.bpo-31673.RFCrka.rst
new file mode 100644
index 00000000000..8fce050c041
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-03-14-37-46.bpo-31673.RFCrka.rst
@@ -0,0 +1 @@
+Fixed typo in the name of Tkinter's method adderrorinfo().
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 4a1324cb7e6..ef6f8bcfcc9 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1668,7 +1668,7 @@ _tkinter_tkapp_record_impl(TkappObject *self, const char *script)
 }
 
 /*[clinic input]
-_tkinter.tkapp.adderrinfo
+_tkinter.tkapp.adderrorinfo
 
     msg: str
     /
@@ -1676,8 +1676,8 @@ _tkinter.tkapp.adderrinfo
 [clinic start generated code]*/
 
 static PyObject *
-_tkinter_tkapp_adderrinfo_impl(TkappObject *self, const char *msg)
-/*[clinic end generated code: output=0e222ee2050eb357 input=4971399317d4c136]*/
+_tkinter_tkapp_adderrorinfo_impl(TkappObject *self, const char *msg)
+/*[clinic end generated code: output=52162eaca2ee53cb input=f4b37aec7c7e8c77]*/
 {
     CHECK_STRING_LENGTH(msg);
     CHECK_TCL_APPARTMENT;
@@ -3304,7 +3304,7 @@ static PyMethodDef Tkapp_methods[] =
     _TKINTER_TKAPP_EVAL_METHODDEF
     _TKINTER_TKAPP_EVALFILE_METHODDEF
     _TKINTER_TKAPP_RECORD_METHODDEF
-    _TKINTER_TKAPP_ADDERRINFO_METHODDEF
+    _TKINTER_TKAPP_ADDERRORINFO_METHODDEF
     {"setvar",                 Tkapp_SetVar, METH_VARARGS},
     {"globalsetvar",       Tkapp_GlobalSetVar, METH_VARARGS},
     {"getvar",       Tkapp_GetVar, METH_VARARGS},
diff --git a/Modules/clinic/_tkinter.c.h b/Modules/clinic/_tkinter.c.h
index edd53800058..c407f17da4c 100644
--- a/Modules/clinic/_tkinter.c.h
+++ b/Modules/clinic/_tkinter.c.h
@@ -80,27 +80,27 @@ _tkinter_tkapp_record(TkappObject *self, PyObject *arg)
     return return_value;
 }
 
-PyDoc_STRVAR(_tkinter_tkapp_adderrinfo__doc__,
-"adderrinfo($self, msg, /)\n"
+PyDoc_STRVAR(_tkinter_tkapp_adderrorinfo__doc__,
+"adderrorinfo($self, msg, /)\n"
 "--\n"
 "\n");
 
-#define _TKINTER_TKAPP_ADDERRINFO_METHODDEF    \
-    {"adderrinfo", (PyCFunction)_tkinter_tkapp_adderrinfo, METH_O, _tkinter_tkapp_adderrinfo__doc__},
+#define _TKINTER_TKAPP_ADDERRORINFO_METHODDEF    \
+    {"adderrorinfo", (PyCFunction)_tkinter_tkapp_adderrorinfo, METH_O, _tkinter_tkapp_adderrorinfo__doc__},
 
 static PyObject *
-_tkinter_tkapp_adderrinfo_impl(TkappObject *self, const char *msg);
+_tkinter_tkapp_adderrorinfo_impl(TkappObject *self, const char *msg);
 
 static PyObject *
-_tkinter_tkapp_adderrinfo(TkappObject *self, PyObject *arg)
+_tkinter_tkapp_adderrorinfo(TkappObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *msg;
 
-    if (!PyArg_Parse(arg, "s:adderrinfo", &msg)) {
+    if (!PyArg_Parse(arg, "s:adderrorinfo", &msg)) {
         goto exit;
     }
-    return_value = _tkinter_tkapp_adderrinfo_impl(self, msg);
+    return_value = _tkinter_tkapp_adderrorinfo_impl(self, msg);
 
 exit:
     return return_value;
@@ -638,4 +638,4 @@ _tkinter_getbusywaitinterval(PyObject *module, PyObject *Py_UNUSED(ignored))
 #ifndef _TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF
     #define _TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF
 #endif /* !defined(_TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF) */
-/*[clinic end generated code: output=836c578b71d69097 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b0be55aacff2be9b input=a9049054013a1b77]*/


From webhook-mailer at python.org  Tue Oct  3 15:39:59 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 03 Oct 2017 19:39:59 -0000
Subject: [Python-checkins] bpo-31675: Fix memory leaks in Tkinter's methods
 splitlist() and split() (#3866)
Message-ID: <mailman.23.1507059600.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/27c623c845dd6e4b8e1782666ca3a956636da266
commit: 27c623c845dd6e4b8e1782666ca3a956636da266
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-03T22:39:55+03:00
summary:

bpo-31675: Fix memory leaks in Tkinter's methods splitlist() and split() (#3866)

when pass a string larger than 2 GiB.

Decrease memory requirements for Tcl's bigmem tests.

files:
A Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst
M Lib/test/test_tcl.py
M Modules/_tkinter.c

diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index 8ffd1853147..db99b75eec6 100644
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -662,32 +662,44 @@ def setUp(self):
     @support.bigmemtest(size=INT_MAX + 1, memuse=5, dry_run=False)
     def test_huge_string_call(self, size):
         value = ' ' * size
-        self.assertRaises(OverflowError, self.interp.call, 'set', '_', value)
+        self.assertRaises(OverflowError, self.interp.call, 'string', 'index', value, 0)
 
     @support.cpython_only
     @unittest.skipUnless(INT_MAX < PY_SSIZE_T_MAX, "needs UINT_MAX < SIZE_MAX")
-    @support.bigmemtest(size=INT_MAX + 1, memuse=9, dry_run=False)
+    @support.bigmemtest(size=INT_MAX + 1, memuse=2, dry_run=False)
     def test_huge_string_builtins(self, size):
+        tk = self.interp.tk
         value = '1' + ' ' * size
-        self.assertRaises(OverflowError, self.interp.tk.getint, value)
-        self.assertRaises(OverflowError, self.interp.tk.getdouble, value)
-        self.assertRaises(OverflowError, self.interp.tk.getboolean, value)
-        self.assertRaises(OverflowError, self.interp.eval, value)
-        self.assertRaises(OverflowError, self.interp.evalfile, value)
-        self.assertRaises(OverflowError, self.interp.record, value)
-        self.assertRaises(OverflowError, self.interp.adderrorinfo, value)
-        self.assertRaises(OverflowError, self.interp.setvar, value, 'x', 'a')
-        self.assertRaises(OverflowError, self.interp.setvar, 'x', value, 'a')
-        self.assertRaises(OverflowError, self.interp.unsetvar, value)
-        self.assertRaises(OverflowError, self.interp.unsetvar, 'x', value)
-        self.assertRaises(OverflowError, self.interp.adderrorinfo, value)
-        self.assertRaises(OverflowError, self.interp.exprstring, value)
-        self.assertRaises(OverflowError, self.interp.exprlong, value)
-        self.assertRaises(OverflowError, self.interp.exprboolean, value)
-        self.assertRaises(OverflowError, self.interp.splitlist, value)
-        self.assertRaises(OverflowError, self.interp.split, value)
-        self.assertRaises(OverflowError, self.interp.createcommand, value, max)
-        self.assertRaises(OverflowError, self.interp.deletecommand, value)
+        self.assertRaises(OverflowError, tk.getint, value)
+        self.assertRaises(OverflowError, tk.getdouble, value)
+        self.assertRaises(OverflowError, tk.getboolean, value)
+        self.assertRaises(OverflowError, tk.eval, value)
+        self.assertRaises(OverflowError, tk.evalfile, value)
+        self.assertRaises(OverflowError, tk.record, value)
+        self.assertRaises(OverflowError, tk.adderrorinfo, value)
+        self.assertRaises(OverflowError, tk.setvar, value, 'x', 'a')
+        self.assertRaises(OverflowError, tk.setvar, 'x', value, 'a')
+        self.assertRaises(OverflowError, tk.unsetvar, value)
+        self.assertRaises(OverflowError, tk.unsetvar, 'x', value)
+        self.assertRaises(OverflowError, tk.adderrorinfo, value)
+        self.assertRaises(OverflowError, tk.exprstring, value)
+        self.assertRaises(OverflowError, tk.exprlong, value)
+        self.assertRaises(OverflowError, tk.exprboolean, value)
+        self.assertRaises(OverflowError, tk.splitlist, value)
+        self.assertRaises(OverflowError, tk.split, value)
+        self.assertRaises(OverflowError, tk.createcommand, value, max)
+        self.assertRaises(OverflowError, tk.deletecommand, value)
+
+    @support.cpython_only
+    @unittest.skipUnless(INT_MAX < PY_SSIZE_T_MAX, "needs UINT_MAX < SIZE_MAX")
+    @support.bigmemtest(size=INT_MAX + 1, memuse=6, dry_run=False)
+    def test_huge_string_builtins2(self, size):
+        # These commands require larger memory for possible error messages
+        tk = self.interp.tk
+        value = '1' + ' ' * size
+        self.assertRaises(OverflowError, tk.evalfile, value)
+        self.assertRaises(OverflowError, tk.unsetvar, value)
+        self.assertRaises(OverflowError, tk.unsetvar, 'x', value)
 
 
 def setUpModule():
diff --git a/Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst b/Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst
new file mode 100644
index 00000000000..4e4430773af
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst
@@ -0,0 +1,2 @@
+Fixed memory leaks in Tkinter's methods splitlist() and split() when pass a
+string larger than 2 GiB.
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 07ebaddd8c5..005214e27f7 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -2257,7 +2257,11 @@ _tkinter_tkapp_splitlist(TkappObject *self, PyObject *arg)
     if (!PyArg_Parse(arg, "et:splitlist", "utf-8", &list))
         return NULL;
 
-    CHECK_STRING_LENGTH(list);
+    if (strlen(list) >= INT_MAX) {
+        PyErr_SetString(PyExc_OverflowError, "string is too long");
+        PyMem_Free(list);
+        return NULL;
+    }
     if (Tcl_SplitList(Tkapp_Interp(self), list,
                       &argc, &argv) == TCL_ERROR)  {
         PyMem_Free(list);
@@ -2328,7 +2332,11 @@ _tkinter_tkapp_split(TkappObject *self, PyObject *arg)
 
     if (!PyArg_Parse(arg, "et:split", "utf-8", &list))
         return NULL;
-    CHECK_STRING_LENGTH(list);
+    if (strlen(list) >= INT_MAX) {
+        PyErr_SetString(PyExc_OverflowError, "string is too long");
+        PyMem_Free(list);
+        return NULL;
+    }
     v = Split(list);
     PyMem_Free(list);
     return v;


From webhook-mailer at python.org  Tue Oct  3 16:50:49 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 03 Oct 2017 20:50:49 -0000
Subject: [Python-checkins] [3.6] bpo-31675: Fix memory leaks in Tkinter's
 methods splitlist() and split() (GH-3866) (#3874)
Message-ID: <mailman.24.1507063850.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/a65b2420f681c45db43e94bfe3dc50ad1dfcd03d
commit: a65b2420f681c45db43e94bfe3dc50ad1dfcd03d
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-03T23:50:46+03:00
summary:

[3.6] bpo-31675: Fix memory leaks in Tkinter's methods splitlist() and split() (GH-3866) (#3874)

when pass a string larger than 2 GiB.

Decrease memory requirements for Tcl's bigmem tests.
(cherry picked from commit 27c623c845dd6e4b8e1782666ca3a956636da266)

files:
A Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst
M Lib/test/test_tcl.py
M Modules/_tkinter.c

diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index 8ffd1853147..db99b75eec6 100644
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -662,32 +662,44 @@ def setUp(self):
     @support.bigmemtest(size=INT_MAX + 1, memuse=5, dry_run=False)
     def test_huge_string_call(self, size):
         value = ' ' * size
-        self.assertRaises(OverflowError, self.interp.call, 'set', '_', value)
+        self.assertRaises(OverflowError, self.interp.call, 'string', 'index', value, 0)
 
     @support.cpython_only
     @unittest.skipUnless(INT_MAX < PY_SSIZE_T_MAX, "needs UINT_MAX < SIZE_MAX")
-    @support.bigmemtest(size=INT_MAX + 1, memuse=9, dry_run=False)
+    @support.bigmemtest(size=INT_MAX + 1, memuse=2, dry_run=False)
     def test_huge_string_builtins(self, size):
+        tk = self.interp.tk
         value = '1' + ' ' * size
-        self.assertRaises(OverflowError, self.interp.tk.getint, value)
-        self.assertRaises(OverflowError, self.interp.tk.getdouble, value)
-        self.assertRaises(OverflowError, self.interp.tk.getboolean, value)
-        self.assertRaises(OverflowError, self.interp.eval, value)
-        self.assertRaises(OverflowError, self.interp.evalfile, value)
-        self.assertRaises(OverflowError, self.interp.record, value)
-        self.assertRaises(OverflowError, self.interp.adderrorinfo, value)
-        self.assertRaises(OverflowError, self.interp.setvar, value, 'x', 'a')
-        self.assertRaises(OverflowError, self.interp.setvar, 'x', value, 'a')
-        self.assertRaises(OverflowError, self.interp.unsetvar, value)
-        self.assertRaises(OverflowError, self.interp.unsetvar, 'x', value)
-        self.assertRaises(OverflowError, self.interp.adderrorinfo, value)
-        self.assertRaises(OverflowError, self.interp.exprstring, value)
-        self.assertRaises(OverflowError, self.interp.exprlong, value)
-        self.assertRaises(OverflowError, self.interp.exprboolean, value)
-        self.assertRaises(OverflowError, self.interp.splitlist, value)
-        self.assertRaises(OverflowError, self.interp.split, value)
-        self.assertRaises(OverflowError, self.interp.createcommand, value, max)
-        self.assertRaises(OverflowError, self.interp.deletecommand, value)
+        self.assertRaises(OverflowError, tk.getint, value)
+        self.assertRaises(OverflowError, tk.getdouble, value)
+        self.assertRaises(OverflowError, tk.getboolean, value)
+        self.assertRaises(OverflowError, tk.eval, value)
+        self.assertRaises(OverflowError, tk.evalfile, value)
+        self.assertRaises(OverflowError, tk.record, value)
+        self.assertRaises(OverflowError, tk.adderrorinfo, value)
+        self.assertRaises(OverflowError, tk.setvar, value, 'x', 'a')
+        self.assertRaises(OverflowError, tk.setvar, 'x', value, 'a')
+        self.assertRaises(OverflowError, tk.unsetvar, value)
+        self.assertRaises(OverflowError, tk.unsetvar, 'x', value)
+        self.assertRaises(OverflowError, tk.adderrorinfo, value)
+        self.assertRaises(OverflowError, tk.exprstring, value)
+        self.assertRaises(OverflowError, tk.exprlong, value)
+        self.assertRaises(OverflowError, tk.exprboolean, value)
+        self.assertRaises(OverflowError, tk.splitlist, value)
+        self.assertRaises(OverflowError, tk.split, value)
+        self.assertRaises(OverflowError, tk.createcommand, value, max)
+        self.assertRaises(OverflowError, tk.deletecommand, value)
+
+    @support.cpython_only
+    @unittest.skipUnless(INT_MAX < PY_SSIZE_T_MAX, "needs UINT_MAX < SIZE_MAX")
+    @support.bigmemtest(size=INT_MAX + 1, memuse=6, dry_run=False)
+    def test_huge_string_builtins2(self, size):
+        # These commands require larger memory for possible error messages
+        tk = self.interp.tk
+        value = '1' + ' ' * size
+        self.assertRaises(OverflowError, tk.evalfile, value)
+        self.assertRaises(OverflowError, tk.unsetvar, value)
+        self.assertRaises(OverflowError, tk.unsetvar, 'x', value)
 
 
 def setUpModule():
diff --git a/Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst b/Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst
new file mode 100644
index 00000000000..4e4430773af
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst
@@ -0,0 +1,2 @@
+Fixed memory leaks in Tkinter's methods splitlist() and split() when pass a
+string larger than 2 GiB.
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index ef6f8bcfcc9..68ee26e790c 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -2291,7 +2291,11 @@ _tkinter_tkapp_splitlist(TkappObject *self, PyObject *arg)
     if (!PyArg_Parse(arg, "et:splitlist", "utf-8", &list))
         return NULL;
 
-    CHECK_STRING_LENGTH(list);
+    if (strlen(list) >= INT_MAX) {
+        PyErr_SetString(PyExc_OverflowError, "string is too long");
+        PyMem_Free(list);
+        return NULL;
+    }
     if (Tcl_SplitList(Tkapp_Interp(self), list,
                       &argc, &argv) == TCL_ERROR)  {
         PyMem_Free(list);
@@ -2362,7 +2366,11 @@ _tkinter_tkapp_split(TkappObject *self, PyObject *arg)
 
     if (!PyArg_Parse(arg, "et:split", "utf-8", &list))
         return NULL;
-    CHECK_STRING_LENGTH(list);
+    if (strlen(list) >= INT_MAX) {
+        PyErr_SetString(PyExc_OverflowError, "string is too long");
+        PyMem_Free(list);
+        return NULL;
+    }
     v = Split(list);
     PyMem_Free(list);
     return v;


From lp_benchmark_robot at intel.com  Tue Oct  3 20:08:09 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Tue, 3 Oct 2017 17:08:09 -0700
Subject: [Python-checkins] [2 up,
 63 flat] Results for Python (master branch) 2017-10-02
Message-ID: <c7342b88-d2ef-47ef-b5f8-573591feea1c@orsmsx153.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-02 17:32:36-07:00.
  - commit:		efb560e
  - previous commit:	288d1da
  - revision date:	2017-10-02 08:53:55-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.225% |  -0.026%   |  +3.831%   |  +8.986%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 0.410% |  -1.365%   |  +16.525%  |  +14.842%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 0.708% |  -0.961%   |  +18.132%  |  +12.566%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.456% |  -0.932%   |  +16.753%  |  +13.597%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.509% |  -0.695%   |  +2.884%   |  +16.273%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.690% |  -0.637%   |  +11.299%  |  +9.501%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 1.616% |  +0.041%   |  +7.921%   |  +9.972%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.500% |  +1.025%   |  +3.584%   |  +4.890%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.116% |  +1.264%   |  +6.947%   |  +18.367%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.624% |  -0.571%   |  +10.309%  |  +13.616%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.131% |  -0.375%   |  +4.501%   |  +6.181%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.282% |  +0.051%   |  +7.385%   |  +3.032%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.705% |  -0.293%   |  +3.976%   |  +5.862%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.134% |  +1.276%   |  +8.742%   |  +10.467%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.435% |  +0.202%   |  +7.668%   |  +8.004%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.766% |  -0.478%   |  +7.462%   |  +10.737%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.746% |  +0.290%   |  +9.768%   |  +10.443%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.083% |  +0.905%   |  +9.294%   |  +8.423%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.594% |  -0.577%   |  +4.828%   |  +8.253%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 0.710% |  +1.051%   |  +2.840%   |  +9.515%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.497% |  -0.157%   |  +8.655%   |  +11.008%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.621% |  -0.214%   |  +46.369%  |  +13.099%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.469% |  +1.272%   |  +9.887%   |  +11.792%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.509% |  -1.799%   |  +17.679%  |  +12.545%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 1.033% |  +1.228%   |  +8.468%   |  +9.111%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.019% |  +0.072%   |  +3.724%   |  +5.526%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.417% |  +0.038%   |  -0.593%   |  -1.231%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.853% |  +0.139%   |  +1.753%   |  +8.541%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.403% |  -0.286%   |  +6.390%   |  +9.188%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 4.744% |  -1.518%   |  +0.377%   |  +19.832%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.224% |  -0.259%   |  +3.457%   |  +18.982%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.773% |  +0.354%   |  +6.939%   |  +17.385%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 4.979% |  -0.134%   |  +11.929%  |  +9.408%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.250% |  +0.034%   |  +0.482%   |  +9.823%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.129% |  +1.025%   |  +11.001%  |  +4.553%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.090% |  +0.866%   |  +2.282%   |  +4.575%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.579% |  -0.253%   |  +10.221%  |  +12.435%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.828% |  +1.197%   |  -8.361%   |  +11.271%  |
+-----+------------------------+--------+------------+------------+------------+
| :-) |               regex_dna| 0.472% |  +4.089%   |  +1.931%   |  +8.651%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.682% |  +4.328%   |  +0.338%   |  +3.634%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |                regex_v8| 1.106% |  +4.640%   |  +11.607%  |  +2.718%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.027% |  -0.148%   |  +7.231%   |  +15.071%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 1.715% |  -0.410%   |  +1.822%   |  +0.012%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.722% |  +0.182%   |  +27.044%  |  +7.198%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.806% |  +1.051%   |  +5.812%   |  +5.600%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.609% |  +0.640%   |  +15.947%  |  +6.287%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 2.963% |  -0.557%   |  +3.691%   |  -3.038%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.987% |  -0.628%   |  +5.906%   |  +2.374%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 0.954% |  -0.112%   |  +6.431%   |  +8.464%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.878% |  +0.080%   |  +6.143%   |  +5.985%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 3.717% |  -2.731%   |  +18.416%  |  +10.633%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.529% |  +0.286%   |  +11.733%  |  +9.054%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.479% |  -0.010%   |  +10.512%  |  +6.477%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.077% |  +0.273%   |  +11.929%  |  +9.198%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.811% |  -0.107%   |  +11.167%  |  +12.002%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 6.267% |  +0.047%   |  +22.976%  |  +10.627%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.541% |  -0.219%   |  +6.349%   |  +6.742%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 2.422% |  -1.579%   |  +0.678%   |  -0.461%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 4.083% |  +4.794%   |  +11.120%  |  +19.763%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.484% |  +2.204%   |  +0.383%   |  +16.651%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 3.332% |  -0.589%   |  +7.515%   |  +6.342%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.261% |  -0.346%   |  +6.682%   |  +7.625%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.966% |  -1.467%   |  -0.331%   |  +7.975%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 3.503% |  +0.352%   |  -10.761%  |  +13.711%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.485% |  +0.256%   |  +7.174%   |  +8.329%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/2-up-63-flat-results-for-python-master-branch-2017-10-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  Tue Oct  3 22:56:22 2017
From: webhook-mailer at python.org (Ned Deily)
Date: Wed, 04 Oct 2017 02:56:22 -0000
Subject: [Python-checkins] Remove retired and security branches from active
 docs (#3879)
Message-ID: <mailman.25.1507085782.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/e2d0dd2cf98cfa558435693b9f066edd7cf7d71a
commit: e2d0dd2cf98cfa558435693b9f066edd7cf7d71a
branch: master
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-03T22:56:19-04:00
summary:

Remove retired and security branches from active docs (#3879)

files:
M Doc/tools/static/switchers.js
M Doc/tools/templates/indexsidebar.html

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index bd31faca4c6..c2b342b919a 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -12,9 +12,6 @@
   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',
   };
 
diff --git a/Doc/tools/templates/indexsidebar.html b/Doc/tools/templates/indexsidebar.html
index 72a4d7ae996..4d01842dc67 100644
--- a/Doc/tools/templates/indexsidebar.html
+++ b/Doc/tools/templates/indexsidebar.html
@@ -3,7 +3,6 @@
 <h3>{% trans %}Docs for other versions{% endtrans %}</h3>
 <ul>
   <li><a href="https://docs.python.org/2.7/">{% trans %}Python 2.7 (stable){% endtrans %}</a></li>
-  <li><a href="https://docs.python.org/3.5/">{% trans %}Python 3.5 (stable){% endtrans %}</a></li>
   <li><a href="https://docs.python.org/3.6/">{% trans %}Python 3.6 (stable){% endtrans %}</a></li>
   <li><a href="https://www.python.org/doc/versions/">{% trans %}Old versions{% endtrans %}</a></li>
 </ul>


From webhook-mailer at python.org  Tue Oct  3 23:03:55 2017
From: webhook-mailer at python.org (Ned Deily)
Date: Wed, 04 Oct 2017 03:03:55 -0000
Subject: [Python-checkins] Remove retired and security branches from active
 docs (#3880)
Message-ID: <mailman.26.1507086236.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/598c4d1c10abc2cba73d16d9f7f2bc565d79d19a
commit: 598c4d1c10abc2cba73d16d9f7f2bc565d79d19a
branch: 3.6
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-03T23:03:52-04:00
summary:

Remove retired and security branches from active docs (#3880)

files:
M Doc/tools/static/switchers.js
M Doc/tools/templates/indexsidebar.html

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index bd31faca4c6..c2b342b919a 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -12,9 +12,6 @@
   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',
   };
 
diff --git a/Doc/tools/templates/indexsidebar.html b/Doc/tools/templates/indexsidebar.html
index 413c0a7699c..a3c4bc8e3a9 100644
--- a/Doc/tools/templates/indexsidebar.html
+++ b/Doc/tools/templates/indexsidebar.html
@@ -3,7 +3,6 @@
 <h3>{% trans %}Docs for other versions{% endtrans %}</h3>
 <ul>
   <li><a href="https://docs.python.org/2.7/">{% trans %}Python 2.7 (stable){% endtrans %}</a></li>
-  <li><a href="https://docs.python.org/3.5/">{% trans %}Python 3.5 (stable){% endtrans %}</a></li>
   <li><a href="https://docs.python.org/3.7/">{% trans %}Python 3.7 (in development){% endtrans %}</a></li>
   <li><a href="https://www.python.org/doc/versions/">{% trans %}Old versions{% endtrans %}</a></li>
 </ul>


From webhook-mailer at python.org  Tue Oct  3 23:06:17 2017
From: webhook-mailer at python.org (Ned Deily)
Date: Wed, 04 Oct 2017 03:06:17 -0000
Subject: [Python-checkins] Remove retired and security branches from active
 docs (#3881)
Message-ID: <mailman.27.1507086377.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/8d614bebb67f89af5523127fa146c576ab3a8894
commit: 8d614bebb67f89af5523127fa146c576ab3a8894
branch: 2.7
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-03T23:06:13-04:00
summary:

Remove retired and security branches from active docs (#3881)

files:
M Doc/tools/static/switchers.js
M Doc/tools/templates/indexsidebar.html

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index bd31faca4c6..c2b342b919a 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -12,9 +12,6 @@
   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',
   };
 
diff --git a/Doc/tools/templates/indexsidebar.html b/Doc/tools/templates/indexsidebar.html
index 76071e85d79..847a2eddc2e 100644
--- a/Doc/tools/templates/indexsidebar.html
+++ b/Doc/tools/templates/indexsidebar.html
@@ -2,7 +2,6 @@
 <p><a href="{{ pathto('download') }}">{% trans %}Download these documents{% endtrans %}</a></p>
 <h3>{% trans %}Docs for other versions{% endtrans %}</h3>
 <ul>
-  <li><a href="https://docs.python.org/3.5/">{% trans %}Python 3.5 (stable){% endtrans %}</a></li>
   <li><a href="https://docs.python.org/3.6/">{% trans %}Python 3.6 (stable){% endtrans %}</a></li>
   <li><a href="https://docs.python.org/3.7/">{% trans %}Python 3.7 (in development){% endtrans %}</a></li>
   <li><a href="https://www.python.org/doc/versions/">{% trans %}Old versions{% endtrans %}</a></li>


From webhook-mailer at python.org  Tue Oct  3 23:29:11 2017
From: webhook-mailer at python.org (Ned Deily)
Date: Wed, 04 Oct 2017 03:29:11 -0000
Subject: [Python-checkins] Remove retired and security branches from active
 docs (#3882)
Message-ID: <mailman.28.1507087752.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/0a8ff1bbd7a90baf989e10d0baeb887c80f09100
commit: 0a8ff1bbd7a90baf989e10d0baeb887c80f09100
branch: 3.5
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-03T23:29:07-04:00
summary:

Remove retired and security branches from active docs (#3882)

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

diff --git a/Doc/tools/static/version_switch.js b/Doc/tools/static/version_switch.js
index 8b36a616718..e8889ebfc41 100644
--- a/Doc/tools/static/version_switch.js
+++ b/Doc/tools/static/version_switch.js
@@ -5,8 +5,6 @@
     '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',
   };
 


From webhook-mailer at python.org  Tue Oct  3 23:47:41 2017
From: webhook-mailer at python.org (INADA Naoki)
Date: Wed, 04 Oct 2017 03:47:41 -0000
Subject: [Python-checkins] bpo-31677: email: Remove re.IGNORECASE flag
 (GH-3868)
Message-ID: <mailman.29.1507088862.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/bf477a99e0c85258e6573f4ee9eda68fa1f98a31
commit: bf477a99e0c85258e6573f4ee9eda68fa1f98a31
branch: master
author: INADA Naoki <methane at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-10-04T12:47:38+09:00
summary:

bpo-31677: email: Remove re.IGNORECASE flag (GH-3868)

While there is not real bug in this case, using re.IGNORECASE without re.ASCII
leads unexpected behavior.
Instead of adding re.ASCII, this commit removes re.IGNORECASE flag because
it's easier and simpler.

This commit removes dead copy of the pattern in email.util module too.
While the pattern is same, it is compiled separately because it had different flags.

files:
M Lib/email/header.py
M Lib/email/utils.py

diff --git a/Lib/email/header.py b/Lib/email/header.py
index c7b2dd9f310..7b30a039da1 100644
--- a/Lib/email/header.py
+++ b/Lib/email/header.py
@@ -36,11 +36,11 @@
   =\?                   # literal =?
   (?P<charset>[^?]*?)   # non-greedy up to the next ? is the charset
   \?                    # literal ?
-  (?P<encoding>[qb])    # either a "q" or a "b", case insensitive
+  (?P<encoding>[qQbB])  # either a "q" or a "b", case insensitive
   \?                    # literal ?
   (?P<encoded>.*?)      # non-greedy up to the next ?= is the encoded string
   \?=                   # literal ?=
-  ''', re.VERBOSE | re.IGNORECASE | re.MULTILINE)
+  ''', re.VERBOSE | re.MULTILINE)
 
 # Field name regexp, including trailing colon, but not separating whitespace,
 # according to RFC 2822.  Character range is from tilde to exclamation mark.
diff --git a/Lib/email/utils.py b/Lib/email/utils.py
index 39c22406078..858f620e25b 100644
--- a/Lib/email/utils.py
+++ b/Lib/email/utils.py
@@ -114,18 +114,6 @@ def getaddresses(fieldvalues):
     return a.addresslist
 
 
-
-ecre = re.compile(r'''
-  =\?                   # literal =?
-  (?P<charset>[^?]*?)   # non-greedy up to the next ? is the charset
-  \?                    # literal ?
-  (?P<encoding>[qb])    # either a "q" or a "b", case insensitive
-  \?                    # literal ?
-  (?P<atom>.*?)         # non-greedy up to the next ?= is the atom
-  \?=                   # literal ?=
-  ''', re.VERBOSE | re.IGNORECASE)
-
-
 def _format_timetuple_and_zone(timetuple, zone):
     return '%s, %02d %s %04d %02d:%02d:%02d %s' % (
         ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'][timetuple[6]],


From solipsis at pitrou.net  Wed Oct  4 05:07:19 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 04 Oct 2017 09:07:19 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=9
Message-ID: <20171004090719.90730.EB5F9255414257AF@psf.io>

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

test_collections leaked [0, 7, 0] memory blocks, sum=7
test_functools leaked [0, 3, 1] memory blocks, sum=4
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/reflogl_W71V', '--timeout', '7200']

From webhook-mailer at python.org  Wed Oct  4 12:50:15 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 04 Oct 2017 16:50:15 -0000
Subject: [Python-checkins] bpo-31683: Py_FatalError() now supports long
 error messages (#3878)
Message-ID: <mailman.30.1507135816.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/8d5a3aad2f805dc0ea40829b751f58aa6c75305d
commit: 8d5a3aad2f805dc0ea40829b751f58aa6c75305d
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-04T09:50:12-07:00
summary:

bpo-31683: Py_FatalError() now supports long error messages (#3878)

On Windows, Py_FatalError() now limits the size to 256 bytes of the
buffer used to call OutputDebugStringW(). Previously, the size
depended on the length of the error message.

files:
M Python/pylifecycle.c

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 7adbc29406e..4b0383b4292 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1825,16 +1825,46 @@ _Py_FatalError_PrintExc(int fd)
 
 /* Print fatal error message and abort */
 
+#ifdef MS_WINDOWS
+static void
+fatal_output_debug(const char *msg)
+{
+    /* buffer of 256 bytes allocated on the stack */
+    WCHAR buffer[256 / sizeof(WCHAR)];
+    size_t buflen = Py_ARRAY_LENGTH(buffer) - 1;
+    size_t msglen;
+
+    OutputDebugStringW(L"Fatal Python error: ");
+
+    msglen = strlen(msg);
+    while (msglen) {
+        size_t i;
+
+        if (buflen > msglen) {
+            buflen = msglen;
+        }
+
+        /* Convert the message to wchar_t. This uses a simple one-to-one
+           conversion, assuming that the this error message actually uses
+           ASCII only. If this ceases to be true, we will have to convert. */
+        for (i=0; i < buflen; ++i) {
+            buffer[i] = msg[i];
+        }
+        buffer[i] = L'\0';
+        OutputDebugStringW(buffer);
+
+        msg += buflen;
+        msglen -= buflen;
+    }
+    OutputDebugStringW(L"\n");
+}
+#endif
+
 void
 Py_FatalError(const char *msg)
 {
     const int fd = fileno(stderr);
     static int reentrant = 0;
-#ifdef MS_WINDOWS
-    size_t len;
-    WCHAR* buffer;
-    size_t i;
-#endif
 
     if (reentrant) {
         /* Py_FatalError() caused a second fatal error.
@@ -1848,12 +1878,14 @@ Py_FatalError(const char *msg)
 
     /* Print the exception (if an exception is set) with its traceback,
      * or display the current Python stack. */
-    if (!_Py_FatalError_PrintExc(fd))
+    if (!_Py_FatalError_PrintExc(fd)) {
         _Py_FatalError_DumpTracebacks(fd);
+    }
 
-    /* The main purpose of faulthandler is to display the traceback. We already
-     * did our best to display it. So faulthandler can now be disabled.
-     * (Don't trigger it on abort().) */
+    /* The main purpose of faulthandler is to display the traceback.
+       This function already did its best to display a traceback.
+       Disable faulthandler to prevent writing a second traceback
+       on abort(). */
     _PyFaulthandler_Fini();
 
     /* Check if the current Python thread hold the GIL */
@@ -1863,17 +1895,7 @@ Py_FatalError(const char *msg)
     }
 
 #ifdef MS_WINDOWS
-    len = strlen(msg);
-
-    /* Convert the message to wchar_t. This uses a simple one-to-one
-    conversion, assuming that the this error message actually uses ASCII
-    only. If this ceases to be true, we will have to convert. */
-    buffer = alloca( (len+1) * (sizeof *buffer));
-    for( i=0; i<=len; ++i)
-        buffer[i] = msg[i];
-    OutputDebugStringW(L"Fatal Python error: ");
-    OutputDebugStringW(buffer);
-    OutputDebugStringW(L"\n");
+    fatal_output_debug(msg);
 #endif /* MS_WINDOWS */
 
 exit:


From webhook-mailer at python.org  Wed Oct  4 13:09:52 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 04 Oct 2017 17:09:52 -0000
Subject: [Python-checkins] bpo-30397: Add re.Pattern and re.Match. (#1646)
Message-ID: <mailman.31.1507136993.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/0b5e61ddca73ad4fe597fb15065115b0285c8849
commit: 0b5e61ddca73ad4fe597fb15065115b0285c8849
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-04T20:09:49+03:00
summary:

bpo-30397: Add re.Pattern and re.Match. (#1646)

files:
A Misc/NEWS.d/next/Library/2017-10-03-22-45-50.bpo-30397.e4F7Kr.rst
M Doc/howto/regex.rst
M Doc/library/fnmatch.rst
M Doc/library/re.rst
M Lib/idlelib/idle_test/test_calltips.py
M Lib/re.py
M Lib/sre_constants.py
M Lib/telnetlib.py
M Lib/test/test_optparse.py
M Lib/test/test_re.py
M Lib/unittest/case.py
M Modules/_sre.c
M Modules/clinic/_sre.c.h

diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
index d9b7c9091d4..3121a9ffb82 100644
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -402,7 +402,7 @@ should store the result in a variable for later use. ::
 
    >>> m = p.match('tempo')
    >>> m  #doctest: +ELLIPSIS
-   <_sre.SRE_Match object; span=(0, 5), match='tempo'>
+   <re.Match object; span=(0, 5), match='tempo'>
 
 Now you can query the :ref:`match object <match-objects>` for information
 about the matching string.  :ref:`match object <match-objects>` instances
@@ -441,7 +441,7 @@ case. ::
    >>> print(p.match('::: message'))
    None
    >>> m = p.search('::: message'); print(m)  #doctest: +ELLIPSIS
-   <_sre.SRE_Match object; span=(4, 11), match='message'>
+   <re.Match object; span=(4, 11), match='message'>
    >>> m.group()
    'message'
    >>> m.span()
@@ -493,7 +493,7 @@ the RE string added as the first argument, and still return either ``None`` or a
    >>> print(re.match(r'From\s+', 'Fromage amk'))
    None
    >>> re.match(r'From\s+', 'From amk Thu May 14 19:12:10 1998')  #doctest: +ELLIPSIS
-   <_sre.SRE_Match object; span=(0, 5), match='From '>
+   <re.Match object; span=(0, 5), match='From '>
 
 Under the hood, these functions simply create a pattern object for you
 and call the appropriate method on it.  They also store the compiled
@@ -685,7 +685,7 @@ given location, they can obviously be matched an infinite number of times.
    line, the RE to use is ``^From``. ::
 
       >>> print(re.search('^From', 'From Here to Eternity'))  #doctest: +ELLIPSIS
-      <_sre.SRE_Match object; span=(0, 4), match='From'>
+      <re.Match object; span=(0, 4), match='From'>
       >>> print(re.search('^From', 'Reciting From Memory'))
       None
 
@@ -697,11 +697,11 @@ given location, they can obviously be matched an infinite number of times.
    or any location followed by a newline character.     ::
 
       >>> print(re.search('}$', '{block}'))  #doctest: +ELLIPSIS
-      <_sre.SRE_Match object; span=(6, 7), match='}'>
+      <re.Match object; span=(6, 7), match='}'>
       >>> print(re.search('}$', '{block} '))
       None
       >>> print(re.search('}$', '{block}\n'))  #doctest: +ELLIPSIS
-      <_sre.SRE_Match object; span=(6, 7), match='}'>
+      <re.Match object; span=(6, 7), match='}'>
 
    To match a literal ``'$'``, use ``\$`` or enclose it inside a character class,
    as in  ``[$]``.
@@ -726,7 +726,7 @@ given location, they can obviously be matched an infinite number of times.
 
       >>> p = re.compile(r'\bclass\b')
       >>> print(p.search('no class at all'))  #doctest: +ELLIPSIS
-      <_sre.SRE_Match object; span=(3, 8), match='class'>
+      <re.Match object; span=(3, 8), match='class'>
       >>> print(p.search('the declassified algorithm'))
       None
       >>> print(p.search('one subclass is'))
@@ -744,7 +744,7 @@ given location, they can obviously be matched an infinite number of times.
       >>> print(p.search('no class at all'))
       None
       >>> print(p.search('\b' + 'class' + '\b'))  #doctest: +ELLIPSIS
-      <_sre.SRE_Match object; span=(0, 7), match='\x08class\x08'>
+      <re.Match object; span=(0, 7), match='\x08class\x08'>
 
    Second, inside a character class, where there's no use for this assertion,
    ``\b`` represents the backspace character, for compatibility with Python's
diff --git a/Doc/library/fnmatch.rst b/Doc/library/fnmatch.rst
index 634c26e9570..abf95235505 100644
--- a/Doc/library/fnmatch.rst
+++ b/Doc/library/fnmatch.rst
@@ -86,7 +86,7 @@ patterns.
       '(?s:.*\\.txt)\\Z'
       >>> reobj = re.compile(regex)
       >>> reobj.match('foobar.txt')
-      <_sre.SRE_Match object; span=(0, 10), match='foobar.txt'>
+      <re.Match object; span=(0, 10), match='foobar.txt'>
 
 
 .. seealso::
diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index 138e7d87996..7efdd5d9d65 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -492,7 +492,7 @@ form.
 
    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
+   :func:`~Pattern.match`, :func:`~Pattern.search` and other methods, described
    below.
 
    The expression's behaviour can be modified by specifying a *flags* value.
@@ -747,7 +747,7 @@ form.
       >>> re.sub(r'\sAND\s', ' & ', 'Baked Beans And Spam', flags=re.IGNORECASE)
       'Baked Beans & Spam'
 
-   The pattern may be a string or an RE object.
+   The pattern may be a string or a :class:`Pattern` object.
 
    The optional argument *count* is the maximum number of pattern occurrences to be
    replaced; *count* must be a non-negative integer.  If omitted or zero, all
@@ -861,7 +861,7 @@ Regular Expression Objects
 Compiled regular expression objects support the following methods and
 attributes:
 
-.. method:: regex.search(string[, pos[, endpos]])
+.. method:: Pattern.search(string[, pos[, endpos]])
 
    Scan through *string* looking for the first location where this regular
    expression produces a match, and return a corresponding :ref:`match object
@@ -884,11 +884,11 @@ attributes:
 
    >>> pattern = re.compile("d")
    >>> pattern.search("dog")     # Match at index 0
-   <_sre.SRE_Match object; span=(0, 1), match='d'>
+   <re.Match object; span=(0, 1), match='d'>
    >>> pattern.search("dog", 1)  # No match; search doesn't include the "d"
 
 
-.. method:: regex.match(string[, pos[, endpos]])
+.. method:: Pattern.match(string[, pos[, endpos]])
 
    If zero or more characters at the *beginning* of *string* match this regular
    expression, return a corresponding :ref:`match object <match-objects>`.
@@ -896,86 +896,86 @@ attributes:
    different from a zero-length match.
 
    The optional *pos* and *endpos* parameters have the same meaning as for the
-   :meth:`~regex.search` method.
+   :meth:`~Pattern.search` method.
 
    >>> pattern = re.compile("o")
    >>> pattern.match("dog")      # No match as "o" is not at the start of "dog".
    >>> pattern.match("dog", 1)   # Match as "o" is the 2nd character of "dog".
-   <_sre.SRE_Match object; span=(1, 2), match='o'>
+   <re.Match object; span=(1, 2), match='o'>
 
    If you want to locate a match anywhere in *string*, use
-   :meth:`~regex.search` instead (see also :ref:`search-vs-match`).
+   :meth:`~Pattern.search` instead (see also :ref:`search-vs-match`).
 
 
-.. method:: regex.fullmatch(string[, pos[, endpos]])
+.. method:: Pattern.fullmatch(string[, pos[, endpos]])
 
    If the whole *string* matches this regular expression, return a corresponding
    :ref:`match object <match-objects>`.  Return ``None`` if the string does not
    match the pattern; note that this is different from a zero-length match.
 
    The optional *pos* and *endpos* parameters have the same meaning as for the
-   :meth:`~regex.search` method.
+   :meth:`~Pattern.search` method.
 
    >>> pattern = re.compile("o[gh]")
    >>> pattern.fullmatch("dog")      # No match as "o" is not at the start of "dog".
    >>> pattern.fullmatch("ogre")     # No match as not the full string matches.
    >>> pattern.fullmatch("doggie", 1, 3)   # Matches within given limits.
-   <_sre.SRE_Match object; span=(1, 3), match='og'>
+   <re.Match object; span=(1, 3), match='og'>
 
    .. versionadded:: 3.4
 
 
-.. method:: regex.split(string, maxsplit=0)
+.. method:: Pattern.split(string, maxsplit=0)
 
    Identical to the :func:`split` function, using the compiled pattern.
 
 
-.. method:: regex.findall(string[, pos[, endpos]])
+.. method:: Pattern.findall(string[, pos[, endpos]])
 
    Similar to the :func:`findall` function, using the compiled pattern, but
    also accepts optional *pos* and *endpos* parameters that limit the search
    region like for :meth:`match`.
 
 
-.. method:: regex.finditer(string[, pos[, endpos]])
+.. method:: Pattern.finditer(string[, pos[, endpos]])
 
    Similar to the :func:`finditer` function, using the compiled pattern, but
    also accepts optional *pos* and *endpos* parameters that limit the search
    region like for :meth:`match`.
 
 
-.. method:: regex.sub(repl, string, count=0)
+.. method:: Pattern.sub(repl, string, count=0)
 
    Identical to the :func:`sub` function, using the compiled pattern.
 
 
-.. method:: regex.subn(repl, string, count=0)
+.. method:: Pattern.subn(repl, string, count=0)
 
    Identical to the :func:`subn` function, using the compiled pattern.
 
 
-.. attribute:: regex.flags
+.. attribute:: Pattern.flags
 
    The regex matching flags.  This is a combination of the flags given to
    :func:`.compile`, any ``(?...)`` inline flags in the pattern, and implicit
    flags such as :data:`UNICODE` if the pattern is a Unicode string.
 
 
-.. attribute:: regex.groups
+.. attribute:: Pattern.groups
 
    The number of capturing groups in the pattern.
 
 
-.. attribute:: regex.groupindex
+.. attribute:: Pattern.groupindex
 
    A dictionary mapping any symbolic group names defined by ``(?P<id>)`` to group
    numbers.  The dictionary is empty if no symbolic groups were used in the
    pattern.
 
 
-.. attribute:: regex.pattern
+.. attribute:: Pattern.pattern
 
-   The pattern string from which the RE object was compiled.
+   The pattern string from which the pattern object was compiled.
 
 
 .. versionchanged:: 3.7
@@ -989,7 +989,7 @@ Match Objects
 -------------
 
 Match objects always have a boolean value of ``True``.
-Since :meth:`~regex.match` and :meth:`~regex.search` return ``None``
+Since :meth:`~Pattern.match` and :meth:`~Pattern.search` return ``None``
 when there is no match, you can test whether there was a match with a simple
 ``if`` statement::
 
@@ -1000,10 +1000,10 @@ when there is no match, you can test whether there was a match with a simple
 Match objects support the following methods and attributes:
 
 
-.. method:: match.expand(template)
+.. method:: Match.expand(template)
 
    Return the string obtained by doing backslash substitution on the template
-   string *template*, as done by the :meth:`~regex.sub` method.
+   string *template*, as done by the :meth:`~Pattern.sub` method.
    Escapes such as ``\n`` are converted to the appropriate characters,
    and numeric backreferences (``\1``, ``\2``) and named backreferences
    (``\g<1>``, ``\g<name>``) are replaced by the contents of the
@@ -1012,7 +1012,7 @@ Match objects support the following methods and attributes:
    .. versionchanged:: 3.5
       Unmatched groups are replaced with an empty string.
 
-.. method:: match.group([group1, ...])
+.. method:: Match.group([group1, ...])
 
    Returns one or more subgroups of the match.  If there is a single argument, the
    result is a single string; if there are multiple arguments, the result is a
@@ -1063,7 +1063,7 @@ Match objects support the following methods and attributes:
       'c3'
 
 
-.. method:: match.__getitem__(g)
+.. method:: Match.__getitem__(g)
 
    This is identical to ``m.group(g)``.  This allows easier access to
    an individual group from a match:
@@ -1079,7 +1079,7 @@ Match objects support the following methods and attributes:
    .. versionadded:: 3.6
 
 
-.. method:: match.groups(default=None)
+.. method:: Match.groups(default=None)
 
    Return a tuple containing all the subgroups of the match, from 1 up to however
    many groups are in the pattern.  The *default* argument is used for groups that
@@ -1102,7 +1102,7 @@ Match objects support the following methods and attributes:
       ('24', '0')
 
 
-.. method:: match.groupdict(default=None)
+.. method:: Match.groupdict(default=None)
 
    Return a dictionary containing all the *named* subgroups of the match, keyed by
    the subgroup name.  The *default* argument is used for groups that did not
@@ -1113,8 +1113,8 @@ Match objects support the following methods and attributes:
       {'first_name': 'Malcolm', 'last_name': 'Reynolds'}
 
 
-.. method:: match.start([group])
-            match.end([group])
+.. method:: Match.start([group])
+            Match.end([group])
 
    Return the indices of the start and end of the substring matched by *group*;
    *group* defaults to zero (meaning the whole matched substring). Return ``-1`` if
@@ -1137,28 +1137,28 @@ Match objects support the following methods and attributes:
       'tony at tiger.net'
 
 
-.. method:: match.span([group])
+.. method:: Match.span([group])
 
    For a match *m*, return the 2-tuple ``(m.start(group), m.end(group))``. Note
    that if *group* did not contribute to the match, this is ``(-1, -1)``.
    *group* defaults to zero, the entire match.
 
 
-.. attribute:: match.pos
+.. attribute:: Match.pos
 
-   The value of *pos* which was passed to the :meth:`~regex.search` or
-   :meth:`~regex.match` method of a :ref:`regex object <re-objects>`.  This is
+   The value of *pos* which was passed to the :meth:`~Pattern.search` or
+   :meth:`~Pattern.match` method of a :ref:`regex object <re-objects>`.  This is
    the index into the string at which the RE engine started looking for a match.
 
 
-.. attribute:: match.endpos
+.. attribute:: Match.endpos
 
-   The value of *endpos* which was passed to the :meth:`~regex.search` or
-   :meth:`~regex.match` method of a :ref:`regex object <re-objects>`.  This is
+   The value of *endpos* which was passed to the :meth:`~Pattern.search` or
+   :meth:`~Pattern.match` method of a :ref:`regex object <re-objects>`.  This is
    the index into the string beyond which the RE engine will not go.
 
 
-.. attribute:: match.lastindex
+.. attribute:: Match.lastindex
 
    The integer index of the last matched capturing group, or ``None`` if no group
    was matched at all. For example, the expressions ``(a)b``, ``((a)(b))``, and
@@ -1167,21 +1167,21 @@ Match objects support the following methods and attributes:
    string.
 
 
-.. attribute:: match.lastgroup
+.. attribute:: Match.lastgroup
 
    The name of the last matched capturing group, or ``None`` if the group didn't
    have a name, or if no group was matched at all.
 
 
-.. attribute:: match.re
+.. attribute:: Match.re
 
-   The regular expression object whose :meth:`~regex.match` or
-   :meth:`~regex.search` method produced this match instance.
+   The regular expression object whose :meth:`~Pattern.match` or
+   :meth:`~Pattern.search` method produced this match instance.
 
 
-.. attribute:: match.string
+.. attribute:: Match.string
 
-   The string passed to :meth:`~regex.match` or :meth:`~regex.search`.
+   The string passed to :meth:`~Pattern.match` or :meth:`~Pattern.search`.
 
 
 .. versionchanged:: 3.7
@@ -1234,7 +1234,7 @@ To match this with a regular expression, one could use backreferences as such:
    "<Match: '354aa', groups=('a',)>"
 
 To find out what card the pair consists of, one could use the
-:meth:`~match.group` method of the match object in the following manner:
+:meth:`~Match.group` method of the match object in the following manner:
 
 .. doctest::
 
@@ -1314,7 +1314,7 @@ For example::
 
    >>> re.match("c", "abcdef")    # No match
    >>> re.search("c", "abcdef")   # Match
-   <_sre.SRE_Match object; span=(2, 3), match='c'>
+   <re.Match object; span=(2, 3), match='c'>
 
 Regular expressions beginning with ``'^'`` can be used with :func:`search` to
 restrict the match at the beginning of the string::
@@ -1322,7 +1322,7 @@ restrict the match at the beginning of the string::
    >>> re.match("c", "abcdef")    # No match
    >>> re.search("^c", "abcdef")  # No match
    >>> re.search("^a", "abcdef")  # Match
-   <_sre.SRE_Match object; span=(0, 1), match='a'>
+   <re.Match object; span=(0, 1), match='a'>
 
 Note however that in :const:`MULTILINE` mode :func:`match` only matches at the
 beginning of the string, whereas using :func:`search` with a regular expression
@@ -1330,7 +1330,7 @@ beginning with ``'^'`` will match at the beginning of each line.
 
    >>> re.match('X', 'A\nB\nX', re.MULTILINE)  # No match
    >>> re.search('^X', 'A\nB\nX', re.MULTILINE)  # Match
-   <_sre.SRE_Match object; span=(4, 5), match='X'>
+   <re.Match object; span=(4, 5), match='X'>
 
 
 Making a Phonebook
@@ -1449,9 +1449,9 @@ another one to escape it.  For example, the two following lines of code are
 functionally identical:
 
    >>> re.match(r"\W(.)\1\W", " ff ")
-   <_sre.SRE_Match object; span=(0, 4), match=' ff '>
+   <re.Match object; span=(0, 4), match=' ff '>
    >>> re.match("\\W(.)\\1\\W", " ff ")
-   <_sre.SRE_Match object; span=(0, 4), match=' ff '>
+   <re.Match object; span=(0, 4), match=' ff '>
 
 When one wants to match a literal backslash, it must be escaped in the regular
 expression.  With raw string notation, this means ``r"\\"``.  Without raw string
@@ -1459,9 +1459,9 @@ notation, one must use ``"\\\\"``, making the following lines of code
 functionally identical:
 
    >>> re.match(r"\\", r"\\")
-   <_sre.SRE_Match object; span=(0, 1), match='\\'>
+   <re.Match object; span=(0, 1), match='\\'>
    >>> re.match("\\\\", r"\\")
-   <_sre.SRE_Match object; span=(0, 1), match='\\'>
+   <re.Match object; span=(0, 1), match='\\'>
 
 
 Writing a Tokenizer
diff --git a/Lib/idlelib/idle_test/test_calltips.py b/Lib/idlelib/idle_test/test_calltips.py
index fa92ece78ee..a58229d36ed 100644
--- a/Lib/idlelib/idle_test/test_calltips.py
+++ b/Lib/idlelib/idle_test/test_calltips.py
@@ -74,7 +74,7 @@ def gtest(obj, out):
 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''')
+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):
diff --git a/Lib/re.py b/Lib/re.py
index c194dba844a..d772979f91e 100644
--- a/Lib/re.py
+++ b/Lib/re.py
@@ -92,8 +92,8 @@
     subn      Same as sub, but also return the number of substitutions made.
     split     Split a string by the occurrences of a pattern.
     findall   Find all occurrences of a pattern in a string.
-    finditer  Return an iterator yielding a match object for each match.
-    compile   Compile a pattern into a RegexObject.
+    finditer  Return an iterator yielding a Match object for each match.
+    compile   Compile a pattern into a Pattern object.
     purge     Clear the regular expression cache.
     escape    Backslash all non-alphanumerics in a string.
 
@@ -139,7 +139,7 @@
 __all__ = [
     "match", "fullmatch", "search", "sub", "subn", "split",
     "findall", "finditer", "compile", "purge", "template", "escape",
-    "error", "A", "I", "L", "M", "S", "X", "U",
+    "error", "Pattern", "Match", "A", "I", "L", "M", "S", "X", "U",
     "ASCII", "IGNORECASE", "LOCALE", "MULTILINE", "DOTALL", "VERBOSE",
     "UNICODE",
 ]
@@ -175,17 +175,17 @@ class RegexFlag(enum.IntFlag):
 
 def match(pattern, string, flags=0):
     """Try to apply the pattern at the start of the string, returning
-    a match object, or None if no match was found."""
+    a Match object, or None if no match was found."""
     return _compile(pattern, flags).match(string)
 
 def fullmatch(pattern, string, flags=0):
     """Try to apply the pattern to all of the string, returning
-    a match object, or None if no match was found."""
+    a Match object, or None if no match was found."""
     return _compile(pattern, flags).fullmatch(string)
 
 def search(pattern, string, flags=0):
     """Scan through string looking for a match to the pattern, returning
-    a match object, or None if no match was found."""
+    a Match object, or None if no match was found."""
     return _compile(pattern, flags).search(string)
 
 def sub(pattern, repl, string, count=0, flags=0):
@@ -193,7 +193,7 @@ def sub(pattern, repl, string, count=0, flags=0):
     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
+    a callable, it's passed the Match object and must return
     a replacement string to be used."""
     return _compile(pattern, flags).sub(repl, string, count)
 
@@ -204,7 +204,7 @@ def subn(pattern, repl, string, count=0, flags=0):
     string by the replacement repl.  number is the number of
     substitutions that were made. 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
+    If it is a callable, it's passed the Match object and must
     return a replacement string to be used."""
     return _compile(pattern, flags).subn(repl, string, count)
 
@@ -230,13 +230,13 @@ def findall(pattern, string, flags=0):
 
 def finditer(pattern, string, flags=0):
     """Return an iterator over all non-overlapping matches in the
-    string.  For each match, the iterator returns a match object.
+    string.  For each match, the iterator returns a Match object.
 
     Empty matches are included in the result."""
     return _compile(pattern, flags).finditer(string)
 
 def compile(pattern, flags=0):
-    "Compile a regular expression pattern, returning a pattern object."
+    "Compile a regular expression pattern, returning a Pattern object."
     return _compile(pattern, flags)
 
 def purge():
@@ -245,7 +245,7 @@ def purge():
     _compile_repl.cache_clear()
 
 def template(pattern, flags=0):
-    "Compile a template pattern, returning a pattern object"
+    "Compile a template pattern, returning a Pattern object"
     return _compile(pattern, flags|T)
 
 # SPECIAL_CHARS
@@ -264,13 +264,14 @@ def escape(pattern):
         pattern = str(pattern, 'latin1')
         return pattern.translate(_special_chars_map).encode('latin1')
 
+Pattern = type(sre_compile.compile('', 0))
+Match = type(sre_compile.compile('', 0).match(''))
+
 # --------------------------------------------------------------------
 # internals
 
 _cache = OrderedDict()
 
-_pattern_type = type(sre_compile.compile("", 0))
-
 _MAXCACHE = 512
 def _compile(pattern, flags):
     # internal: compile pattern
@@ -278,7 +279,7 @@ def _compile(pattern, flags):
         return _cache[type(pattern), pattern, flags]
     except KeyError:
         pass
-    if isinstance(pattern, _pattern_type):
+    if isinstance(pattern, Pattern):
         if flags:
             raise ValueError(
                 "cannot process flags argument with a compiled pattern")
@@ -301,12 +302,12 @@ def _compile_repl(repl, pattern):
     return sre_parse.parse_template(repl, pattern)
 
 def _expand(pattern, match, template):
-    # internal: match.expand implementation hook
+    # internal: Match.expand implementation hook
     template = sre_parse.parse_template(template, pattern)
     return sre_parse.expand_template(template, match)
 
 def _subx(pattern, template):
-    # internal: pattern.sub/subn implementation helper
+    # internal: Pattern.sub/subn implementation helper
     template = _compile_repl(template, pattern)
     if not template[0] and len(template[1]) == 1:
         # literal replacement
@@ -322,7 +323,7 @@ def filter(match, template=template):
 def _pickle(p):
     return _compile, (p.pattern, p.flags)
 
-copyreg.pickle(_pattern_type, _pickle, _compile)
+copyreg.pickle(Pattern, _pickle, _compile)
 
 # --------------------------------------------------------------------
 # experimental stuff (see python-dev discussions for details)
diff --git a/Lib/sre_constants.py b/Lib/sre_constants.py
index 0261e9e956c..1daa7bd00f4 100644
--- a/Lib/sre_constants.py
+++ b/Lib/sre_constants.py
@@ -32,6 +32,8 @@ class error(Exception):
         colno: The column corresponding to pos (may be None)
     """
 
+    __module__ = 're'
+
     def __init__(self, msg, pattern=None, pos=None):
         self.msg = msg
         self.pattern = pattern
diff --git a/Lib/telnetlib.py b/Lib/telnetlib.py
index b0863b1cbd6..b9d45b48e79 100644
--- a/Lib/telnetlib.py
+++ b/Lib/telnetlib.py
@@ -585,12 +585,12 @@ def expect(self, list, timeout=None):
         """Read until one from a list of a regular expressions matches.
 
         The first argument is a list of regular expressions, either
-        compiled (re.RegexObject instances) or uncompiled (strings).
+        compiled (re.Pattern instances) or uncompiled (strings).
         The optional second argument is a timeout, in seconds; default
         is no timeout.
 
         Return a tuple of three items: the index in the list of the
-        first regular expression that matches; the match object
+        first regular expression that matches; the re.Match object
         returned; and the text read up till and including the match.
 
         If EOF is read and no text was read, raise EOFError.
diff --git a/Lib/test/test_optparse.py b/Lib/test/test_optparse.py
index 91a0319a735..437fdd2be8d 100644
--- a/Lib/test/test_optparse.py
+++ b/Lib/test/test_optparse.py
@@ -24,8 +24,6 @@
 from optparse import _match_abbrev
 from optparse import _parse_num
 
-retype = type(re.compile(''))
-
 class InterceptedError(Exception):
     def __init__(self,
                  error_message=None,
@@ -107,7 +105,7 @@ def assertRaises(self,
             func(*args, **kwargs)
         except expected_exception as err:
             actual_message = str(err)
-            if isinstance(expected_message, retype):
+            if isinstance(expected_message, re.Pattern):
                 self.assertTrue(expected_message.search(actual_message),
                              """\
 expected exception message pattern:
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index e9c07a04f57..9cb426a04dc 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -1596,9 +1596,9 @@ def test_search_dot_unicode(self):
     def test_compile(self):
         # Test return value when given string and pattern as parameter
         pattern = re.compile('random pattern')
-        self.assertIsInstance(pattern, re._pattern_type)
+        self.assertIsInstance(pattern, re.Pattern)
         same_pattern = re.compile(pattern)
-        self.assertIsInstance(same_pattern, re._pattern_type)
+        self.assertIsInstance(same_pattern, re.Pattern)
         self.assertIs(same_pattern, pattern)
         # Test behaviour when not given a string or pattern as parameter
         self.assertRaises(TypeError, re.compile, 0)
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index f19afef48d7..c48a63c575f 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -1273,7 +1273,7 @@ def assertRaisesRegex(self, expected_exception, expected_regex,
 
         Args:
             expected_exception: Exception class expected to be raised.
-            expected_regex: Regex (re pattern object or string) expected
+            expected_regex: Regex (re.Pattern object or string) expected
                     to be found in error message.
             args: Function to be called and extra positional args.
             kwargs: Extra kwargs.
@@ -1292,7 +1292,7 @@ def assertWarnsRegex(self, expected_warning, expected_regex,
 
         Args:
             expected_warning: Warning class expected to be triggered.
-            expected_regex: Regex (re pattern object or string) expected
+            expected_regex: Regex (re.Pattern object or string) expected
                     to be found in error message.
             args: Function to be called and extra positional args.
             kwargs: Extra kwargs.
diff --git a/Misc/NEWS.d/next/Library/2017-10-03-22-45-50.bpo-30397.e4F7Kr.rst b/Misc/NEWS.d/next/Library/2017-10-03-22-45-50.bpo-30397.e4F7Kr.rst
new file mode 100644
index 00000000000..2f1f762d6ff
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-03-22-45-50.bpo-30397.e4F7Kr.rst
@@ -0,0 +1,3 @@
+The types of compiled regular objects and match objects are now exposed as
+`re.Pattern` and `re.Match`.  This adds information in pydoc output for the
+re module.
diff --git a/Modules/_sre.c b/Modules/_sre.c
index 6873f1db438..c42ab2668fd 100644
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -630,13 +630,13 @@ _sre.SRE_Pattern.fullmatch
     pos: Py_ssize_t = 0
     endpos: Py_ssize_t(c_default="PY_SSIZE_T_MAX") = sys.maxsize
 
-Matches against all of the string
+Matches against all of the string.
 [clinic start generated code]*/
 
 static PyObject *
 _sre_SRE_Pattern_fullmatch_impl(PatternObject *self, PyObject *string,
                                 Py_ssize_t pos, Py_ssize_t endpos)
-/*[clinic end generated code: output=5833c47782a35f4a input=a6f640614aaefceb]*/
+/*[clinic end generated code: output=5833c47782a35f4a input=d9fb03a7625b5828]*/
 {
     SRE_STATE state;
     Py_ssize_t status;
@@ -1341,7 +1341,7 @@ pattern_repr(PatternObject *obj)
     return result;
 }
 
-PyDoc_STRVAR(pattern_doc, "Compiled regular expression objects");
+PyDoc_STRVAR(pattern_doc, "Compiled regular expression object.");
 
 /* PatternObject's 'groupindex' method. */
 static PyObject *
@@ -2221,12 +2221,12 @@ _sre.SRE_Match.span
     group: object(c_default="NULL") = 0
     /
 
-For MatchObject m, return the 2-tuple (m.start(group), m.end(group)).
+For match object m, return the 2-tuple (m.start(group), m.end(group)).
 [clinic start generated code]*/
 
 static PyObject *
 _sre_SRE_Match_span_impl(MatchObject *self, PyObject *group)
-/*[clinic end generated code: output=f02ae40594d14fe6 input=49092b6008d176d3]*/
+/*[clinic end generated code: output=f02ae40594d14fe6 input=8fa6014e982d71d4]*/
 {
     Py_ssize_t index = match_getindex(self, group);
 
@@ -2625,15 +2625,18 @@ static PyGetSetDef pattern_getset[] = {
 
 #define PAT_OFF(x) offsetof(PatternObject, x)
 static PyMemberDef pattern_members[] = {
-    {"pattern",    T_OBJECT,    PAT_OFF(pattern),       READONLY},
-    {"flags",      T_INT,       PAT_OFF(flags),         READONLY},
-    {"groups",     T_PYSSIZET,  PAT_OFF(groups),        READONLY},
+    {"pattern",    T_OBJECT,    PAT_OFF(pattern),       READONLY,
+     "The pattern string from which the RE object was compiled."},
+    {"flags",      T_INT,       PAT_OFF(flags),         READONLY,
+     "The regex matching flags."},
+    {"groups",     T_PYSSIZET,  PAT_OFF(groups),        READONLY,
+     "The number of capturing groups in the pattern."},
     {NULL}  /* Sentinel */
 };
 
 static PyTypeObject Pattern_Type = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "_" SRE_MODULE ".SRE_Pattern",
+    "re.Pattern",
     sizeof(PatternObject), sizeof(SRE_CODE),
     (destructor)pattern_dealloc,        /* tp_dealloc */
     0,                                  /* tp_print */
@@ -2685,18 +2688,24 @@ static PyMethodDef match_methods[] = {
 };
 
 static PyGetSetDef match_getset[] = {
-    {"lastindex", (getter)match_lastindex_get, (setter)NULL},
-    {"lastgroup", (getter)match_lastgroup_get, (setter)NULL},
+    {"lastindex", (getter)match_lastindex_get, (setter)NULL,
+     "The integer index of the last matched capturing group."},
+    {"lastgroup", (getter)match_lastgroup_get, (setter)NULL,
+     "The name of the last matched capturing group."},
     {"regs",      (getter)match_regs_get,      (setter)NULL},
     {NULL}
 };
 
 #define MATCH_OFF(x) offsetof(MatchObject, x)
 static PyMemberDef match_members[] = {
-    {"string",  T_OBJECT,   MATCH_OFF(string),  READONLY},
-    {"re",      T_OBJECT,   MATCH_OFF(pattern), READONLY},
-    {"pos",     T_PYSSIZET, MATCH_OFF(pos),     READONLY},
-    {"endpos",  T_PYSSIZET, MATCH_OFF(endpos),  READONLY},
+    {"string",  T_OBJECT,   MATCH_OFF(string),  READONLY,
+     "The string passed to match() or search()."},
+    {"re",      T_OBJECT,   MATCH_OFF(pattern), READONLY,
+     "The regular expression object."},
+    {"pos",     T_PYSSIZET, MATCH_OFF(pos),     READONLY,
+     "The index into the string at which the RE engine started looking for a match."},
+    {"endpos",  T_PYSSIZET, MATCH_OFF(endpos),  READONLY,
+     "The index into the string beyond which the RE engine will not go."},
     {NULL}
 };
 
@@ -2705,7 +2714,7 @@ static PyMemberDef match_members[] = {
 
 static PyTypeObject Match_Type = {
     PyVarObject_HEAD_INIT(NULL,0)
-    "_" SRE_MODULE ".SRE_Match",
+    "re.Match",
     sizeof(MatchObject), sizeof(Py_ssize_t),
     (destructor)match_dealloc,  /* tp_dealloc */
     0,                          /* tp_print */
diff --git a/Modules/clinic/_sre.c.h b/Modules/clinic/_sre.c.h
index 8ed288e96a3..6eea0c8b252 100644
--- a/Modules/clinic/_sre.c.h
+++ b/Modules/clinic/_sre.c.h
@@ -190,7 +190,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_fullmatch__doc__,
 "fullmatch($self, /, string, pos=0, endpos=sys.maxsize)\n"
 "--\n"
 "\n"
-"Matches against all of the string");
+"Matches against all of the string.");
 
 #define _SRE_SRE_PATTERN_FULLMATCH_METHODDEF    \
     {"fullmatch", (PyCFunction)_sre_SRE_Pattern_fullmatch, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_fullmatch__doc__},
@@ -682,7 +682,7 @@ PyDoc_STRVAR(_sre_SRE_Match_span__doc__,
 "span($self, group=0, /)\n"
 "--\n"
 "\n"
-"For MatchObject m, return the 2-tuple (m.start(group), m.end(group)).");
+"For match object m, return the 2-tuple (m.start(group), m.end(group)).");
 
 #define _SRE_SRE_MATCH_SPAN_METHODDEF    \
     {"span", (PyCFunction)_sre_SRE_Match_span, METH_FASTCALL, _sre_SRE_Match_span__doc__},
@@ -765,4 +765,4 @@ _sre_SRE_Scanner_search(ScannerObject *self, PyObject *Py_UNUSED(ignored))
 {
     return _sre_SRE_Scanner_search_impl(self);
 }
-/*[clinic end generated code: output=6e3fb17fef1be436 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=1e6a1be31302df09 input=a9049054013a1b77]*/


From webhook-mailer at python.org  Wed Oct  4 13:25:43 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 04 Oct 2017 17:25:43 -0000
Subject: [Python-checkins] bpo-30404: The -u option now makes the stdout and
 stderr streams totally unbuffered. (#1667)
Message-ID: <mailman.32.1507137944.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/77732be801c18013cfbc86e27fcc50194ca22c8e
commit: 77732be801c18013cfbc86e27fcc50194ca22c8e
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-04T20:25:40+03:00
summary:

bpo-30404: The -u option now makes the stdout and stderr streams totally unbuffered. (#1667)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-03-23-46-39.bpo-30404._9Yi5u.rst
M Doc/using/cmdline.rst
M Lib/test/test_cmd_line.py
M Python/pylifecycle.c

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 9c1c269d1df..7b60a9b71fe 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -303,13 +303,13 @@ Miscellaneous options
 
 .. cmdoption:: -u
 
-   Force the binary layer of the stdout and stderr streams (which is
-   available as their ``buffer`` attribute) to be unbuffered. The text I/O
-   layer will still be line-buffered if writing to the console, or
-   block-buffered if redirected to a non-interactive file.
+   Force the stdout and stderr streams to be unbuffered.
 
    See also :envvar:`PYTHONUNBUFFERED`.
 
+   .. versionchanged:: 3.7
+      The text layer of the stdout and stderr streams now is unbuffered.
+
 
 .. cmdoption:: -v
 
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 3e204279173..28ddb2ba1bf 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -221,13 +221,12 @@ def test_unbuffered_output(self):
             rc, out, err = assert_python_ok('-u', '-c', code)
             data = err if stream == 'stderr' else out
             self.assertEqual(data, b'x', "binary %s not unbuffered" % stream)
-            # Text is line-buffered
-            code = ("import os, sys; sys.%s.write('x\\n'); os._exit(0)"
+            # Text is unbuffered
+            code = ("import os, sys; sys.%s.write('x'); os._exit(0)"
                 % stream)
             rc, out, err = assert_python_ok('-u', '-c', code)
             data = err if stream == 'stderr' else out
-            self.assertEqual(data.strip(), b'x',
-                "text %s not line-buffered" % stream)
+            self.assertEqual(data, b'x', "text %s not unbuffered" % stream)
 
     def test_unbuffered_input(self):
         # sys.stdin still works with '-u'
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-03-23-46-39.bpo-30404._9Yi5u.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-03-23-46-39.bpo-30404._9Yi5u.rst
new file mode 100644
index 00000000000..6c2802077f0
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-03-23-46-39.bpo-30404._9Yi5u.rst	
@@ -0,0 +1,2 @@
+The -u option now makes the stdout and stderr streams unbuffered rather than
+line-buffered.
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 4b0383b4292..5b13bc45822 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1498,7 +1498,7 @@ create_stdio(PyObject* io,
     PyObject *buf = NULL, *stream = NULL, *text = NULL, *raw = NULL, *res;
     const char* mode;
     const char* newline;
-    PyObject *line_buffering;
+    PyObject *line_buffering, *write_through;
     int buffering, isatty;
     _Py_IDENTIFIER(open);
     _Py_IDENTIFIER(isatty);
@@ -1555,7 +1555,11 @@ create_stdio(PyObject* io,
     Py_DECREF(res);
     if (isatty == -1)
         goto error;
-    if (isatty || Py_UnbufferedStdioFlag)
+    if (Py_UnbufferedStdioFlag)
+        write_through = Py_True;
+    else
+        write_through = Py_False;
+    if (isatty && !Py_UnbufferedStdioFlag)
         line_buffering = Py_True;
     else
         line_buffering = Py_False;
@@ -1574,9 +1578,9 @@ create_stdio(PyObject* io,
     newline = "\n";
 #endif
 
-    stream = _PyObject_CallMethodId(io, &PyId_TextIOWrapper, "OsssO",
+    stream = _PyObject_CallMethodId(io, &PyId_TextIOWrapper, "OsssOO",
                                     buf, encoding, errors,
-                                    newline, line_buffering);
+                                    newline, line_buffering, write_through);
     Py_CLEAR(buf);
     if (stream == NULL)
         goto error;


From webhook-mailer at python.org  Wed Oct  4 13:28:24 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 04 Oct 2017 17:28:24 -0000
Subject: [Python-checkins] bpo-31667: Fix gettext related links. (#3860)
Message-ID: <mailman.33.1507138105.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/c02a1f4ad8fcdbffad2911c5a31c71a17a89d713
commit: c02a1f4ad8fcdbffad2911c5a31c71a17a89d713
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-04T20:28:20+03:00
summary:

bpo-31667: Fix gettext related links. (#3860)

* Fix incorrect links.
* Remove redundant links.
* Add signatures and index entries for gettext related
functions in the locale module.

files:
M Doc/library/gettext.rst
M Doc/library/locale.rst

diff --git a/Doc/library/gettext.rst b/Doc/library/gettext.rst
index 053d9d3840c..407853c2d7e 100644
--- a/Doc/library/gettext.rst
+++ b/Doc/library/gettext.rst
@@ -134,7 +134,7 @@ Class-based API
 
 The class-based API of the :mod:`gettext` module gives you more flexibility and
 greater convenience than the GNU :program:`gettext` API.  It is the recommended
-way of localizing your Python applications and modules.  :mod:`gettext` defines
+way of localizing your Python applications and modules.  :mod:`!gettext` defines
 a "translations" class which implements the parsing of GNU :file:`.mo` format
 files, and has methods for returning strings. Instances of this "translations"
 class can also install themselves in the built-in namespace as the function
@@ -219,7 +219,7 @@ Translation classes are what actually implement the translation of original
 source file message strings to translated message strings. The base class used
 by all translation classes is :class:`NullTranslations`; this provides the basic
 interface you can use to write your own specialized translation classes.  Here
-are the methods of :class:`NullTranslations`:
+are the methods of :class:`!NullTranslations`:
 
 
 .. class:: NullTranslations(fp=None)
@@ -247,13 +247,13 @@ are the methods of :class:`NullTranslations`:
 
    .. method:: gettext(message)
 
-      If a fallback has been set, forward :meth:`.gettext` to the fallback.
+      If a fallback has been set, forward :meth:`!gettext` to the fallback.
       Otherwise, return *message*.  Overridden in derived classes.
 
 
    .. method:: ngettext(singular, plural, n)
 
-      If a fallback has been set, forward :meth:`ngettext` to the fallback.
+      If a fallback has been set, forward :meth:`!ngettext` to the fallback.
       Otherwise, return *singular* if *n* is 1; return *plural* otherwise.
       Overridden in derived classes.
 
@@ -261,7 +261,7 @@ are the methods of :class:`NullTranslations`:
    .. method:: lgettext(message)
    .. method:: lngettext(singular, plural, n)
 
-      Equivalent to :meth:`.gettext` and :meth:`ngettext`, but the translation
+      Equivalent to :meth:`.gettext` and :meth:`.ngettext`, but the translation
       is returned as a byte string encoded in the preferred system encoding
       if no encoding was explicitly set with :meth:`set_output_charset`.
       Overridden in derived classes.
diff --git a/Doc/library/locale.rst b/Doc/library/locale.rst
index 69959a3451e..f423d704ca5 100644
--- a/Doc/library/locale.rst
+++ b/Doc/library/locale.rst
@@ -551,17 +551,23 @@ library.
 Access to message catalogs
 --------------------------
 
+.. function:: gettext(msg)
+.. function:: dgettext(domain, msg)
+.. function:: dcgettext(domain, msg, category)
+.. function:: textdomain(domain)
+.. function:: bindtextdomain(domain, dir)
+
 The locale module exposes the C library's gettext interface on systems that
-provide this interface.  It consists of the functions :func:`gettext`,
-:func:`dgettext`, :func:`dcgettext`, :func:`textdomain`, :func:`bindtextdomain`,
-and :func:`bind_textdomain_codeset`.  These are similar to the same functions in
+provide this interface.  It consists of the functions :func:`!gettext`,
+:func:`!dgettext`, :func:`!dcgettext`, :func:`!textdomain`, :func:`!bindtextdomain`,
+and :func:`!bind_textdomain_codeset`.  These are similar to the same functions in
 the :mod:`gettext` module, but use the C library's binary format for message
 catalogs, and the C library's search algorithms for locating message catalogs.
 
 Python applications should normally find no need to invoke these functions, and
 should use :mod:`gettext` instead.  A known exception to this rule are
 applications that link with additional C libraries which internally invoke
-:c:func:`gettext` or :func:`dcgettext`.  For these applications, it may be
+:c:func:`gettext` or :c:func:`dcgettext`.  For these applications, it may be
 necessary to bind the text domain, so that the libraries can properly locate
 their message catalogs.
 


From webhook-mailer at python.org  Wed Oct  4 13:30:12 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 04 Oct 2017 17:30:12 -0000
Subject: [Python-checkins] Refactor multiplication and division of timedelta
 and float. (#3656)
Message-ID: <mailman.34.1507138212.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/db12ef7e8ac6a8a6f8b4830701558b9abfd108fc
commit: db12ef7e8ac6a8a6f8b4830701558b9abfd108fc
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-04T20:30:09+03:00
summary:

Refactor multiplication and division of timedelta and float. (#3656)

Implementations of these operations are virtually identical.

files:
M Modules/_datetimemodule.c

diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 3dd7f827509..fc2cdba70c5 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -1677,8 +1677,9 @@ get_float_as_integer_ratio(PyObject *floatobj)
     return ratio;
 }
 
+/* op is 0 for multiplication, 1 for division */
 static PyObject *
-multiply_float_timedelta(PyObject *floatobj, PyDateTime_Delta *delta)
+multiply_truedivide_timedelta_float(PyDateTime_Delta *delta, PyObject *floatobj, int op)
 {
     PyObject *result = NULL;
     PyObject *pyus_in = NULL, *temp, *pyus_out;
@@ -1691,12 +1692,12 @@ multiply_float_timedelta(PyObject *floatobj, PyDateTime_Delta *delta)
     if (ratio == NULL) {
         goto error;
     }
-    temp = PyNumber_Multiply(pyus_in, PyTuple_GET_ITEM(ratio, 0));
+    temp = PyNumber_Multiply(pyus_in, PyTuple_GET_ITEM(ratio, op));
     Py_DECREF(pyus_in);
     pyus_in = NULL;
     if (temp == NULL)
         goto error;
-    pyus_out = divide_nearest(temp, PyTuple_GET_ITEM(ratio, 1));
+    pyus_out = divide_nearest(temp, PyTuple_GET_ITEM(ratio, !op));
     Py_DECREF(temp);
     if (pyus_out == NULL)
         goto error;
@@ -1777,38 +1778,6 @@ truedivide_timedelta_timedelta(PyDateTime_Delta *left, PyDateTime_Delta *right)
 }
 
 static PyObject *
-truedivide_timedelta_float(PyDateTime_Delta *delta, PyObject *f)
-{
-    PyObject *result = NULL;
-    PyObject *pyus_in = NULL, *temp, *pyus_out;
-    PyObject *ratio = NULL;
-
-    pyus_in = delta_to_microseconds(delta);
-    if (pyus_in == NULL)
-        return NULL;
-    ratio = get_float_as_integer_ratio(f);
-    if (ratio == NULL) {
-        goto error;
-    }
-    temp = PyNumber_Multiply(pyus_in, PyTuple_GET_ITEM(ratio, 1));
-    Py_DECREF(pyus_in);
-    pyus_in = NULL;
-    if (temp == NULL)
-        goto error;
-    pyus_out = divide_nearest(temp, PyTuple_GET_ITEM(ratio, 0));
-    Py_DECREF(temp);
-    if (pyus_out == NULL)
-        goto error;
-    result = microseconds_to_delta(pyus_out);
-    Py_DECREF(pyus_out);
- error:
-    Py_XDECREF(pyus_in);
-    Py_XDECREF(ratio);
-
-    return result;
-}
-
-static PyObject *
 truedivide_timedelta_int(PyDateTime_Delta *delta, PyObject *i)
 {
     PyObject *result;
@@ -1958,15 +1927,15 @@ delta_multiply(PyObject *left, PyObject *right)
             result = multiply_int_timedelta(right,
                             (PyDateTime_Delta *) left);
         else if (PyFloat_Check(right))
-            result = multiply_float_timedelta(right,
-                            (PyDateTime_Delta *) left);
+            result = multiply_truedivide_timedelta_float(
+                            (PyDateTime_Delta *) left, right, 0);
     }
     else if (PyLong_Check(left))
         result = multiply_int_timedelta(left,
                         (PyDateTime_Delta *) right);
     else if (PyFloat_Check(left))
-        result = multiply_float_timedelta(left,
-                        (PyDateTime_Delta *) right);
+        result = multiply_truedivide_timedelta_float(
+                        (PyDateTime_Delta *) right, left, 0);
 
     if (result == Py_NotImplemented)
         Py_INCREF(result);
@@ -2006,8 +1975,8 @@ delta_truedivide(PyObject *left, PyObject *right)
                             (PyDateTime_Delta *)left,
                             (PyDateTime_Delta *)right);
         else if (PyFloat_Check(right))
-            result = truedivide_timedelta_float(
-                            (PyDateTime_Delta *)left, right);
+            result = multiply_truedivide_timedelta_float(
+                            (PyDateTime_Delta *)left, right, 1);
         else if (PyLong_Check(right))
             result = truedivide_timedelta_int(
                             (PyDateTime_Delta *)left, right);


From webhook-mailer at python.org  Wed Oct  4 14:06:13 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 04 Oct 2017 18:06:13 -0000
Subject: [Python-checkins] [3.6] bpo-31667: Fix gettext related links.
 (GH-3860) (#3886)
Message-ID: <mailman.35.1507140375.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/ed77fbffa5bf81c8d16700370fe8bb63bbae1428
commit: ed77fbffa5bf81c8d16700370fe8bb63bbae1428
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-04T21:06:09+03:00
summary:

[3.6] bpo-31667: Fix gettext related links. (GH-3860) (#3886)

* Fix incorrect links.
* Remove redundant links.
* Add signatures and index entries for gettext related
functions in the locale module.
(cherry picked from commit c02a1f4ad8fcdbffad2911c5a31c71a17a89d713)

files:
M Doc/library/gettext.rst
M Doc/library/locale.rst

diff --git a/Doc/library/gettext.rst b/Doc/library/gettext.rst
index 053d9d3840c..407853c2d7e 100644
--- a/Doc/library/gettext.rst
+++ b/Doc/library/gettext.rst
@@ -134,7 +134,7 @@ Class-based API
 
 The class-based API of the :mod:`gettext` module gives you more flexibility and
 greater convenience than the GNU :program:`gettext` API.  It is the recommended
-way of localizing your Python applications and modules.  :mod:`gettext` defines
+way of localizing your Python applications and modules.  :mod:`!gettext` defines
 a "translations" class which implements the parsing of GNU :file:`.mo` format
 files, and has methods for returning strings. Instances of this "translations"
 class can also install themselves in the built-in namespace as the function
@@ -219,7 +219,7 @@ Translation classes are what actually implement the translation of original
 source file message strings to translated message strings. The base class used
 by all translation classes is :class:`NullTranslations`; this provides the basic
 interface you can use to write your own specialized translation classes.  Here
-are the methods of :class:`NullTranslations`:
+are the methods of :class:`!NullTranslations`:
 
 
 .. class:: NullTranslations(fp=None)
@@ -247,13 +247,13 @@ are the methods of :class:`NullTranslations`:
 
    .. method:: gettext(message)
 
-      If a fallback has been set, forward :meth:`.gettext` to the fallback.
+      If a fallback has been set, forward :meth:`!gettext` to the fallback.
       Otherwise, return *message*.  Overridden in derived classes.
 
 
    .. method:: ngettext(singular, plural, n)
 
-      If a fallback has been set, forward :meth:`ngettext` to the fallback.
+      If a fallback has been set, forward :meth:`!ngettext` to the fallback.
       Otherwise, return *singular* if *n* is 1; return *plural* otherwise.
       Overridden in derived classes.
 
@@ -261,7 +261,7 @@ are the methods of :class:`NullTranslations`:
    .. method:: lgettext(message)
    .. method:: lngettext(singular, plural, n)
 
-      Equivalent to :meth:`.gettext` and :meth:`ngettext`, but the translation
+      Equivalent to :meth:`.gettext` and :meth:`.ngettext`, but the translation
       is returned as a byte string encoded in the preferred system encoding
       if no encoding was explicitly set with :meth:`set_output_charset`.
       Overridden in derived classes.
diff --git a/Doc/library/locale.rst b/Doc/library/locale.rst
index 5aaf4a398f7..b04442bc162 100644
--- a/Doc/library/locale.rst
+++ b/Doc/library/locale.rst
@@ -542,17 +542,23 @@ library.
 Access to message catalogs
 --------------------------
 
+.. function:: gettext(msg)
+.. function:: dgettext(domain, msg)
+.. function:: dcgettext(domain, msg, category)
+.. function:: textdomain(domain)
+.. function:: bindtextdomain(domain, dir)
+
 The locale module exposes the C library's gettext interface on systems that
-provide this interface.  It consists of the functions :func:`gettext`,
-:func:`dgettext`, :func:`dcgettext`, :func:`textdomain`, :func:`bindtextdomain`,
-and :func:`bind_textdomain_codeset`.  These are similar to the same functions in
+provide this interface.  It consists of the functions :func:`!gettext`,
+:func:`!dgettext`, :func:`!dcgettext`, :func:`!textdomain`, :func:`!bindtextdomain`,
+and :func:`!bind_textdomain_codeset`.  These are similar to the same functions in
 the :mod:`gettext` module, but use the C library's binary format for message
 catalogs, and the C library's search algorithms for locating message catalogs.
 
 Python applications should normally find no need to invoke these functions, and
 should use :mod:`gettext` instead.  A known exception to this rule are
 applications that link with additional C libraries which internally invoke
-:c:func:`gettext` or :func:`dcgettext`.  For these applications, it may be
+:c:func:`gettext` or :c:func:`dcgettext`.  For these applications, it may be
 necessary to bind the text domain, so that the libraries can properly locate
 their message catalogs.
 


From webhook-mailer at python.org  Wed Oct  4 14:37:56 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 04 Oct 2017 18:37:56 -0000
Subject: [Python-checkins] [2.7] bpo-31675: Fix memory leaks in Tkinter's
 methods splitlist() and split() (GH-3866) (#3876)
Message-ID: <mailman.36.1507142277.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/328b5d0e64798cf17360c6b2a07c2b18f2798b88
commit: 328b5d0e64798cf17360c6b2a07c2b18f2798b88
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-04T21:37:53+03:00
summary:

[2.7] bpo-31675: Fix memory leaks in Tkinter's methods splitlist() and split() (GH-3866) (#3876)

when pass a string larger than 2 GiB.

Decrease memory requirements for Tcl's bigmem tests..
(cherry picked from commit 27c623c845dd6e4b8e1782666ca3a956636da266)

files:
A Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst
M Lib/test/test_tcl.py
M Modules/_tkinter.c

diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index 921d094d5a7..f0c9877862e 100644
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -705,25 +705,25 @@ def test_huge_unicode_builtins(self, size):
         self.check_huge_string_builtins(value)
 
     def check_huge_string_builtins(self, value):
-        self.assertRaises(OverflowError, self.interp.tk.getint, value)
-        self.assertRaises(OverflowError, self.interp.tk.getdouble, value)
-        self.assertRaises(OverflowError, self.interp.tk.getboolean, value)
-        self.assertRaises(OverflowError, self.interp.eval, value)
-        self.assertRaises(OverflowError, self.interp.evalfile, value)
-        self.assertRaises(OverflowError, self.interp.record, value)
-        self.assertRaises(OverflowError, self.interp.adderrorinfo, value)
-        self.assertRaises(OverflowError, self.interp.setvar, value, 'x', 'a')
-        self.assertRaises(OverflowError, self.interp.setvar, 'x', value, 'a')
-        self.assertRaises(OverflowError, self.interp.unsetvar, value)
-        self.assertRaises(OverflowError, self.interp.unsetvar, 'x', value)
-        self.assertRaises(OverflowError, self.interp.adderrorinfo, value)
-        self.assertRaises(OverflowError, self.interp.exprstring, value)
-        self.assertRaises(OverflowError, self.interp.exprlong, value)
-        self.assertRaises(OverflowError, self.interp.exprboolean, value)
-        self.assertRaises(OverflowError, self.interp.splitlist, value)
-        self.assertRaises(OverflowError, self.interp.split, value)
-        self.assertRaises(OverflowError, self.interp.createcommand, value, max)
-        self.assertRaises(OverflowError, self.interp.deletecommand, value)
+        tk = self.interp.tk
+        self.assertRaises(OverflowError, tk.getint, value)
+        self.assertRaises(OverflowError, tk.getdouble, value)
+        self.assertRaises(OverflowError, tk.getboolean, value)
+        self.assertRaises(OverflowError, tk.eval, value)
+        self.assertRaises(OverflowError, tk.evalfile, value)
+        self.assertRaises(OverflowError, tk.record, value)
+        self.assertRaises(OverflowError, tk.adderrorinfo, value)
+        self.assertRaises(OverflowError, tk.setvar, value, 'x', 'a')
+        self.assertRaises(OverflowError, tk.setvar, 'x', value, 'a')
+        self.assertRaises(OverflowError, tk.unsetvar, value)
+        self.assertRaises(OverflowError, tk.unsetvar, 'x', value)
+        self.assertRaises(OverflowError, tk.exprstring, value)
+        self.assertRaises(OverflowError, tk.exprlong, value)
+        self.assertRaises(OverflowError, tk.exprboolean, value)
+        self.assertRaises(OverflowError, tk.splitlist, value)
+        self.assertRaises(OverflowError, tk.split, value)
+        self.assertRaises(OverflowError, tk.createcommand, value, max)
+        self.assertRaises(OverflowError, tk.deletecommand, value)
 
 
 def setUpModule():
diff --git a/Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst b/Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst
new file mode 100644
index 00000000000..4e4430773af
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst
@@ -0,0 +1,2 @@
+Fixed memory leaks in Tkinter's methods splitlist() and split() when pass a
+string larger than 2 GiB.
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 6053e4bde44..444c268c0b4 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -2332,7 +2332,11 @@ Tkapp_SplitList(PyObject *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "et:splitlist", "utf-8", &list))
         return NULL;
 
-    CHECK_STRING_LENGTH(list);
+    if (strlen(list) >= INT_MAX) {
+        PyErr_SetString(PyExc_OverflowError, "string is too long");
+        PyMem_Free(list);
+        return NULL;
+    }
     if (Tcl_SplitList(Tkapp_Interp(self), list,
                       &argc, &argv) == TCL_ERROR)  {
         PyMem_Free(list);
@@ -2394,7 +2398,11 @@ Tkapp_Split(PyObject *self, PyObject *args)
 
     if (!PyArg_ParseTuple(args, "et:split", "utf-8", &list))
         return NULL;
-    CHECK_STRING_LENGTH(list);
+    if (strlen(list) >= INT_MAX) {
+        PyErr_SetString(PyExc_OverflowError, "string is too long");
+        PyMem_Free(list);
+        return NULL;
+    }
     v = Split(list);
     PyMem_Free(list);
     return v;


From webhook-mailer at python.org  Wed Oct  4 15:44:20 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 04 Oct 2017 19:44:20 -0000
Subject: [Python-checkins] bpo-30872: Update the curses docs to Python 3.
 (#2620)
Message-ID: <mailman.37.1507146261.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/300dd552b15825abfe0e367ac14cec4c3e050dbc
commit: 300dd552b15825abfe0e367ac14cec4c3e050dbc
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-04T22:44:13+03:00
summary:

bpo-30872: Update the curses docs to Python 3. (#2620)

files:
M Doc/library/curses.ascii.rst
M Doc/library/curses.panel.rst
M Doc/library/curses.rst

diff --git a/Doc/library/curses.ascii.rst b/Doc/library/curses.ascii.rst
index b6ac2517335..04b2a260af0 100644
--- a/Doc/library/curses.ascii.rst
+++ b/Doc/library/curses.ascii.rst
@@ -176,14 +176,12 @@ C library:
 
    Checks for a non-ASCII character (ordinal values 0x80 and above).
 
-These functions accept either integers or strings; when the argument is a
+These functions accept either integers or single-character strings; when the argument is a
 string, it is first converted using the built-in function :func:`ord`.
 
-Note that all these functions check ordinal bit values derived from the  first
+Note that all these functions check ordinal bit values derived from the
 character of the string you pass in; they do not actually know anything about
-the host machine's character encoding.  For functions  that know about the
-character encoding (and handle internationalization properly) see the
-:mod:`string` module.
+the host machine's character encoding.
 
 The following two functions take either a single-character string or integer
 byte value; they return a value of the same type.
diff --git a/Doc/library/curses.panel.rst b/Doc/library/curses.panel.rst
index c99c37a5651..d770c03c837 100644
--- a/Doc/library/curses.panel.rst
+++ b/Doc/library/curses.panel.rst
@@ -74,7 +74,7 @@ Panel objects have the following methods:
 
 .. method:: Panel.hidden()
 
-   Returns true if the panel is hidden (not visible), false otherwise.
+   Returns ``True`` if the panel is hidden (not visible), ``False`` otherwise.
 
 
 .. method:: Panel.hide()
diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
index 2786e51a7e9..f2341f4ec83 100644
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -21,6 +21,14 @@ Linux and the BSD variants of Unix.
 
 .. note::
 
+   Whenever the documentation mentions a *character* it can be specified
+   as an integer, a one-character Unicode string or a one-byte byte string.
+
+   Whenever the documentation mentions a *character string* it can be specified
+   as a Unicode string or a byte string.
+
+.. note::
+
    Since version 5.4, the ncurses library decides how to interpret non-ASCII data
    using the ``nl_langinfo`` function.  That means that you have to call
    :func:`locale.setlocale` in the application and encode Unicode strings
@@ -104,8 +112,8 @@ The module :mod:`curses` defines the following functions:
 .. function:: color_content(color_number)
 
    Return the intensity of the red, green, and blue (RGB) components in the color
-   *color_number*, which must be between ``0`` and :const:`COLORS`.  A 3-tuple is
-   returned, containing the R,G,B values for the given color, which will be between
+   *color_number*, which must be between ``0`` and :const:`COLORS`.  Return a 3-tuple,
+   containing the R,G,B values for the given color, which will be between
    ``0`` (no component) and ``1000`` (maximum amount of component).
 
 
@@ -119,9 +127,9 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: curs_set(visibility)
 
-   Set the cursor state.  *visibility* can be set to 0, 1, or 2, for invisible,
-   normal, or very visible.  If the terminal supports the visibility requested, the
-   previous cursor state is returned; otherwise, an exception is raised.  On many
+   Set the cursor state.  *visibility* can be set to ``0``, ``1``, or ``2``, for invisible,
+   normal, or very visible.  If the terminal supports the visibility requested, return the
+   previous cursor state; otherwise raise an exception.  On many
    terminals, the "visible" mode is an underline cursor and the "very visible" mode
    is a block cursor.
 
@@ -154,12 +162,12 @@ The module :mod:`curses` defines the following functions:
    representing the desired next state.  The :func:`doupdate` ground updates the
    physical screen to match the virtual screen.
 
-   The virtual screen may be updated by a :meth:`noutrefresh` call after write
-   operations such as :meth:`addstr` have been performed on a window.  The normal
-   :meth:`refresh` call is simply :meth:`noutrefresh` followed by :func:`doupdate`;
+   The virtual screen may be updated by a :meth:`~window.noutrefresh` call after write
+   operations such as :meth:`~window.addstr` have been performed on a window.  The normal
+   :meth:`~window.refresh` call is simply :meth:`!noutrefresh` followed by :func:`!doupdate`;
    if you have to update multiple windows, you can speed performance and perhaps
-   reduce screen flicker by issuing :meth:`noutrefresh` calls on all windows,
-   followed by a single :func:`doupdate`.
+   reduce screen flicker by issuing :meth:`!noutrefresh` calls on all windows,
+   followed by a single :func:`!doupdate`.
 
 
 .. function:: echo()
@@ -175,7 +183,7 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: erasechar()
 
-   Return the user's current erase character.  Under Unix operating systems this
+   Return the user's current erase character as a one-byte bytes object.  Under Unix operating systems this
    is a property of the controlling tty of the curses program, and is not set by
    the curses library itself.
 
@@ -183,9 +191,9 @@ The module :mod:`curses` defines the following functions:
 .. function:: filter()
 
    The :func:`.filter` routine, if used, must be called before :func:`initscr` is
-   called.  The effect is that, during those calls, :envvar:`LINES` is set to 1; the
-   capabilities clear, cup, cud, cud1, cuu1, cuu, vpa are disabled; and the home
-   string is set to the value of cr. The effect is that the cursor is confined to
+   called.  The effect is that, during those calls, :envvar:`LINES` is set to ``1``; the
+   capabilities ``clear``, ``cup``, ``cud``, ``cud1``, ``cuu1``, ``cuu``, ``vpa`` are disabled; and the ``home``
+   string is set to the value of ``cr``. The effect is that the cursor is confined to
    the current line, and so are screen updates.  This may be used for enabling
    character-at-a-time  line editing without touching the rest of the screen.
 
@@ -205,7 +213,7 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: getmouse()
 
-   After :meth:`getch` returns :const:`KEY_MOUSE` to signal a mouse event, this
+   After :meth:`~window.getch` returns :const:`KEY_MOUSE` to signal a mouse event, this
    method should be call to retrieve the queued mouse event, represented as a
    5-tuple ``(id, x, y, z, bstate)``. *id* is an ID value used to distinguish
    multiple devices, and *x*, *y*, *z* are the event's coordinates.  (*z* is
@@ -219,8 +227,8 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: getsyx()
 
-   Return the current coordinates of the virtual screen cursor in y and x.  If
-   leaveok is currently true, then -1,-1 is returned.
+   Return the current coordinates of the virtual screen cursor as a tuple
+   ``(y, x)``.  If :meth:`leaveok <window.leaveok>` is currently ``True``, then return ``(-1, -1)``.
 
 
 .. function:: getwin(file)
@@ -260,7 +268,7 @@ The module :mod:`curses` defines the following functions:
 
    Used for half-delay mode, which is similar to cbreak mode in that characters
    typed by the user are immediately available to the program. However, after
-   blocking for *tenths* tenths of seconds, an exception is raised if nothing has
+   blocking for *tenths* tenths of seconds, raise an exception if nothing has
    been typed.  The value of *tenths* must be a number between ``1`` and ``255``.  Use
    :func:`nocbreak` to leave half-delay mode.
 
@@ -273,7 +281,7 @@ The module :mod:`curses` defines the following functions:
    :const:`COLORS`.  Each of *r*, *g*, *b*, must be a value between ``0`` and
    ``1000``.  When :func:`init_color` is used, all occurrences of that color on the
    screen immediately change to the new definition.  This function is a no-op on
-   most terminals; it is active only if :func:`can_change_color` returns ``1``.
+   most terminals; it is active only if :func:`can_change_color` returns ``True``.
 
 
 .. function:: init_pair(pair_number, fg, bg)
@@ -313,32 +321,32 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: keyname(k)
 
-   Return the name of the key numbered *k*.  The name of a key generating printable
+   Return the name of the key numbered *k* as a bytes object.  The name of a key generating printable
    ASCII character is the key's character.  The name of a control-key combination
-   is a two-character string consisting of a caret followed by the corresponding
+   is a two-byte bytes object consisting of a caret (``b'^'``) followed by the corresponding
    printable ASCII character.  The name of an alt-key combination (128--255) is a
-   string consisting of the prefix 'M-' followed by the name of the corresponding
+   bytes object consisting of the prefix ``b'M-'`` followed by the name of the corresponding
    ASCII character.
 
 
 .. function:: killchar()
 
-   Return the user's current line kill character. Under Unix operating systems
+   Return the user's current line kill character as a one-byte bytes object. Under Unix operating systems
    this is a property of the controlling tty of the curses program, and is not set
    by the curses library itself.
 
 
 .. function:: longname()
 
-   Return a string containing the terminfo long name field describing the current
+   Return a bytes object containing the terminfo long name field describing the current
    terminal.  The maximum length of a verbose description is 128 characters.  It is
    defined only after the call to :func:`initscr`.
 
 
-.. function:: meta(yes)
+.. function:: meta(flag)
 
-   If *yes* is 1, allow 8-bit characters to be input. If *yes* is 0,  allow only
-   7-bit chars.
+   If *flag* is ``True``, allow 8-bit characters to be input.  If
+   *flag* is ``False``,  allow only 7-bit chars.
 
 
 .. function:: mouseinterval(interval)
@@ -352,7 +360,7 @@ The module :mod:`curses` defines the following functions:
 
    Set the mouse events to be reported, and return a tuple ``(availmask,
    oldmask)``.   *availmask* indicates which of the specified mouse events can be
-   reported; on complete failure it returns 0.  *oldmask* is the previous value of
+   reported; on complete failure it returns ``0``.  *oldmask* is the previous value of
    the given window's mouse event mask.  If this function is never called, no mouse
    events are ever reported.
 
@@ -365,13 +373,13 @@ The module :mod:`curses` defines the following functions:
 .. function:: newpad(nlines, ncols)
 
    Create and return a pointer to a new pad data structure with the given number
-   of lines and columns.  A pad is returned as a window object.
+   of lines and columns.  Return a pad as a window object.
 
    A pad is like a window, except that it is not restricted by the screen size, and
    is not necessarily associated with a particular part of the screen.  Pads can be
    used when a large window is needed, and only a part of the window will be on the
    screen at one time.  Automatic refreshes of pads (such as from scrolling or
-   echoing of input) do not occur.  The :meth:`refresh` and :meth:`noutrefresh`
+   echoing of input) do not occur.  The :meth:`~window.refresh` and :meth:`~window.noutrefresh`
    methods of a pad require 6 arguments to specify the part of the pad to be
    displayed and the location on the screen to be used for the display. The
    arguments are *pminrow*, *pmincol*, *sminrow*, *smincol*, *smaxrow*, *smaxcol*; the *p*
@@ -419,9 +427,9 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: noqiflush()
 
-   When the :func:`noqiflush` routine is used, normal flush of input and output queues
-   associated with the INTR, QUIT and SUSP characters will not be done.  You may
-   want to call :func:`noqiflush` in a signal handler if you want output to
+   When the :func:`!noqiflush` routine is used, normal flush of input and output queues
+   associated with the ``INTR``, ``QUIT`` and ``SUSP`` characters will not be done.  You may
+   want to call :func:`!noqiflush` in a signal handler if you want output to
    continue as though the interrupt had not occurred, after the handler exits.
 
 
@@ -442,14 +450,14 @@ The module :mod:`curses` defines the following functions:
    :func:`color_pair` is the counterpart to this function.
 
 
-.. function:: putp(string)
+.. function:: putp(str)
 
    Equivalent to ``tputs(str, 1, putchar)``; emit the value of a specified
    terminfo capability for the current terminal.  Note that the output of :func:`putp`
    always goes to standard output.
 
 
-.. function:: qiflush( [flag] )
+.. function:: qiflush([flag])
 
    If *flag* is ``False``, the effect is the same as calling :func:`noqiflush`. If
    *flag* is ``True``, or no argument is provided, the queues will be flushed when
@@ -486,7 +494,7 @@ The module :mod:`curses` defines the following functions:
    Backend function used by :func:`resizeterm`, performing most of the work;
    when resizing the windows, :func:`resize_term` blank-fills the areas that are
    extended.  The calling application should fill in these areas with
-   appropriate data.  The :func:`resize_term` function attempts to resize all
+   appropriate data.  The :func:`!resize_term` function attempts to resize all
    windows.  However, due to the calling convention of pads, it is not possible
    to resize these without additional interaction with the application.
 
@@ -506,16 +514,17 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: setsyx(y, x)
 
-   Set the virtual screen cursor to *y*, *x*. If *y* and *x* are both -1, then
-   leaveok is set.
+   Set the virtual screen cursor to *y*, *x*. If *y* and *x* are both ``-1``, then
+   :meth:`leaveok <window.leaveok>` is set ``True``.
 
 
-.. function:: setupterm([termstr, fd])
+.. function:: setupterm(term=None, fd=-1)
 
-   Initialize the terminal.  *termstr* is a string giving the terminal name; if
-   omitted, the value of the :envvar:`TERM` environment variable will be used.  *fd* is the
+   Initialize the terminal.  *term* is a string giving
+   the terminal name, or ``None``; if omitted or ``None``, the value of the
+   :envvar:`TERM` environment variable will be used.  *fd* is the
    file descriptor to which any initialization sequences will be sent; if not
-   supplied, the file descriptor for ``sys.stdout`` will be used.
+   supplied or ``-1``, the file descriptor for ``sys.stdout`` will be used.
 
 
 .. function:: start_color()
@@ -540,13 +549,14 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: termname()
 
-   Return the value of the environment variable :envvar:`TERM`, truncated to 14 characters.
+   Return the value of the environment variable :envvar:`TERM`, as a bytes object,
+   truncated to 14 characters.
 
 
 .. function:: tigetflag(capname)
 
    Return the value of the Boolean capability corresponding to the terminfo
-   capability name *capname*.  The value ``-1`` is returned if *capname* is not a
+   capability name *capname* as an integer.  Return the value ``-1`` if *capname* is not a
    Boolean capability, or ``0`` if it is canceled or absent from the terminal
    description.
 
@@ -554,7 +564,7 @@ The module :mod:`curses` defines the following functions:
 .. function:: tigetnum(capname)
 
    Return the value of the numeric capability corresponding to the terminfo
-   capability name *capname*.  The value ``-2`` is returned if *capname* is not a
+   capability name *capname* as an integer.  Return the value ``-2`` if *capname* is not a
    numeric capability, or ``-1`` if it is canceled or absent from the terminal
    description.
 
@@ -562,13 +572,14 @@ The module :mod:`curses` defines the following functions:
 .. function:: tigetstr(capname)
 
    Return the value of the string capability corresponding to the terminfo
-   capability name *capname*.  ``None`` is returned if *capname* is not a string
-   capability, or is canceled or absent from the terminal description.
+   capability name *capname* as a bytes object.  Return ``None`` if *capname*
+   is not a terminfo "string capability", or is canceled or absent from the
+   terminal description.
 
 
 .. function:: tparm(str[, ...])
 
-   Instantiate the string *str* with the supplied parameters, where *str* should
+   Instantiate the bytes object *str* with the supplied parameters, where *str* should
    be a parameterized string obtained from the terminfo database.  E.g.
    ``tparm(tigetstr("cup"), 5, 3)`` could result in ``b'\033[6;4H'``, the exact
    result depending on terminal type.
@@ -588,18 +599,18 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: unctrl(ch)
 
-   Return a string which is a printable representation of the character *ch*.
-   Control characters are displayed as a caret followed by the character, for
-   example as ``^C``. Printing characters are left as they are.
+   Return a bytes object which is a printable representation of the character *ch*.
+   Control characters are represented as a caret followed by the character, for
+   example as ``b'^C'``. Printing characters are left as they are.
 
 
 .. function:: ungetch(ch)
 
-   Push *ch* so the next :meth:`getch` will return it.
+   Push *ch* so the next :meth:`~window.getch` will return it.
 
    .. note::
 
-      Only one *ch* can be pushed before :meth:`getch` is called.
+      Only one *ch* can be pushed before :meth:`!getch` is called.
 
 
 .. function:: update_lines_cols()
@@ -611,11 +622,11 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: unget_wch(ch)
 
-   Push *ch* so the next :meth:`get_wch` will return it.
+   Push *ch* so the next :meth:`~window.get_wch` will return it.
 
    .. note::
 
-      Only one *ch* can be pushed before :meth:`get_wch` is called.
+      Only one *ch* can be pushed before :meth:`!get_wch` is called.
 
    .. versionadded:: 3.3
 
@@ -640,7 +651,7 @@ The module :mod:`curses` defines the following functions:
 
    Allow use of default values for colors on terminals supporting this feature. Use
    this to support transparency in your application.  The default color is assigned
-   to the color number -1. After calling this function,  ``init_pair(x,
+   to the color number ``-1``. After calling this function,  ``init_pair(x,
    curses.COLOR_RED, -1)`` initializes, for instance, color pair *x* to a red
    foreground color on the default background.
 
@@ -652,7 +663,7 @@ The module :mod:`curses` defines the following functions:
    this function will restore the terminal to a sane state before re-raising the
    exception and generating a traceback.  The callable object *func* is then passed
    the main window 'stdscr' as its first argument, followed by any other arguments
-   passed to :func:`wrapper`.  Before calling *func*, :func:`wrapper` turns on
+   passed to :func:`!wrapper`.  Before calling *func*, :func:`!wrapper` turns on
    cbreak mode, turns off echo, enables the terminal keypad, and initializes colors
    if the terminal has color support.  On exit (whether normally or by exception)
    it restores cooked mode, turns on echo, and disables the terminal keypad.
@@ -670,13 +681,6 @@ the following methods and attributes:
 .. method:: window.addch(ch[, attr])
             window.addch(y, x, ch[, attr])
 
-   .. note::
-
-      A *character* means a C character (an ASCII code), rather than a Python
-      character (a string of length 1). (This note is true whenever the
-      documentation mentions a character.) The built-in :func:`ord` is handy for
-      conveying strings to codes.
-
    Paint character *ch* at ``(y, x)`` with attributes *attr*, overwriting any
    character previously painter at that location.  By default, the character
    position and attributes are the current settings for the window object.
@@ -685,15 +689,16 @@ the following methods and attributes:
 .. method:: window.addnstr(str, n[, attr])
             window.addnstr(y, x, str, n[, attr])
 
-   Paint at most *n* characters of the  string *str* at ``(y, x)`` with attributes
+   Paint at most *n* characters of the character string *str* at
+   ``(y, x)`` with attributes
    *attr*, overwriting anything previously on the display.
 
 
 .. method:: window.addstr(str[, attr])
             window.addstr(y, x, str[, attr])
 
-   Paint the string *str* at ``(y, x)`` with attributes *attr*, overwriting
-   anything previously on the display.
+   Paint the character string *str* at ``(y, x)`` with attributes
+   *attr*, overwriting anything previously on the display.
 
 
 .. method:: window.attroff(attr)
@@ -710,8 +715,8 @@ the following methods and attributes:
 
 .. method:: window.attrset(attr)
 
-   Set the "background" set of attributes to *attr*.  This set is initially 0 (no
-   attributes).
+   Set the "background" set of attributes to *attr*.  This set is initially
+   ``0`` (no attributes).
 
 
 .. method:: window.bkgd(ch[, attr])
@@ -741,8 +746,7 @@ the following methods and attributes:
 
    Draw a border around the edges of the window. Each parameter specifies  the
    character to use for a specific part of the border; see the table below for more
-   details.  The characters can be specified as integers or as one-character
-   strings.
+   details.
 
    .. note::
 
@@ -783,7 +787,7 @@ the following methods and attributes:
             window.chgat(y, x, num, attr)
 
    Set the attributes of *num* characters at the current cursor position, or at
-   position ``(y, x)`` if supplied. If no value of *num* is given or *num* = -1,
+   position ``(y, x)`` if supplied. If *num* is not given or is ``-1``,
    the attribute will  be set on all the characters to the end of the line.  This
    function does not move the cursor. The changed line will be touched using the
    :meth:`touchline` method so that the contents will be redisplayed by the next
@@ -796,9 +800,9 @@ the following methods and attributes:
    call to :meth:`refresh`.
 
 
-.. method:: window.clearok(yes)
+.. method:: window.clearok(flag)
 
-   If *yes* is 1, the next call to :meth:`refresh` will clear the window
+   If *flag* is ``True``, the next call to :meth:`refresh` will clear the window
    completely.
 
 
@@ -880,15 +884,16 @@ the following methods and attributes:
 .. method:: window.getch([y, x])
 
    Get a character. Note that the integer returned does *not* have to be in ASCII
-   range: function keys, keypad keys and so on return numbers higher than 256. In
-   no-delay mode, -1 is returned if there is no input, else :func:`getch` waits
-   until a key is pressed.
+   range: function keys, keypad keys and so on are represented by numbers higher
+   than 255.  In no-delay mode, return ``-1`` if there is no input, otherwise
+   wait until a key is pressed.
 
 
 .. method:: window.get_wch([y, x])
 
    Get a wide character. Return a character for most keys, or an integer for
    function keys, keypad keys, and other special keys.
+   In no-delay mode, raise an exception if there is no input.
 
    .. versionadded:: 3.3
 
@@ -897,7 +902,7 @@ the following methods and attributes:
 
    Get a character, returning a string instead of an integer, as :meth:`getch`
    does. Function keys, keypad keys and other special keys return a multibyte
-   string containing the key name.  In no-delay mode, an exception is raised if
+   string containing the key name.  In no-delay mode, raise an exception if
    there is no input.
 
 
@@ -909,13 +914,16 @@ the following methods and attributes:
 .. method:: window.getparyx()
 
    Return the beginning coordinates of this window relative to its parent window
-   into two integer variables y and x.  Return ``-1, -1`` if this window has no
+   as a tuple ``(y, x)``.  Return ``(-1, -1)`` if this window has no
    parent.
 
 
-.. method:: window.getstr([y, x])
+.. method:: window.getstr()
+            window.getstr(n)
+            window.getstr(y, x)
+            window.getstr(y, x, n)
 
-   Read a string from the user, with primitive line editing capacity.
+   Read a bytes object from the user, with primitive line editing capacity.
 
 
 .. method:: window.getyx()
@@ -939,9 +947,9 @@ the following methods and attributes:
    insert/delete is enabled by default.
 
 
-.. method:: window.idlok(yes)
+.. method:: window.idlok(flag)
 
-   If called with *yes* equal to 1, :mod:`curses` will try and use hardware line
+   If *flag* is ``True``, :mod:`curses` will try and use hardware line
    editing facilities. Otherwise, line insertion/deletion are disabled.
 
 
@@ -1003,7 +1011,7 @@ the following methods and attributes:
 .. method:: window.instr([n])
             window.instr(y, x[, n])
 
-   Return a string of characters, extracted from the window starting at the
+   Return a bytes object of characters, extracted from the window starting at the
    current cursor position, or at *y*, *x* if specified. Attributes are stripped
    from the characters.  If *n* is specified, :meth:`instr` returns a string
    at most *n* characters long (exclusive of the trailing NUL).
@@ -1022,20 +1030,20 @@ the following methods and attributes:
    :meth:`refresh`; otherwise return ``False``.
 
 
-.. method:: window.keypad(yes)
+.. method:: window.keypad(flag)
 
-   If *yes* is 1, escape sequences generated by some keys (keypad,  function keys)
-   will be interpreted by :mod:`curses`. If *yes* is 0, escape sequences will be
+   If *flag* is ``True``, escape sequences generated by some keys (keypad,  function keys)
+   will be interpreted by :mod:`curses`. If *flag* is ``False``, escape sequences will be
    left as is in the input stream.
 
 
-.. method:: window.leaveok(yes)
+.. method:: window.leaveok(flag)
 
-   If *yes* is 1, cursor is left where it is on update, instead of being at "cursor
+   If *flag* is ``True``, cursor is left where it is on update, instead of being at "cursor
    position."  This reduces cursor movement where possible. If possible the cursor
    will be made invisible.
 
-   If *yes* is 0, cursor will always be at "cursor position" after an update.
+   If *flag* is ``False``, cursor will always be at "cursor position" after an update.
 
 
 .. method:: window.move(new_y, new_x)
@@ -1055,16 +1063,16 @@ the following methods and attributes:
    Move the window so its upper-left corner is at ``(new_y, new_x)``.
 
 
-.. method:: window.nodelay(yes)
+.. method:: window.nodelay(flag)
 
-   If *yes* is ``1``, :meth:`getch` will be non-blocking.
+   If *flag* is ``True``, :meth:`getch` will be non-blocking.
 
 
-.. method:: window.notimeout(yes)
+.. method:: window.notimeout(flag)
 
-   If *yes* is ``1``, escape sequences will not be timed out.
+   If *flag* is ``True``, escape sequences will not be timed out.
 
-   If *yes* is ``0``, after a few milliseconds, an escape sequence will not be
+   If *flag* is ``False``, after a few milliseconds, an escape sequence will not be
    interpreted, and will be left in the input stream as is.
 
 
@@ -1153,8 +1161,8 @@ the following methods and attributes:
 
    Control what happens when the cursor of a window is moved off the edge of the
    window or scrolling region, either as a result of a newline action on the bottom
-   line, or typing the last character of the last line.  If *flag* is false, the
-   cursor is left on the bottom line.  If *flag* is true, the window is scrolled up
+   line, or typing the last character of the last line.  If *flag* is ``False``, the
+   cursor is left on the bottom line.  If *flag* is ``True``, the window is scrolled up
    one line.  Note that in order to get the physical scrolling effect on the
    terminal, it is also necessary to call :meth:`idlok`.
 
@@ -1202,7 +1210,7 @@ the following methods and attributes:
 
 .. method:: window.syncok(flag)
 
-   If called with *flag* set to ``True``, then :meth:`syncup` is called automatically
+   If *flag* is ``True``, then :meth:`syncup` is called automatically
    whenever there is a change in the window.
 
 
@@ -1216,9 +1224,9 @@ the following methods and attributes:
 
    Set blocking or non-blocking read behavior for the window.  If *delay* is
    negative, blocking read is used (which will wait indefinitely for input).  If
-   *delay* is zero, then non-blocking read is used, and -1 will be returned by
-   :meth:`getch` if no input is waiting.  If *delay* is positive, then
-   :meth:`getch` will block for *delay* milliseconds, and return -1 if there is
+   *delay* is zero, then non-blocking read is used, and :meth:`getch` will
+   return ``-1`` if no input is waiting.  If *delay* is positive, then
+   :meth:`getch` will block for *delay* milliseconds, and return ``-1`` if there is
    still no input at the end of that time.
 
 
@@ -1226,7 +1234,7 @@ the following methods and attributes:
 
    Pretend *count* lines have been changed, starting with line *start*.  If
    *changed* is supplied, it specifies whether the affected lines are marked as
-   having been changed (*changed*\ =1) or unchanged (*changed*\ =0).
+   having been changed (*changed*\ ``=True``) or unchanged (*changed*\ ``=False``).
 
 
 .. method:: window.touchwin()
@@ -1268,7 +1276,7 @@ The :mod:`curses` module defines the following data members:
 
 .. data:: version
 
-   A string representing the current version of the module.  Also available as
+   A bytes object representing the current version of the module.  Also available as
    :const:`__version__`.
 
 Some constants are available to specify character cell attributes.


From webhook-mailer at python.org  Wed Oct  4 22:15:14 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Thu, 05 Oct 2017 02:15:14 -0000
Subject: [Python-checkins] Add self and idlelib to CODEOWNERS file. (#3889)
Message-ID: <mailman.38.1507169715.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/55fd06605b5d4fb6442645f1532aa05953bd93bc
commit: 55fd06605b5d4fb6442645f1532aa05953bd93bc
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-10-04T22:15:11-04:00
summary:

Add self and idlelib to CODEOWNERS file. (#3889)

Followed format of other entries.

files:
M .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 67c03a807d0..8e0647fdc1f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -49,3 +49,5 @@ Python/bootstrap_hash.c       @python/crypto-team
 **/*heapq*                    @rhettinger
 **/*functools*                @ncoghlan @rhettinger
 **/*decimal*                  @rhettinger @skrah
+
+**/*idlelib*                  @terryjreedy


From webhook-mailer at python.org  Thu Oct  5 02:35:51 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 05 Oct 2017 06:35:51 -0000
Subject: [Python-checkins] [3.6] bpo-30872: Update the curses docs to Python
 3. (GH-2620) (#3887)
Message-ID: <mailman.39.1507185352.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/de5427a8f7ce15565d13383bc8d279bb07dda1cb
commit: de5427a8f7ce15565d13383bc8d279bb07dda1cb
branch: 3.6
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-05T09:35:45+03:00
summary:

[3.6] bpo-30872: Update the curses docs to Python 3. (GH-2620) (#3887)

(cherry picked from commit 300dd552b15825abfe0e367ac14cec4c3e050dbc)

files:
M Doc/library/curses.ascii.rst
M Doc/library/curses.panel.rst
M Doc/library/curses.rst

diff --git a/Doc/library/curses.ascii.rst b/Doc/library/curses.ascii.rst
index b6ac2517335..04b2a260af0 100644
--- a/Doc/library/curses.ascii.rst
+++ b/Doc/library/curses.ascii.rst
@@ -176,14 +176,12 @@ C library:
 
    Checks for a non-ASCII character (ordinal values 0x80 and above).
 
-These functions accept either integers or strings; when the argument is a
+These functions accept either integers or single-character strings; when the argument is a
 string, it is first converted using the built-in function :func:`ord`.
 
-Note that all these functions check ordinal bit values derived from the  first
+Note that all these functions check ordinal bit values derived from the
 character of the string you pass in; they do not actually know anything about
-the host machine's character encoding.  For functions  that know about the
-character encoding (and handle internationalization properly) see the
-:mod:`string` module.
+the host machine's character encoding.
 
 The following two functions take either a single-character string or integer
 byte value; they return a value of the same type.
diff --git a/Doc/library/curses.panel.rst b/Doc/library/curses.panel.rst
index c99c37a5651..d770c03c837 100644
--- a/Doc/library/curses.panel.rst
+++ b/Doc/library/curses.panel.rst
@@ -74,7 +74,7 @@ Panel objects have the following methods:
 
 .. method:: Panel.hidden()
 
-   Returns true if the panel is hidden (not visible), false otherwise.
+   Returns ``True`` if the panel is hidden (not visible), ``False`` otherwise.
 
 
 .. method:: Panel.hide()
diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
index 668d2826b0a..3697407f5c4 100644
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -21,6 +21,14 @@ Linux and the BSD variants of Unix.
 
 .. note::
 
+   Whenever the documentation mentions a *character* it can be specified
+   as an integer, a one-character Unicode string or a one-byte byte string.
+
+   Whenever the documentation mentions a *character string* it can be specified
+   as a Unicode string or a byte string.
+
+.. note::
+
    Since version 5.4, the ncurses library decides how to interpret non-ASCII data
    using the ``nl_langinfo`` function.  That means that you have to call
    :func:`locale.setlocale` in the application and encode Unicode strings
@@ -104,8 +112,8 @@ The module :mod:`curses` defines the following functions:
 .. function:: color_content(color_number)
 
    Return the intensity of the red, green, and blue (RGB) components in the color
-   *color_number*, which must be between ``0`` and :const:`COLORS`.  A 3-tuple is
-   returned, containing the R,G,B values for the given color, which will be between
+   *color_number*, which must be between ``0`` and :const:`COLORS`.  Return a 3-tuple,
+   containing the R,G,B values for the given color, which will be between
    ``0`` (no component) and ``1000`` (maximum amount of component).
 
 
@@ -119,9 +127,9 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: curs_set(visibility)
 
-   Set the cursor state.  *visibility* can be set to 0, 1, or 2, for invisible,
-   normal, or very visible.  If the terminal supports the visibility requested, the
-   previous cursor state is returned; otherwise, an exception is raised.  On many
+   Set the cursor state.  *visibility* can be set to ``0``, ``1``, or ``2``, for invisible,
+   normal, or very visible.  If the terminal supports the visibility requested, return the
+   previous cursor state; otherwise raise an exception.  On many
    terminals, the "visible" mode is an underline cursor and the "very visible" mode
    is a block cursor.
 
@@ -154,12 +162,12 @@ The module :mod:`curses` defines the following functions:
    representing the desired next state.  The :func:`doupdate` ground updates the
    physical screen to match the virtual screen.
 
-   The virtual screen may be updated by a :meth:`noutrefresh` call after write
-   operations such as :meth:`addstr` have been performed on a window.  The normal
-   :meth:`refresh` call is simply :meth:`noutrefresh` followed by :func:`doupdate`;
+   The virtual screen may be updated by a :meth:`~window.noutrefresh` call after write
+   operations such as :meth:`~window.addstr` have been performed on a window.  The normal
+   :meth:`~window.refresh` call is simply :meth:`!noutrefresh` followed by :func:`!doupdate`;
    if you have to update multiple windows, you can speed performance and perhaps
-   reduce screen flicker by issuing :meth:`noutrefresh` calls on all windows,
-   followed by a single :func:`doupdate`.
+   reduce screen flicker by issuing :meth:`!noutrefresh` calls on all windows,
+   followed by a single :func:`!doupdate`.
 
 
 .. function:: echo()
@@ -175,7 +183,7 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: erasechar()
 
-   Return the user's current erase character.  Under Unix operating systems this
+   Return the user's current erase character as a one-byte bytes object.  Under Unix operating systems this
    is a property of the controlling tty of the curses program, and is not set by
    the curses library itself.
 
@@ -183,9 +191,9 @@ The module :mod:`curses` defines the following functions:
 .. function:: filter()
 
    The :func:`.filter` routine, if used, must be called before :func:`initscr` is
-   called.  The effect is that, during those calls, :envvar:`LINES` is set to 1; the
-   capabilities clear, cup, cud, cud1, cuu1, cuu, vpa are disabled; and the home
-   string is set to the value of cr. The effect is that the cursor is confined to
+   called.  The effect is that, during those calls, :envvar:`LINES` is set to ``1``; the
+   capabilities ``clear``, ``cup``, ``cud``, ``cud1``, ``cuu1``, ``cuu``, ``vpa`` are disabled; and the ``home``
+   string is set to the value of ``cr``. The effect is that the cursor is confined to
    the current line, and so are screen updates.  This may be used for enabling
    character-at-a-time  line editing without touching the rest of the screen.
 
@@ -205,7 +213,7 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: getmouse()
 
-   After :meth:`getch` returns :const:`KEY_MOUSE` to signal a mouse event, this
+   After :meth:`~window.getch` returns :const:`KEY_MOUSE` to signal a mouse event, this
    method should be call to retrieve the queued mouse event, represented as a
    5-tuple ``(id, x, y, z, bstate)``. *id* is an ID value used to distinguish
    multiple devices, and *x*, *y*, *z* are the event's coordinates.  (*z* is
@@ -219,8 +227,8 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: getsyx()
 
-   Return the current coordinates of the virtual screen cursor in y and x.  If
-   leaveok is currently true, then -1,-1 is returned.
+   Return the current coordinates of the virtual screen cursor as a tuple
+   ``(y, x)``.  If :meth:`leaveok <window.leaveok>` is currently ``True``, then return ``(-1, -1)``.
 
 
 .. function:: getwin(file)
@@ -260,7 +268,7 @@ The module :mod:`curses` defines the following functions:
 
    Used for half-delay mode, which is similar to cbreak mode in that characters
    typed by the user are immediately available to the program. However, after
-   blocking for *tenths* tenths of seconds, an exception is raised if nothing has
+   blocking for *tenths* tenths of seconds, raise an exception if nothing has
    been typed.  The value of *tenths* must be a number between ``1`` and ``255``.  Use
    :func:`nocbreak` to leave half-delay mode.
 
@@ -273,7 +281,7 @@ The module :mod:`curses` defines the following functions:
    :const:`COLORS`.  Each of *r*, *g*, *b*, must be a value between ``0`` and
    ``1000``.  When :func:`init_color` is used, all occurrences of that color on the
    screen immediately change to the new definition.  This function is a no-op on
-   most terminals; it is active only if :func:`can_change_color` returns ``1``.
+   most terminals; it is active only if :func:`can_change_color` returns ``True``.
 
 
 .. function:: init_pair(pair_number, fg, bg)
@@ -313,32 +321,32 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: keyname(k)
 
-   Return the name of the key numbered *k*.  The name of a key generating printable
+   Return the name of the key numbered *k* as a bytes object.  The name of a key generating printable
    ASCII character is the key's character.  The name of a control-key combination
-   is a two-character string consisting of a caret followed by the corresponding
+   is a two-byte bytes object consisting of a caret (``b'^'``) followed by the corresponding
    printable ASCII character.  The name of an alt-key combination (128--255) is a
-   string consisting of the prefix 'M-' followed by the name of the corresponding
+   bytes object consisting of the prefix ``b'M-'`` followed by the name of the corresponding
    ASCII character.
 
 
 .. function:: killchar()
 
-   Return the user's current line kill character. Under Unix operating systems
+   Return the user's current line kill character as a one-byte bytes object. Under Unix operating systems
    this is a property of the controlling tty of the curses program, and is not set
    by the curses library itself.
 
 
 .. function:: longname()
 
-   Return a string containing the terminfo long name field describing the current
+   Return a bytes object containing the terminfo long name field describing the current
    terminal.  The maximum length of a verbose description is 128 characters.  It is
    defined only after the call to :func:`initscr`.
 
 
-.. function:: meta(yes)
+.. function:: meta(flag)
 
-   If *yes* is 1, allow 8-bit characters to be input. If *yes* is 0,  allow only
-   7-bit chars.
+   If *flag* is ``True``, allow 8-bit characters to be input.  If
+   *flag* is ``False``,  allow only 7-bit chars.
 
 
 .. function:: mouseinterval(interval)
@@ -352,7 +360,7 @@ The module :mod:`curses` defines the following functions:
 
    Set the mouse events to be reported, and return a tuple ``(availmask,
    oldmask)``.   *availmask* indicates which of the specified mouse events can be
-   reported; on complete failure it returns 0.  *oldmask* is the previous value of
+   reported; on complete failure it returns ``0``.  *oldmask* is the previous value of
    the given window's mouse event mask.  If this function is never called, no mouse
    events are ever reported.
 
@@ -365,13 +373,13 @@ The module :mod:`curses` defines the following functions:
 .. function:: newpad(nlines, ncols)
 
    Create and return a pointer to a new pad data structure with the given number
-   of lines and columns.  A pad is returned as a window object.
+   of lines and columns.  Return a pad as a window object.
 
    A pad is like a window, except that it is not restricted by the screen size, and
    is not necessarily associated with a particular part of the screen.  Pads can be
    used when a large window is needed, and only a part of the window will be on the
    screen at one time.  Automatic refreshes of pads (such as from scrolling or
-   echoing of input) do not occur.  The :meth:`refresh` and :meth:`noutrefresh`
+   echoing of input) do not occur.  The :meth:`~window.refresh` and :meth:`~window.noutrefresh`
    methods of a pad require 6 arguments to specify the part of the pad to be
    displayed and the location on the screen to be used for the display. The
    arguments are *pminrow*, *pmincol*, *sminrow*, *smincol*, *smaxrow*, *smaxcol*; the *p*
@@ -419,9 +427,9 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: noqiflush()
 
-   When the :func:`noqiflush` routine is used, normal flush of input and output queues
-   associated with the INTR, QUIT and SUSP characters will not be done.  You may
-   want to call :func:`noqiflush` in a signal handler if you want output to
+   When the :func:`!noqiflush` routine is used, normal flush of input and output queues
+   associated with the ``INTR``, ``QUIT`` and ``SUSP`` characters will not be done.  You may
+   want to call :func:`!noqiflush` in a signal handler if you want output to
    continue as though the interrupt had not occurred, after the handler exits.
 
 
@@ -442,14 +450,14 @@ The module :mod:`curses` defines the following functions:
    :func:`color_pair` is the counterpart to this function.
 
 
-.. function:: putp(string)
+.. function:: putp(str)
 
    Equivalent to ``tputs(str, 1, putchar)``; emit the value of a specified
    terminfo capability for the current terminal.  Note that the output of :func:`putp`
    always goes to standard output.
 
 
-.. function:: qiflush( [flag] )
+.. function:: qiflush([flag])
 
    If *flag* is ``False``, the effect is the same as calling :func:`noqiflush`. If
    *flag* is ``True``, or no argument is provided, the queues will be flushed when
@@ -486,7 +494,7 @@ The module :mod:`curses` defines the following functions:
    Backend function used by :func:`resizeterm`, performing most of the work;
    when resizing the windows, :func:`resize_term` blank-fills the areas that are
    extended.  The calling application should fill in these areas with
-   appropriate data.  The :func:`resize_term` function attempts to resize all
+   appropriate data.  The :func:`!resize_term` function attempts to resize all
    windows.  However, due to the calling convention of pads, it is not possible
    to resize these without additional interaction with the application.
 
@@ -506,16 +514,17 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: setsyx(y, x)
 
-   Set the virtual screen cursor to *y*, *x*. If *y* and *x* are both -1, then
-   leaveok is set.
+   Set the virtual screen cursor to *y*, *x*. If *y* and *x* are both ``-1``, then
+   :meth:`leaveok <window.leaveok>` is set ``True``.
 
 
-.. function:: setupterm([termstr, fd])
+.. function:: setupterm(term=None, fd=-1)
 
-   Initialize the terminal.  *termstr* is a string giving the terminal name; if
-   omitted, the value of the :envvar:`TERM` environment variable will be used.  *fd* is the
+   Initialize the terminal.  *term* is a string giving
+   the terminal name, or ``None``; if omitted or ``None``, the value of the
+   :envvar:`TERM` environment variable will be used.  *fd* is the
    file descriptor to which any initialization sequences will be sent; if not
-   supplied, the file descriptor for ``sys.stdout`` will be used.
+   supplied or ``-1``, the file descriptor for ``sys.stdout`` will be used.
 
 
 .. function:: start_color()
@@ -540,13 +549,14 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: termname()
 
-   Return the value of the environment variable :envvar:`TERM`, truncated to 14 characters.
+   Return the value of the environment variable :envvar:`TERM`, as a bytes object,
+   truncated to 14 characters.
 
 
 .. function:: tigetflag(capname)
 
    Return the value of the Boolean capability corresponding to the terminfo
-   capability name *capname*.  The value ``-1`` is returned if *capname* is not a
+   capability name *capname* as an integer.  Return the value ``-1`` if *capname* is not a
    Boolean capability, or ``0`` if it is canceled or absent from the terminal
    description.
 
@@ -554,7 +564,7 @@ The module :mod:`curses` defines the following functions:
 .. function:: tigetnum(capname)
 
    Return the value of the numeric capability corresponding to the terminfo
-   capability name *capname*.  The value ``-2`` is returned if *capname* is not a
+   capability name *capname* as an integer.  Return the value ``-2`` if *capname* is not a
    numeric capability, or ``-1`` if it is canceled or absent from the terminal
    description.
 
@@ -562,13 +572,14 @@ The module :mod:`curses` defines the following functions:
 .. function:: tigetstr(capname)
 
    Return the value of the string capability corresponding to the terminfo
-   capability name *capname*.  ``None`` is returned if *capname* is not a string
-   capability, or is canceled or absent from the terminal description.
+   capability name *capname* as a bytes object.  Return ``None`` if *capname*
+   is not a terminfo "string capability", or is canceled or absent from the
+   terminal description.
 
 
 .. function:: tparm(str[, ...])
 
-   Instantiate the string *str* with the supplied parameters, where *str* should
+   Instantiate the bytes object *str* with the supplied parameters, where *str* should
    be a parameterized string obtained from the terminfo database.  E.g.
    ``tparm(tigetstr("cup"), 5, 3)`` could result in ``b'\033[6;4H'``, the exact
    result depending on terminal type.
@@ -588,18 +599,18 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: unctrl(ch)
 
-   Return a string which is a printable representation of the character *ch*.
-   Control characters are displayed as a caret followed by the character, for
-   example as ``^C``. Printing characters are left as they are.
+   Return a bytes object which is a printable representation of the character *ch*.
+   Control characters are represented as a caret followed by the character, for
+   example as ``b'^C'``. Printing characters are left as they are.
 
 
 .. function:: ungetch(ch)
 
-   Push *ch* so the next :meth:`getch` will return it.
+   Push *ch* so the next :meth:`~window.getch` will return it.
 
    .. note::
 
-      Only one *ch* can be pushed before :meth:`getch` is called.
+      Only one *ch* can be pushed before :meth:`!getch` is called.
 
 
 .. function:: update_lines_cols()
@@ -611,11 +622,11 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: unget_wch(ch)
 
-   Push *ch* so the next :meth:`get_wch` will return it.
+   Push *ch* so the next :meth:`~window.get_wch` will return it.
 
    .. note::
 
-      Only one *ch* can be pushed before :meth:`get_wch` is called.
+      Only one *ch* can be pushed before :meth:`!get_wch` is called.
 
    .. versionadded:: 3.3
 
@@ -640,7 +651,7 @@ The module :mod:`curses` defines the following functions:
 
    Allow use of default values for colors on terminals supporting this feature. Use
    this to support transparency in your application.  The default color is assigned
-   to the color number -1. After calling this function,  ``init_pair(x,
+   to the color number ``-1``. After calling this function,  ``init_pair(x,
    curses.COLOR_RED, -1)`` initializes, for instance, color pair *x* to a red
    foreground color on the default background.
 
@@ -652,7 +663,7 @@ The module :mod:`curses` defines the following functions:
    this function will restore the terminal to a sane state before re-raising the
    exception and generating a traceback.  The callable object *func* is then passed
    the main window 'stdscr' as its first argument, followed by any other arguments
-   passed to :func:`wrapper`.  Before calling *func*, :func:`wrapper` turns on
+   passed to :func:`!wrapper`.  Before calling *func*, :func:`!wrapper` turns on
    cbreak mode, turns off echo, enables the terminal keypad, and initializes colors
    if the terminal has color support.  On exit (whether normally or by exception)
    it restores cooked mode, turns on echo, and disables the terminal keypad.
@@ -670,13 +681,6 @@ the following methods and attributes:
 .. method:: window.addch(ch[, attr])
             window.addch(y, x, ch[, attr])
 
-   .. note::
-
-      A *character* means a C character (an ASCII code), rather than a Python
-      character (a string of length 1). (This note is true whenever the
-      documentation mentions a character.) The built-in :func:`ord` is handy for
-      conveying strings to codes.
-
    Paint character *ch* at ``(y, x)`` with attributes *attr*, overwriting any
    character previously painter at that location.  By default, the character
    position and attributes are the current settings for the window object.
@@ -685,15 +689,16 @@ the following methods and attributes:
 .. method:: window.addnstr(str, n[, attr])
             window.addnstr(y, x, str, n[, attr])
 
-   Paint at most *n* characters of the  string *str* at ``(y, x)`` with attributes
+   Paint at most *n* characters of the character string *str* at
+   ``(y, x)`` with attributes
    *attr*, overwriting anything previously on the display.
 
 
 .. method:: window.addstr(str[, attr])
             window.addstr(y, x, str[, attr])
 
-   Paint the string *str* at ``(y, x)`` with attributes *attr*, overwriting
-   anything previously on the display.
+   Paint the character string *str* at ``(y, x)`` with attributes
+   *attr*, overwriting anything previously on the display.
 
 
 .. method:: window.attroff(attr)
@@ -710,8 +715,8 @@ the following methods and attributes:
 
 .. method:: window.attrset(attr)
 
-   Set the "background" set of attributes to *attr*.  This set is initially 0 (no
-   attributes).
+   Set the "background" set of attributes to *attr*.  This set is initially
+   ``0`` (no attributes).
 
 
 .. method:: window.bkgd(ch[, attr])
@@ -741,8 +746,7 @@ the following methods and attributes:
 
    Draw a border around the edges of the window. Each parameter specifies  the
    character to use for a specific part of the border; see the table below for more
-   details.  The characters can be specified as integers or as one-character
-   strings.
+   details.
 
    .. note::
 
@@ -783,7 +787,7 @@ the following methods and attributes:
             window.chgat(y, x, num, attr)
 
    Set the attributes of *num* characters at the current cursor position, or at
-   position ``(y, x)`` if supplied. If no value of *num* is given or *num* = -1,
+   position ``(y, x)`` if supplied. If *num* is not given or is ``-1``,
    the attribute will  be set on all the characters to the end of the line.  This
    function does not move the cursor. The changed line will be touched using the
    :meth:`touchline` method so that the contents will be redisplayed by the next
@@ -796,9 +800,9 @@ the following methods and attributes:
    call to :meth:`refresh`.
 
 
-.. method:: window.clearok(yes)
+.. method:: window.clearok(flag)
 
-   If *yes* is 1, the next call to :meth:`refresh` will clear the window
+   If *flag* is ``True``, the next call to :meth:`refresh` will clear the window
    completely.
 
 
@@ -880,15 +884,16 @@ the following methods and attributes:
 .. method:: window.getch([y, x])
 
    Get a character. Note that the integer returned does *not* have to be in ASCII
-   range: function keys, keypad keys and so on return numbers higher than 256. In
-   no-delay mode, -1 is returned if there is no input, else :func:`getch` waits
-   until a key is pressed.
+   range: function keys, keypad keys and so on are represented by numbers higher
+   than 255.  In no-delay mode, return ``-1`` if there is no input, otherwise
+   wait until a key is pressed.
 
 
 .. method:: window.get_wch([y, x])
 
    Get a wide character. Return a character for most keys, or an integer for
    function keys, keypad keys, and other special keys.
+   In no-delay mode, raise an exception if there is no input.
 
    .. versionadded:: 3.3
 
@@ -897,7 +902,7 @@ the following methods and attributes:
 
    Get a character, returning a string instead of an integer, as :meth:`getch`
    does. Function keys, keypad keys and other special keys return a multibyte
-   string containing the key name.  In no-delay mode, an exception is raised if
+   string containing the key name.  In no-delay mode, raise an exception if
    there is no input.
 
 
@@ -909,13 +914,16 @@ the following methods and attributes:
 .. method:: window.getparyx()
 
    Return the beginning coordinates of this window relative to its parent window
-   into two integer variables y and x.  Return ``-1, -1`` if this window has no
+   as a tuple ``(y, x)``.  Return ``(-1, -1)`` if this window has no
    parent.
 
 
-.. method:: window.getstr([y, x])
+.. method:: window.getstr()
+            window.getstr(n)
+            window.getstr(y, x)
+            window.getstr(y, x, n)
 
-   Read a string from the user, with primitive line editing capacity.
+   Read a bytes object from the user, with primitive line editing capacity.
 
 
 .. method:: window.getyx()
@@ -939,9 +947,9 @@ the following methods and attributes:
    insert/delete is enabled by default.
 
 
-.. method:: window.idlok(yes)
+.. method:: window.idlok(flag)
 
-   If called with *yes* equal to 1, :mod:`curses` will try and use hardware line
+   If *flag* is ``True``, :mod:`curses` will try and use hardware line
    editing facilities. Otherwise, line insertion/deletion are disabled.
 
 
@@ -1003,7 +1011,7 @@ the following methods and attributes:
 .. method:: window.instr([n])
             window.instr(y, x[, n])
 
-   Return a string of characters, extracted from the window starting at the
+   Return a bytes object of characters, extracted from the window starting at the
    current cursor position, or at *y*, *x* if specified. Attributes are stripped
    from the characters.  If *n* is specified, :meth:`instr` returns a string
    at most *n* characters long (exclusive of the trailing NUL).
@@ -1022,20 +1030,20 @@ the following methods and attributes:
    :meth:`refresh`; otherwise return ``False``.
 
 
-.. method:: window.keypad(yes)
+.. method:: window.keypad(flag)
 
-   If *yes* is 1, escape sequences generated by some keys (keypad,  function keys)
-   will be interpreted by :mod:`curses`. If *yes* is 0, escape sequences will be
+   If *flag* is ``True``, escape sequences generated by some keys (keypad,  function keys)
+   will be interpreted by :mod:`curses`. If *flag* is ``False``, escape sequences will be
    left as is in the input stream.
 
 
-.. method:: window.leaveok(yes)
+.. method:: window.leaveok(flag)
 
-   If *yes* is 1, cursor is left where it is on update, instead of being at "cursor
+   If *flag* is ``True``, cursor is left where it is on update, instead of being at "cursor
    position."  This reduces cursor movement where possible. If possible the cursor
    will be made invisible.
 
-   If *yes* is 0, cursor will always be at "cursor position" after an update.
+   If *flag* is ``False``, cursor will always be at "cursor position" after an update.
 
 
 .. method:: window.move(new_y, new_x)
@@ -1055,16 +1063,16 @@ the following methods and attributes:
    Move the window so its upper-left corner is at ``(new_y, new_x)``.
 
 
-.. method:: window.nodelay(yes)
+.. method:: window.nodelay(flag)
 
-   If *yes* is ``1``, :meth:`getch` will be non-blocking.
+   If *flag* is ``True``, :meth:`getch` will be non-blocking.
 
 
-.. method:: window.notimeout(yes)
+.. method:: window.notimeout(flag)
 
-   If *yes* is ``1``, escape sequences will not be timed out.
+   If *flag* is ``True``, escape sequences will not be timed out.
 
-   If *yes* is ``0``, after a few milliseconds, an escape sequence will not be
+   If *flag* is ``False``, after a few milliseconds, an escape sequence will not be
    interpreted, and will be left in the input stream as is.
 
 
@@ -1153,8 +1161,8 @@ the following methods and attributes:
 
    Control what happens when the cursor of a window is moved off the edge of the
    window or scrolling region, either as a result of a newline action on the bottom
-   line, or typing the last character of the last line.  If *flag* is false, the
-   cursor is left on the bottom line.  If *flag* is true, the window is scrolled up
+   line, or typing the last character of the last line.  If *flag* is ``False``, the
+   cursor is left on the bottom line.  If *flag* is ``True``, the window is scrolled up
    one line.  Note that in order to get the physical scrolling effect on the
    terminal, it is also necessary to call :meth:`idlok`.
 
@@ -1202,7 +1210,7 @@ the following methods and attributes:
 
 .. method:: window.syncok(flag)
 
-   If called with *flag* set to ``True``, then :meth:`syncup` is called automatically
+   If *flag* is ``True``, then :meth:`syncup` is called automatically
    whenever there is a change in the window.
 
 
@@ -1216,9 +1224,9 @@ the following methods and attributes:
 
    Set blocking or non-blocking read behavior for the window.  If *delay* is
    negative, blocking read is used (which will wait indefinitely for input).  If
-   *delay* is zero, then non-blocking read is used, and -1 will be returned by
-   :meth:`getch` if no input is waiting.  If *delay* is positive, then
-   :meth:`getch` will block for *delay* milliseconds, and return -1 if there is
+   *delay* is zero, then non-blocking read is used, and :meth:`getch` will
+   return ``-1`` if no input is waiting.  If *delay* is positive, then
+   :meth:`getch` will block for *delay* milliseconds, and return ``-1`` if there is
    still no input at the end of that time.
 
 
@@ -1226,7 +1234,7 @@ the following methods and attributes:
 
    Pretend *count* lines have been changed, starting with line *start*.  If
    *changed* is supplied, it specifies whether the affected lines are marked as
-   having been changed (*changed*\ =1) or unchanged (*changed*\ =0).
+   having been changed (*changed*\ ``=True``) or unchanged (*changed*\ ``=False``).
 
 
 .. method:: window.touchwin()
@@ -1268,7 +1276,7 @@ The :mod:`curses` module defines the following data members:
 
 .. data:: version
 
-   A string representing the current version of the module.  Also available as
+   A bytes object representing the current version of the module.  Also available as
    :const:`__version__`.
 
 Some constants are available to specify character cell attributes.


From webhook-mailer at python.org  Thu Oct  5 03:01:59 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Thu, 05 Oct 2017 07:01:59 -0000
Subject: [Python-checkins] closes bpo-31596: Add an interface for
 pthread_getcpuclockid(3) (#3756)
Message-ID: <mailman.40.1507186920.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/e14679c78464d1e0e16786c2a0e9bcebe49e842b
commit: e14679c78464d1e0e16786c2a0e9bcebe49e842b
branch: master
author: pdox <pdox at alum.mit.edu>
committer: Benjamin Peterson <benjamin at python.org>
date: 2017-10-05T00:01:56-07:00
summary:

closes bpo-31596: Add an interface for pthread_getcpuclockid(3) (#3756)

files:
A Misc/NEWS.d/next/Library/2017-09-26-11-38-52.bpo-31596.50Eyel.rst
M Doc/library/time.rst
M Lib/test/test_time.py
M Modules/timemodule.c
M configure
M configure.ac
M pyconfig.h.in

diff --git a/Doc/library/time.rst b/Doc/library/time.rst
index ef0e69a5e8c..179762ed1c8 100644
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -162,6 +162,22 @@ The module defines the following functions and data items:
       :func:`perf_counter` or :func:`process_time` instead, depending on your
       requirements, to have a well defined behaviour.
 
+.. function:: pthread_getcpuclockid(thread_id)
+
+   Return the *clk_id* of the thread-specific CPU-time clock for the specified *thread_id*.
+
+   Use :func:`threading.get_ident` or the :attr:`~threading.Thread.ident`
+   attribute of :class:`threading.Thread` objects to get a suitable value
+   for *thread_id*.
+
+   .. warning::
+      Passing an invalid or expired *thread_id* may result in
+      undefined behavior, such as segmentation fault.
+
+   Availability: Unix (see the man page for :manpage:`pthread_getcpuclockid(3)` for
+   further information)
+
+   .. versionadded:: 3.7
 
 .. function:: clock_getres(clk_id)
 
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index b2aedc3be50..1456748ed8e 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -7,6 +7,7 @@
 import sys
 import sysconfig
 import time
+import threading
 import unittest
 try:
     import _testcapi
@@ -80,6 +81,25 @@ def test_clock_monotonic(self):
         b = time.clock_gettime(time.CLOCK_MONOTONIC)
         self.assertLessEqual(a, b)
 
+    @unittest.skipUnless(hasattr(time, 'pthread_getcpuclockid'),
+                         'need time.pthread_getcpuclockid()')
+    @unittest.skipUnless(hasattr(time, 'clock_gettime'),
+                         'need time.clock_gettime()')
+    @unittest.skipUnless(hasattr(time, 'CLOCK_THREAD_CPUTIME_ID'),
+                         'need time.CLOCK_THREAD_CPUTIME_ID')
+    def test_pthread_getcpuclockid(self):
+        clk_id = time.pthread_getcpuclockid(threading.get_ident())
+        self.assertTrue(type(clk_id) is int)
+        self.assertNotEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID)
+        # This should suffice to show that both calls are measuring the same clock.
+        t1 = time.clock_gettime(clk_id)
+        t2 = time.clock_gettime(time.CLOCK_THREAD_CPUTIME_ID)
+        t3 = time.clock_gettime(clk_id)
+        t4 = time.clock_gettime(time.CLOCK_THREAD_CPUTIME_ID)
+        self.assertLessEqual(t1, t2)
+        self.assertLessEqual(t2, t3)
+        self.assertLessEqual(t3, t4)
+
     @unittest.skipUnless(hasattr(time, 'clock_getres'),
                          'need time.clock_getres()')
     def test_clock_getres(self):
diff --git a/Misc/NEWS.d/next/Library/2017-09-26-11-38-52.bpo-31596.50Eyel.rst b/Misc/NEWS.d/next/Library/2017-09-26-11-38-52.bpo-31596.50Eyel.rst
new file mode 100644
index 00000000000..85b1e1a8cad
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-09-26-11-38-52.bpo-31596.50Eyel.rst
@@ -0,0 +1 @@
+Added pthread_getcpuclockid() to the time module
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 36a95bbcedd..34e057d9d74 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -20,6 +20,10 @@
 #include <io.h>
 #endif
 
+#if defined(HAVE_PTHREAD_H)
+#  include <pthread.h>
+#endif
+
 #if defined(__WATCOMC__) && !defined(__QNX__)
 #include <i86.h>
 #else
@@ -221,6 +225,31 @@ PyDoc_STRVAR(clock_getres_doc,
 Return the resolution (precision) of the specified clock clk_id.");
 #endif   /* HAVE_CLOCK_GETRES */
 
+#ifdef HAVE_PTHREAD_GETCPUCLOCKID
+static PyObject *
+time_pthread_getcpuclockid(PyObject *self, PyObject *args)
+{
+    unsigned long thread_id;
+    int err;
+    clockid_t clk_id;
+    if (!PyArg_ParseTuple(args, "k:pthread_getcpuclockid", &thread_id)) {
+        return NULL;
+    }
+    err = pthread_getcpuclockid((pthread_t)thread_id, &clk_id);
+    if (err) {
+        errno = err;
+        PyErr_SetFromErrno(PyExc_OSError);
+        return NULL;
+    }
+    return PyLong_FromLong(clk_id);
+}
+
+PyDoc_STRVAR(pthread_getcpuclockid_doc,
+"pthread_getcpuclockid(thread_id) -> int\n\
+\n\
+Return the clk_id of a thread's CPU time clock.");
+#endif /* HAVE_PTHREAD_GETCPUCLOCKID */
+
 static PyObject *
 time_sleep(PyObject *self, PyObject *obj)
 {
@@ -1288,6 +1317,9 @@ static PyMethodDef time_methods[] = {
 #ifdef HAVE_CLOCK_GETRES
     {"clock_getres",    time_clock_getres, METH_VARARGS, clock_getres_doc},
 #endif
+#ifdef HAVE_PTHREAD_GETCPUCLOCKID
+    {"pthread_getcpuclockid", time_pthread_getcpuclockid, METH_VARARGS, pthread_getcpuclockid_doc},
+#endif
     {"sleep",           time_sleep, METH_O, sleep_doc},
     {"gmtime",          time_gmtime, METH_VARARGS, gmtime_doc},
     {"localtime",       time_localtime, METH_VARARGS, localtime_doc},
diff --git a/configure b/configure
index 8a763ef6e49..2d1bed22476 100755
--- a/configure
+++ b/configure
@@ -10483,6 +10483,17 @@ _ACEOF
 fi
 done
 
+      for ac_func in pthread_getcpuclockid
+do :
+  ac_fn_c_check_func "$LINENO" "pthread_getcpuclockid" "ac_cv_func_pthread_getcpuclockid"
+if test "x$ac_cv_func_pthread_getcpuclockid" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PTHREAD_GETCPUCLOCKID 1
+_ACEOF
+
+fi
+done
+
 fi
 
 
diff --git a/configure.ac b/configure.ac
index 41bd9effbfd..b562fe405a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3025,6 +3025,7 @@ if test "$posix_threads" = "yes"; then
             ;;
         esac])
       AC_CHECK_FUNCS(pthread_atfork)
+      AC_CHECK_FUNCS(pthread_getcpuclockid)
 fi
 
 
diff --git a/pyconfig.h.in b/pyconfig.h.in
index d4feabeece3..637341afee3 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -694,6 +694,9 @@
 /* Defined for Solaris 2.6 bug in pthread header. */
 #undef HAVE_PTHREAD_DESTRUCTOR
 
+/* Define to 1 if you have the `pthread_getcpuclockid' function. */
+#undef HAVE_PTHREAD_GETCPUCLOCKID
+
 /* Define to 1 if you have the <pthread.h> header file. */
 #undef HAVE_PTHREAD_H
 


From webhook-mailer at python.org  Thu Oct  5 03:09:04 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Thu, 05 Oct 2017 07:09:04 -0000
Subject: [Python-checkins] remove tabs from getcompiler.c (#3892)
Message-ID: <mailman.41.1507187346.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/a8ed11742b4c2115597977ce04fa8e043d9e0792
commit: a8ed11742b4c2115597977ce04fa8e043d9e0792
branch: master
author: Benjamin Peterson <benjamin at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-05T00:09:01-07:00
summary:

remove tabs from getcompiler.c (#3892)

files:
M Python/getcompiler.c

diff --git a/Python/getcompiler.c b/Python/getcompiler.c
index 0f441deb84d..9d9c33ac2de 100644
--- a/Python/getcompiler.c
+++ b/Python/getcompiler.c
@@ -24,5 +24,5 @@
 const char *
 Py_GetCompiler(void)
 {
-	return COMPILER;
+    return COMPILER;
 }


From webhook-mailer at python.org  Thu Oct  5 03:10:11 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Thu, 05 Oct 2017 07:10:11 -0000
Subject: [Python-checkins] closes bpo-27494: Fix 2to3 handling of trailing
 comma after a generator expression (#3771)
Message-ID: <mailman.42.1507187412.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/af810b35b494ef1d255d4bf340b92a9dad446995
commit: af810b35b494ef1d255d4bf340b92a9dad446995
branch: master
author: Jakub Stasiak <jakub at stasiak.at>
committer: Benjamin Peterson <benjamin at python.org>
date: 2017-10-05T00:10:09-07:00
summary:

closes bpo-27494: Fix 2to3 handling of trailing comma after a generator expression (#3771)

files:
A Misc/NEWS.d/next/Library/2017-09-26-01-43-17.bpo-27494.37QnaT.rst
M Lib/lib2to3/Grammar.txt
M Lib/lib2to3/fixer_util.py
M Lib/lib2to3/fixes/fix_dict.py
M Lib/lib2to3/fixes/fix_paren.py
M Lib/lib2to3/fixes/fix_xrange.py
M Lib/lib2to3/tests/test_parser.py

diff --git a/Lib/lib2to3/Grammar.txt b/Lib/lib2to3/Grammar.txt
index 2abd5ee65b5..ded032522ba 100644
--- a/Lib/lib2to3/Grammar.txt
+++ b/Lib/lib2to3/Grammar.txt
@@ -130,8 +130,8 @@ atom: ('(' [yield_expr|testlist_gexp] ')' |
        '{' [dictsetmaker] '}' |
        '`' testlist1 '`' |
        NAME | NUMBER | STRING+ | '.' '.' '.')
-listmaker: (test|star_expr) ( comp_for | (',' (test|star_expr))* [','] )
-testlist_gexp: (test|star_expr) ( comp_for | (',' (test|star_expr))* [','] )
+listmaker: (test|star_expr) ( old_comp_for | (',' (test|star_expr))* [','] )
+testlist_gexp: (test|star_expr) ( old_comp_for | (',' (test|star_expr))* [','] )
 lambdef: 'lambda' [varargslist] ':' test
 trailer: '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME
 subscriptlist: subscript (',' subscript)* [',']
@@ -161,9 +161,28 @@ argument: ( test [comp_for] |
 	    star_expr )
 
 comp_iter: comp_for | comp_if
-comp_for: [ASYNC] 'for' exprlist 'in' testlist_safe [comp_iter]
+comp_for: [ASYNC] 'for' exprlist 'in' or_test [comp_iter]
 comp_if: 'if' old_test [comp_iter]
 
+# As noted above, testlist_safe extends the syntax allowed in list
+# comprehensions and generators. We can't use it indiscriminately in all
+# derivations using a comp_for-like pattern because the testlist_safe derivation
+# contains comma which clashes with trailing comma in arglist.
+#
+# This was an issue because the parser would not follow the correct derivation
+# when parsing syntactically valid Python code. Since testlist_safe was created
+# specifically to handle list comprehensions and generator expressions enclosed
+# with parentheses, it's safe to only use it in those. That avoids the issue; we
+# can parse code like set(x for x in [],).
+#
+# The syntax supported by this set of rules is not a valid Python 3 syntax,
+# hence the prefix "old".
+#
+# See https://bugs.python.org/issue27494
+old_comp_iter: old_comp_for | old_comp_if
+old_comp_for: [ASYNC] 'for' exprlist 'in' testlist_safe [old_comp_iter]
+old_comp_if: 'if' old_test [old_comp_iter]
+
 testlist1: test (',' test)*
 
 # not used in grammar, but may appear in "node" passed from Parser to Compiler
diff --git a/Lib/lib2to3/fixer_util.py b/Lib/lib2to3/fixer_util.py
index babe6cb3f66..2f9b1c2e766 100644
--- a/Lib/lib2to3/fixer_util.py
+++ b/Lib/lib2to3/fixer_util.py
@@ -101,8 +101,8 @@ def ListComp(xp, fp, it, test=None):
         test.prefix = " "
         if_leaf = Leaf(token.NAME, "if")
         if_leaf.prefix = " "
-        inner_args.append(Node(syms.comp_if, [if_leaf, test]))
-    inner = Node(syms.listmaker, [xp, Node(syms.comp_for, inner_args)])
+        inner_args.append(Node(syms.old_comp_if, [if_leaf, test]))
+    inner = Node(syms.listmaker, [xp, Node(syms.old_comp_for, inner_args)])
     return Node(syms.atom,
                        [Leaf(token.LBRACE, "["),
                         inner,
@@ -208,7 +208,7 @@ def attr_chain(obj, attr):
         next = getattr(next, attr)
 
 p0 = """for_stmt< 'for' any 'in' node=any ':' any* >
-        | comp_for< 'for' any 'in' node=any any* >
+        | old_comp_for< 'for' any 'in' node=any any* >
      """
 p1 = """
 power<
diff --git a/Lib/lib2to3/fixes/fix_dict.py b/Lib/lib2to3/fixes/fix_dict.py
index d3655c9f1b2..55be553baac 100644
--- a/Lib/lib2to3/fixes/fix_dict.py
+++ b/Lib/lib2to3/fixes/fix_dict.py
@@ -83,7 +83,7 @@ def transform(self, node, results):
     p1 = patcomp.compile_pattern(P1)
 
     P2 = """for_stmt< 'for' any 'in' node=any ':' any* >
-            | comp_for< 'for' any 'in' node=any any* >
+            | old_comp_for< 'for' any 'in' node=any any* >
          """
     p2 = patcomp.compile_pattern(P2)
 
diff --git a/Lib/lib2to3/fixes/fix_paren.py b/Lib/lib2to3/fixes/fix_paren.py
index b205aa7e1e9..de49eef157d 100644
--- a/Lib/lib2to3/fixes/fix_paren.py
+++ b/Lib/lib2to3/fixes/fix_paren.py
@@ -15,7 +15,7 @@ class FixParen(fixer_base.BaseFix):
     PATTERN = """
         atom< ('[' | '(')
             (listmaker< any
-                comp_for<
+                old_comp_for<
                     'for' NAME 'in'
                     target=testlist_safe< any (',' any)+ [',']
                      >
@@ -24,7 +24,7 @@ class FixParen(fixer_base.BaseFix):
             >
             |
             testlist_gexp< any
-                comp_for<
+                old_comp_for<
                     'for' NAME 'in'
                     target=testlist_safe< any (',' any)+ [',']
                      >
diff --git a/Lib/lib2to3/fixes/fix_xrange.py b/Lib/lib2to3/fixes/fix_xrange.py
index 1e491e166a3..f5f06f35435 100644
--- a/Lib/lib2to3/fixes/fix_xrange.py
+++ b/Lib/lib2to3/fixes/fix_xrange.py
@@ -55,7 +55,7 @@ def transform_range(self, node, results):
     p1 = patcomp.compile_pattern(P1)
 
     P2 = """for_stmt< 'for' any 'in' node=any ':' any* >
-            | comp_for< 'for' any 'in' node=any any* >
+            | old_comp_for< 'for' any 'in' node=any any* >
             | comparison< any 'in' node=any any*>
          """
     p2 = patcomp.compile_pattern(P2)
diff --git a/Lib/lib2to3/tests/test_parser.py b/Lib/lib2to3/tests/test_parser.py
index 3f7ab9714e3..2efcb80c2f9 100644
--- a/Lib/lib2to3/tests/test_parser.py
+++ b/Lib/lib2to3/tests/test_parser.py
@@ -459,6 +459,13 @@ def test_multiline_str_literals(self):
         self.validate(s)
 
 
+class TestGeneratorExpressions(GrammarTest):
+
+    def test_trailing_comma_after_generator_expression_argument_works(self):
+        # BPO issue 27494
+        self.validate("set(x for x in [],)")
+
+
 def diff(fn, result):
     try:
         with open('@', 'w') as f:
diff --git a/Misc/NEWS.d/next/Library/2017-09-26-01-43-17.bpo-27494.37QnaT.rst b/Misc/NEWS.d/next/Library/2017-09-26-01-43-17.bpo-27494.37QnaT.rst
new file mode 100644
index 00000000000..5b5362a41c5
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-09-26-01-43-17.bpo-27494.37QnaT.rst
@@ -0,0 +1,2 @@
+Make 2to3 accept a trailing comma in generator expressions. For example, ``set(x
+for x in [],)`` is now allowed.


From webhook-mailer at python.org  Thu Oct  5 04:19:32 2017
From: webhook-mailer at python.org (INADA Naoki)
Date: Thu, 05 Oct 2017 08:19:32 -0000
Subject: [Python-checkins] bpo-31671: re: Convert RegexFlag to int before
 compile (GH-3862)
Message-ID: <mailman.43.1507191574.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/c1c47c166b1012d34f2c6e111ee9ccb5c4d12de7
commit: c1c47c166b1012d34f2c6e111ee9ccb5c4d12de7
branch: master
author: INADA Naoki <methane at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-10-05T17:19:26+09:00
summary:

bpo-31671: re: Convert RegexFlag to int before compile (GH-3862)

sre_compile does bit test (e.g. `flags & SRE_FLAG_IGNORECASE`) in loop.
`IntFlag.__and__` and `IntFlag.__new__` made it slower.

So this commit convert it to normal int before passing flags to `sre_compile()`.

files:
A Misc/NEWS.d/next/Library/2017-10-04-21-28-44.bpo-31671.E-zfc9.rst
M Doc/whatsnew/3.7.rst
M Lib/re.py

diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index 845ed643f97..19b766fd2ff 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -326,6 +326,11 @@ Optimizations
   expressions <re>`.  Searching some patterns can now be up to 20 times faster.
   (Contributed by Serhiy Storchaka in :issue:`30285`.)
 
+* :func:`re.compile` now converts ``flags`` parameter to int object if
+  it is ``RegexFlag``.  It is now as fast as Python 3.5, and faster than
+  Python 3.6 about 10% depending on the pattern.
+  (Contributed by INADA Naoki in :issue:`31671`.)
+
 * :meth:`selectors.EpollSelector.modify`, :meth:`selectors.PollSelector.modify`
   and :meth:`selectors.DevpollSelector.modify` may be around 10% faster under
   heavy loads. (Contributed by Giampaolo Rodola' in :issue:`30014`)
diff --git a/Lib/re.py b/Lib/re.py
index d772979f91e..abbf8d6e290 100644
--- a/Lib/re.py
+++ b/Lib/re.py
@@ -275,6 +275,8 @@ def escape(pattern):
 _MAXCACHE = 512
 def _compile(pattern, flags):
     # internal: compile pattern
+    if isinstance(flags, RegexFlag):
+        flags = flags.value
     try:
         return _cache[type(pattern), pattern, flags]
     except KeyError:
@@ -331,6 +333,8 @@ def _pickle(p):
 class Scanner:
     def __init__(self, lexicon, flags=0):
         from sre_constants import BRANCH, SUBPATTERN
+        if isinstance(flags, RegexFlag):
+            flags = flags.value
         self.lexicon = lexicon
         # combine phrases into a compound pattern
         p = []
diff --git a/Misc/NEWS.d/next/Library/2017-10-04-21-28-44.bpo-31671.E-zfc9.rst b/Misc/NEWS.d/next/Library/2017-10-04-21-28-44.bpo-31671.E-zfc9.rst
new file mode 100644
index 00000000000..b84dedd63ed
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-04-21-28-44.bpo-31671.E-zfc9.rst
@@ -0,0 +1,2 @@
+Now ``re.compile()`` converts passed RegexFlag to normal int object before
+compiling. bm_regex_compile benchmark shows 14% performance improvements.


From solipsis at pitrou.net  Thu Oct  5 05:07:41 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 05 Oct 2017 09:07:41 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=6
Message-ID: <20171005090741.47289.8BFB50CC09BCB1C5@psf.io>

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

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 [2, 0, 0] memory blocks, sum=2


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

From webhook-mailer at python.org  Thu Oct  5 09:32:56 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 05 Oct 2017 13:32:56 -0000
Subject: [Python-checkins] bpo-31178: Mock os.waitpid() in test_subprocess
 (#3896)
Message-ID: <mailman.44.1507210377.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/11045c9d8a21dd9bd182a3939189db02815f9783
commit: 11045c9d8a21dd9bd182a3939189db02815f9783
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-05T06:32:53-07:00
summary:

bpo-31178: Mock os.waitpid() in test_subprocess (#3896)

Fix test_exception_errpipe_bad_data() and
test_exception_errpipe_normal() of test_subprocess: mock os.waitpid()
to avoid calling the real os.waitpid(0, 0) which is an unexpected
side effect of the test.

files:
M Lib/test/test_subprocess.py

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 00dc37bc2c7..3ba5c028517 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1559,8 +1559,10 @@ def proper_error(*args):
 
         fork_exec.side_effect = proper_error
 
-        with self.assertRaises(IsADirectoryError):
-            self.PopenNoDestructor(["non_existent_command"])
+        with mock.patch("subprocess.os.waitpid",
+                        side_effect=ChildProcessError):
+            with self.assertRaises(IsADirectoryError):
+                self.PopenNoDestructor(["non_existent_command"])
 
     @mock.patch("subprocess._posixsubprocess.fork_exec")
     def test_exception_errpipe_bad_data(self, fork_exec):
@@ -1577,8 +1579,10 @@ def bad_error(*args):
 
         fork_exec.side_effect = bad_error
 
-        with self.assertRaises(subprocess.SubprocessError) as e:
-            self.PopenNoDestructor(["non_existent_command"])
+        with mock.patch("subprocess.os.waitpid",
+                        side_effect=ChildProcessError):
+            with self.assertRaises(subprocess.SubprocessError) as e:
+                self.PopenNoDestructor(["non_existent_command"])
 
         self.assertIn(repr(error_data), str(e.exception))
 


From webhook-mailer at python.org  Thu Oct  5 10:11:04 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 05 Oct 2017 14:11:04 -0000
Subject: [Python-checkins] [3.6] bpo-31178: Mock os.waitpid() in
 test_subprocess (GH-3896) (#3897)
Message-ID: <mailman.45.1507212665.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/fae0512e58619231a566bf77aa21148440b0ec8d
commit: fae0512e58619231a566bf77aa21148440b0ec8d
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-10-05T07:10:59-07:00
summary:

[3.6] bpo-31178: Mock os.waitpid() in test_subprocess (GH-3896) (#3897)

Fix test_exception_errpipe_bad_data() and
test_exception_errpipe_normal() of test_subprocess: mock os.waitpid()
to avoid calling the real os.waitpid(0, 0) which is an unexpected
side effect of the test.
(cherry picked from commit 11045c9d8a21dd9bd182a3939189db02815f9783)

files:
M Lib/test/test_subprocess.py

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 391d08cd9c3..5016513decd 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1568,8 +1568,10 @@ def proper_error(*args):
 
         fork_exec.side_effect = proper_error
 
-        with self.assertRaises(IsADirectoryError):
-            self.PopenNoDestructor(["non_existent_command"])
+        with mock.patch("subprocess.os.waitpid",
+                        side_effect=ChildProcessError):
+            with self.assertRaises(IsADirectoryError):
+                self.PopenNoDestructor(["non_existent_command"])
 
     @mock.patch("subprocess._posixsubprocess.fork_exec")
     def test_exception_errpipe_bad_data(self, fork_exec):
@@ -1586,8 +1588,10 @@ def bad_error(*args):
 
         fork_exec.side_effect = bad_error
 
-        with self.assertRaises(subprocess.SubprocessError) as e:
-            self.PopenNoDestructor(["non_existent_command"])
+        with mock.patch("subprocess.os.waitpid",
+                        side_effect=ChildProcessError):
+            with self.assertRaises(subprocess.SubprocessError) as e:
+                self.PopenNoDestructor(["non_existent_command"])
 
         self.assertIn(repr(error_data), str(e.exception))
 


From webhook-mailer at python.org  Thu Oct  5 11:41:12 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Thu, 05 Oct 2017 15:41:12 -0000
Subject: [Python-checkins] [3.6] remove tabs from getcompiler.c (GH-3892)
 (#3893)
Message-ID: <mailman.46.1507218073.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/8aafd5fd7961df1068325d41cc0acd72e7009a0f
commit: 8aafd5fd7961df1068325d41cc0acd72e7009a0f
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Benjamin Peterson <benjamin at python.org>
date: 2017-10-05T08:41:06-07:00
summary:

[3.6] remove tabs from getcompiler.c (GH-3892) (#3893)

(cherry picked from commit a8ed11742b4c2115597977ce04fa8e043d9e0792)

files:
M Python/getcompiler.c

diff --git a/Python/getcompiler.c b/Python/getcompiler.c
index 0f441deb84d..9d9c33ac2de 100644
--- a/Python/getcompiler.c
+++ b/Python/getcompiler.c
@@ -24,5 +24,5 @@
 const char *
 Py_GetCompiler(void)
 {
-	return COMPILER;
+    return COMPILER;
 }


From webhook-mailer at python.org  Thu Oct  5 11:41:34 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Thu, 05 Oct 2017 15:41:34 -0000
Subject: [Python-checkins] [2.7] remove tabs from getcompiler.c (GH-3892)
 (#3894)
Message-ID: <mailman.47.1507218094.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/2fb8e9385944276884c2a2dc5d6275a04e04c879
commit: 2fb8e9385944276884c2a2dc5d6275a04e04c879
branch: 2.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Benjamin Peterson <benjamin at python.org>
date: 2017-10-05T08:41:31-07:00
summary:

[2.7] remove tabs from getcompiler.c (GH-3892) (#3894)

(cherry picked from commit a8ed11742b4c2115597977ce04fa8e043d9e0792)

files:
M Python/getcompiler.c

diff --git a/Python/getcompiler.c b/Python/getcompiler.c
index 0f441deb84d..9d9c33ac2de 100644
--- a/Python/getcompiler.c
+++ b/Python/getcompiler.c
@@ -24,5 +24,5 @@
 const char *
 Py_GetCompiler(void)
 {
-	return COMPILER;
+    return COMPILER;
 }


From webhook-mailer at python.org  Thu Oct  5 12:04:41 2017
From: webhook-mailer at python.org (Yury Selivanov)
Date: Thu, 05 Oct 2017 16:04:41 -0000
Subject: [Python-checkins] bpo-31556: asyncio.wait_for can cancel futures
 faster with timeout <= 0 (#3703)
Message-ID: <mailman.48.1507219483.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/4d071897880b7e84e1a217ebe19971c118316970
commit: 4d071897880b7e84e1a217ebe19971c118316970
branch: master
author: Victor K <hellysmile at gmail.com>
committer: Yury Selivanov <yury at magic.io>
date: 2017-10-05T12:04:39-04:00
summary:

bpo-31556: asyncio.wait_for can cancel futures faster with timeout <= 0 (#3703)

files:
A Misc/NEWS.d/next/Library/2017-09-22-23-48-49.bpo-31556.9J0u5H.rst
M Lib/asyncio/tasks.py
M Lib/test/test_asyncio/test_tasks.py

diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
index 575d205404a..52fef181cec 100644
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -334,6 +334,15 @@ def wait_for(fut, timeout, *, loop=None):
     if timeout is None:
         return (yield from fut)
 
+    if timeout <= 0:
+        fut = ensure_future(fut, loop=loop)
+
+        if fut.done():
+            return fut.result()
+
+        fut.cancel()
+        raise futures.TimeoutError()
+
     waiter = loop.create_future()
     timeout_handle = loop.call_later(timeout, _release_waiter, waiter)
     cb = functools.partial(_release_waiter, waiter)
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 36082ec7c6a..7ff56b560b6 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -661,6 +661,76 @@ def task():
         t.cancel()
         self.assertRaises(asyncio.CancelledError, loop.run_until_complete, t)
 
+    def test_wait_for_timeout_less_then_0_or_0_future_done(self):
+        def gen():
+            when = yield
+            self.assertAlmostEqual(0, when)
+
+        loop = self.new_test_loop(gen)
+
+        fut = self.new_future(loop)
+        fut.set_result('done')
+
+        ret = loop.run_until_complete(asyncio.wait_for(fut, 0, loop=loop))
+
+        self.assertEqual(ret, 'done')
+        self.assertTrue(fut.done())
+        self.assertAlmostEqual(0, loop.time())
+
+    def test_wait_for_timeout_less_then_0_or_0_coroutine_do_not_started(self):
+        def gen():
+            when = yield
+            self.assertAlmostEqual(0, when)
+
+        loop = self.new_test_loop(gen)
+
+        foo_started = False
+
+        @asyncio.coroutine
+        def foo():
+            nonlocal foo_started
+            foo_started = True
+
+        with self.assertRaises(asyncio.TimeoutError):
+            loop.run_until_complete(asyncio.wait_for(foo(), 0, loop=loop))
+
+        self.assertAlmostEqual(0, loop.time())
+        self.assertEqual(foo_started, False)
+
+    def test_wait_for_timeout_less_then_0_or_0(self):
+        def gen():
+            when = yield
+            self.assertAlmostEqual(0.2, when)
+            when = yield 0
+            self.assertAlmostEqual(0, when)
+
+        for timeout in [0, -1]:
+            with self.subTest(timeout=timeout):
+                loop = self.new_test_loop(gen)
+
+                foo_running = None
+
+                @asyncio.coroutine
+                def foo():
+                    nonlocal foo_running
+                    foo_running = True
+                    try:
+                        yield from asyncio.sleep(0.2, loop=loop)
+                    finally:
+                        foo_running = False
+                    return 'done'
+
+                fut = self.new_task(loop, foo())
+
+                with self.assertRaises(asyncio.TimeoutError):
+                    loop.run_until_complete(asyncio.wait_for(
+                        fut, timeout, loop=loop))
+                self.assertTrue(fut.done())
+                # it should have been cancelled due to the timeout
+                self.assertTrue(fut.cancelled())
+                self.assertAlmostEqual(0, loop.time())
+                self.assertEqual(foo_running, False)
+
     def test_wait_for(self):
 
         def gen():
diff --git a/Misc/NEWS.d/next/Library/2017-09-22-23-48-49.bpo-31556.9J0u5H.rst b/Misc/NEWS.d/next/Library/2017-09-22-23-48-49.bpo-31556.9J0u5H.rst
new file mode 100644
index 00000000000..2e6b0284696
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-09-22-23-48-49.bpo-31556.9J0u5H.rst
@@ -0,0 +1 @@
+Cancel asyncio.wait_for future faster if timeout <= 0


From webhook-mailer at python.org  Thu Oct  5 12:11:22 2017
From: webhook-mailer at python.org (Barry Warsaw)
Date: Thu, 05 Oct 2017 16:11:22 -0000
Subject: [Python-checkins] PEP 553 built-in breakpoint() function
 (bpo-31353) (#3355)
Message-ID: <mailman.49.1507219883.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/36c1d1f1e52ba54007cbecb42c5599e5ff62aa52
commit: 36c1d1f1e52ba54007cbecb42c5599e5ff62aa52
branch: master
author: Barry Warsaw <barry at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-05T12:11:18-04:00
summary:

PEP 553 built-in breakpoint() function (bpo-31353) (#3355)

Implement PEP 553, built-in breakpoint() with support from sys.breakpointhook(), along with documentation and tests.  Closes bpo-31353

files:
A Misc/NEWS.d/next/Core and Builtins/2017-09-05-14-19-02.bpo-31353.oGZUeJ.rst
M Doc/library/functions.rst
M Doc/library/sys.rst
M Doc/using/cmdline.rst
M Doc/whatsnew/3.7.rst
M Lib/test/test_builtin.py
M Lib/test/test_inspect.py
M Python/bltinmodule.c
M Python/sysmodule.c

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 015231d9cff..08093e61fe5 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -7,24 +7,24 @@ Built-in Functions
 The Python interpreter has a number of functions and types built into it that
 are always available.  They are listed here in alphabetical order.
 
-===================  =================  ==================  ================  ====================
-..                   ..                 Built-in Functions  ..                ..
-===================  =================  ==================  ================  ====================
-:func:`abs`          |func-dict|_       :func:`help`        :func:`min`       :func:`setattr`
-:func:`all`          :func:`dir`        :func:`hex`         :func:`next`      :func:`slice`
-:func:`any`          :func:`divmod`     :func:`id`          :func:`object`    :func:`sorted`
-:func:`ascii`        :func:`enumerate`  :func:`input`       :func:`oct`       :func:`staticmethod`
-:func:`bin`          :func:`eval`       :func:`int`         :func:`open`      |func-str|_
-:func:`bool`         :func:`exec`       :func:`isinstance`  :func:`ord`       :func:`sum`
-|func-bytearray|_    :func:`filter`     :func:`issubclass`  :func:`pow`       :func:`super`
-|func-bytes|_        :func:`float`      :func:`iter`        :func:`print`     |func-tuple|_
-:func:`callable`     :func:`format`     :func:`len`         :func:`property`  :func:`type`
-:func:`chr`          |func-frozenset|_  |func-list|_        |func-range|_     :func:`vars`
-:func:`classmethod`  :func:`getattr`    :func:`locals`      :func:`repr`      :func:`zip`
-:func:`compile`      :func:`globals`    :func:`map`         :func:`reversed`  :func:`__import__`
+===================  =================  ==================  ==================  ====================
+..                   ..                 Built-in Functions  ..                  ..
+===================  =================  ==================  ==================  ====================
+:func:`abs`          :func:`delattr`    :func:`hash`        |func-memoryview|_  |func-set|_
+:func:`all`          |func-dict|_       :func:`help`        :func:`min`         :func:`setattr`
+:func:`any`          :func:`dir`        :func:`hex`         :func:`next`        :func:`slice`
+:func:`ascii`        :func:`divmod`     :func:`id`          :func:`object`      :func:`sorted`
+:func:`bin`          :func:`enumerate`  :func:`input`       :func:`oct`         :func:`staticmethod`
+:func:`bool`         :func:`eval`       :func:`int`         :func:`open`        |func-str|_
+:func:`breakpoint`   :func:`exec`       :func:`isinstance`  :func:`ord`         :func:`sum`
+|func-bytearray|_    :func:`filter`     :func:`issubclass`  :func:`pow`         :func:`super`
+|func-bytes|_        :func:`float`      :func:`iter`        :func:`print`       |func-tuple|_
+:func:`callable`     :func:`format`     :func:`len`         :func:`property`    :func:`type`
+:func:`chr`          |func-frozenset|_  |func-list|_        |func-range|_       :func:`vars`
+:func:`classmethod`  :func:`getattr`    :func:`locals`      :func:`repr`        :func:`zip`
+:func:`compile`      :func:`globals`    :func:`map`         :func:`reversed`    :func:`__import__`
 :func:`complex`      :func:`hasattr`    :func:`max`         :func:`round`
-:func:`delattr`      :func:`hash`       |func-memoryview|_  |func-set|_
-===================  =================  ==================  ================  ====================
+===================  =================  ==================  ==================  ====================
 
 .. using :func:`dict` would create a link to another page, so local targets are
    used, with replacement texts to make the output in the table consistent
@@ -113,6 +113,20 @@ are always available.  They are listed here in alphabetical order.
    .. index:: pair: Boolean; type
 
 
+.. function:: breakpoint(*args, **kws)
+
+   This function drops you into the debugger at the call site.  Specifically,
+   it calls :func:`sys.breakpointhook`, passing ``args`` and ``kws`` straight
+   through.  By default, ``sys.breakpointhook()`` calls
+   :func:`pdb.set_trace()` expecting no arguments.  In this case, it is
+   purely a convenience function so you don't have to explicitly import
+   :mod:`pdb` or type as much code to enter the debugger.  However,
+   :func:`sys.breakpointhook` can be set to some other function and
+   :func:`breakpoint` will automatically call that, allowing you to drop into
+   the debugger of choice.
+
+   .. versionadded:: 3.7
+
 .. _func-bytearray:
 .. class:: bytearray([source[, encoding[, errors]]])
    :noindex:
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 85f31368c30..aa7bd477b05 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -109,6 +109,40 @@ always available.
    This function should be used for internal and specialized purposes only.
 
 
+.. function:: breakpointhook()
+
+   This hook function is called by built-in :func:`breakpoint`.  By default,
+   it drops you into the :mod:`pdb` debugger, but it can be set to any other
+   function so that you can choose which debugger gets used.
+
+   The signature of this function is dependent on what it calls.  For example,
+   the default binding (e.g. ``pdb.set_trace()``) expects no arguments, but
+   you might bind it to a function that expects additional arguments
+   (positional and/or keyword).  The built-in ``breakpoint()`` function passes
+   its ``*args`` and ``**kws`` straight through.  Whatever
+   ``breakpointhooks()`` returns is returned from ``breakpoint()``.
+
+   The default implementation first consults the environment variable
+   :envvar:`PYTHONBREAKPOINT`.  If that is set to ``"0"`` then this function
+   returns immediately; i.e. it is a no-op.  If the environment variable is
+   not set, or is set to the empty string, ``pdb.set_trace()`` is called.
+   Otherwise this variable should name a function to run, using Python's
+   dotted-import nomenclature, e.g. ``package.subpackage.module.function``.
+   In this case, ``package.subpackage.module`` would be imported and the
+   resulting module must have a callable named ``function()``.  This is run,
+   passing in ``*args`` and ``**kws``, and whatever ``function()`` returns,
+   ``sys.breakpointhook()`` returns to the built-in :func:`breakpoint`
+   function.
+
+   Note that if anything goes wrong while importing the callable named by
+   :envvar:`PYTHONBREAKPOINT`, a :exc:`RuntimeWarning` is reported and the
+   breakpoint is ignored.
+
+   Also note that if ``sys.breakpointhook()`` is overridden programmatically,
+   :envvar:`PYTHONBREAKPOINT` is *not* consulted.
+
+   .. versionadded:: 3.7
+
 .. function:: _debugmallocstats()
 
    Print low-level information to stderr about the state of CPython's memory
@@ -187,14 +221,19 @@ always available.
    customized by assigning another three-argument function to ``sys.excepthook``.
 
 
-.. data:: __displayhook__
+.. data:: __breakpointhook__
+          __displayhook__
           __excepthook__
 
-   These objects contain the original values of ``displayhook`` and ``excepthook``
-   at the start of the program.  They are saved so that ``displayhook`` and
-   ``excepthook`` can be restored in case they happen to get replaced with broken
+   These objects contain the original values of ``breakpointhook``,
+   ``displayhook``, and ``excepthook`` at the start of the program.  They are
+   saved so that ``breakpointhook``, ``displayhook`` and ``excepthook`` can be
+   restored in case they happen to get replaced with broken or alternative
    objects.
 
+   .. versionadded:: 3.7
+      __breakpointhook__
+
 
 .. function:: exc_info()
 
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 7b60a9b71fe..a8cdff641e4 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -502,6 +502,18 @@ conflict.
    :option:`-O` multiple times.
 
 
+.. envvar:: PYTHONBREAKPOINT
+
+   If this is set, it names a callable using dotted-path notation.  The module
+   containing the callable will be imported and then the callable will be run
+   by the default implementation of :func:`sys.breakpointhook` which itself is
+   called by built-in :func:`breakpoint`.  If not set, or set to the empty
+   string, it is equivalent to the value "pdb.set_trace".  Setting this to the
+   string "0" causes the default implementation of :func:`sys.breakpointhook`
+   to do nothing but return immediately.
+
+   .. versionadded:: 3.7
+
 .. envvar:: PYTHONDEBUG
 
    If this is set to a non-empty string it is equivalent to specifying the
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index 19b766fd2ff..3e8617ef2a1 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -107,6 +107,25 @@ locale remains active when the core interpreter is initialized.
     :pep:`538` -- Coercing the legacy C locale to a UTF-8 based locale
        PEP written and implemented by Nick Coghlan.
 
+.. _whatsnew37-pep553:
+
+PEP 553: Built-in breakpoint()
+------------------------------
+
+:pep:`553` describes a new built-in called ``breakpoint()`` which makes it
+easy and consistent to enter the Python debugger.  Built-in ``breakpoint()``
+calls ``sys.breakpointhook()``.  By default, this latter imports ``pdb`` and
+then calls ``pdb.set_trace()``, but by binding ``sys.breakpointhook()`` to the
+function of your choosing, ``breakpoint()`` can enter any debugger.  Or, the
+environment variable :envvar:`PYTHONBREAKPOINT` can be set to the callable of
+your debugger of choice.  Set ``PYTHONBREAKPOINT=0`` to completely disable
+built-in ``breakpoint()``.
+
+.. seealso::
+
+    :pep:`553` -- Built-in breakpoint()
+      PEP written and implemented by Barry Warsaw
+
 
 Other Language Changes
 ======================
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 87dcda7b434..0a61c054444 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -17,9 +17,12 @@
 import types
 import unittest
 import warnings
+from contextlib import ExitStack
 from operator import neg
-from test.support import TESTFN, unlink, check_warnings
+from test.support import (
+    EnvironmentVarGuard, TESTFN, check_warnings, swap_attr, unlink)
 from test.support.script_helper import assert_python_ok
+from unittest.mock import MagicMock, patch
 try:
     import pty, signal
 except ImportError:
@@ -1514,6 +1517,111 @@ def test_construct_singletons(self):
             self.assertRaises(TypeError, tp, 1, 2)
             self.assertRaises(TypeError, tp, a=1, b=2)
 
+
+class TestBreakpoint(unittest.TestCase):
+    def setUp(self):
+        # These tests require a clean slate environment.  For example, if the
+        # test suite is run with $PYTHONBREAKPOINT set to something else, it
+        # will mess up these tests.  Similarly for sys.breakpointhook.
+        # Cleaning the slate here means you can't use breakpoint() to debug
+        # these tests, but I think that's okay.  Just use pdb.set_trace() if
+        # you must.
+        self.resources = ExitStack()
+        self.addCleanup(self.resources.close)
+        self.env = self.resources.enter_context(EnvironmentVarGuard())
+        del self.env['PYTHONBREAKPOINT']
+        self.resources.enter_context(
+            swap_attr(sys, 'breakpointhook', sys.__breakpointhook__))
+
+    def test_breakpoint(self):
+        with patch('pdb.set_trace') as mock:
+            breakpoint()
+        mock.assert_called_once()
+
+    def test_breakpoint_with_breakpointhook_set(self):
+        my_breakpointhook = MagicMock()
+        sys.breakpointhook = my_breakpointhook
+        breakpoint()
+        my_breakpointhook.assert_called_once_with()
+
+    def test_breakpoint_with_breakpointhook_reset(self):
+        my_breakpointhook = MagicMock()
+        sys.breakpointhook = my_breakpointhook
+        breakpoint()
+        my_breakpointhook.assert_called_once_with()
+        # Reset the hook and it will not be called again.
+        sys.breakpointhook = sys.__breakpointhook__
+        with patch('pdb.set_trace') as mock:
+            breakpoint()
+            mock.assert_called_once_with()
+        my_breakpointhook.assert_called_once_with()
+
+    def test_breakpoint_with_args_and_keywords(self):
+        my_breakpointhook = MagicMock()
+        sys.breakpointhook = my_breakpointhook
+        breakpoint(1, 2, 3, four=4, five=5)
+        my_breakpointhook.assert_called_once_with(1, 2, 3, four=4, five=5)
+
+    def test_breakpoint_with_passthru_error(self):
+        def my_breakpointhook():
+            pass
+        sys.breakpointhook = my_breakpointhook
+        self.assertRaises(TypeError, breakpoint, 1, 2, 3, four=4, five=5)
+
+    @unittest.skipIf(sys.flags.ignore_environment, '-E was given')
+    def test_envar_good_path_builtin(self):
+        self.env['PYTHONBREAKPOINT'] = 'int'
+        with patch('builtins.int') as mock:
+            breakpoint('7')
+            mock.assert_called_once_with('7')
+
+    @unittest.skipIf(sys.flags.ignore_environment, '-E was given')
+    def test_envar_good_path_other(self):
+        self.env['PYTHONBREAKPOINT'] = 'sys.exit'
+        with patch('sys.exit') as mock:
+            breakpoint()
+            mock.assert_called_once_with()
+
+    @unittest.skipIf(sys.flags.ignore_environment, '-E was given')
+    def test_envar_good_path_noop_0(self):
+        self.env['PYTHONBREAKPOINT'] = '0'
+        with patch('pdb.set_trace') as mock:
+            breakpoint()
+            mock.assert_not_called()
+
+    def test_envar_good_path_empty_string(self):
+        # PYTHONBREAKPOINT='' is the same as it not being set.
+        self.env['PYTHONBREAKPOINT'] = ''
+        with patch('pdb.set_trace') as mock:
+            breakpoint()
+            mock.assert_called_once_with()
+
+    @unittest.skipIf(sys.flags.ignore_environment, '-E was given')
+    def test_envar_unimportable(self):
+        for envar in (
+                '.', '..', '.foo', 'foo.', '.int', 'int.'
+                'nosuchbuiltin',
+                'nosuchmodule.nosuchcallable',
+                ):
+            with self.subTest(envar=envar):
+                self.env['PYTHONBREAKPOINT'] = envar
+                mock = self.resources.enter_context(patch('pdb.set_trace'))
+                w = self.resources.enter_context(check_warnings(quiet=True))
+                breakpoint()
+                self.assertEqual(
+                    str(w.message),
+                    f'Ignoring unimportable $PYTHONBREAKPOINT: "{envar}"')
+                self.assertEqual(w.category, RuntimeWarning)
+                mock.assert_not_called()
+
+    def test_envar_ignored_when_hook_is_set(self):
+        self.env['PYTHONBREAKPOINT'] = 'sys.exit'
+        with patch('sys.exit') as mock:
+            sys.breakpointhook = int
+            breakpoint()
+            mock.assert_not_called()
+
+
 @unittest.skipUnless(pty, "the pty and signal modules must be available")
 class PtyTests(unittest.TestCase):
     """Tests that use a pseudo terminal to guarantee stdin and stdout are
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 7cc1e78f787..819fcc58537 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -3523,7 +3523,8 @@ def test_builtins_have_signatures(self):
         needs_semantic_update = {"round"}
         no_signature |= needs_semantic_update
         # These need *args support in Argument Clinic
-        needs_varargs = {"min", "max", "print", "__build_class__"}
+        needs_varargs = {"breakpoint", "min", "max", "print",
+                         "__build_class__"}
         no_signature |= needs_varargs
         # These simply weren't covered in the initial AC conversion
         # for builtin callables
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-05-14-19-02.bpo-31353.oGZUeJ.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-05-14-19-02.bpo-31353.oGZUeJ.rst
new file mode 100644
index 00000000000..55f81cde8a5
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-09-05-14-19-02.bpo-31353.oGZUeJ.rst	
@@ -0,0 +1,5 @@
+:pep:`553` - Add a new built-in called ``breakpoint()`` which calls
+``sys.breakpointhook()``.  By default this imports ``pdb`` and calls
+``pdb.set_trace()``, but users may override ``sys.breakpointhook()`` to call
+whatever debugger they want.  The original value of the hook is saved in
+``sys.__breakpointhook__``.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 2269fe21657..6215a638c94 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -422,6 +422,28 @@ builtin_callable(PyObject *module, PyObject *obj)
     return PyBool_FromLong((long)PyCallable_Check(obj));
 }
 
+static PyObject *
+builtin_breakpoint(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *keywords)
+{
+    PyObject *hook = PySys_GetObject("breakpointhook");
+
+    if (hook == NULL) {
+        PyErr_SetString(PyExc_RuntimeError, "lost sys.breakpointhook");
+        return NULL;
+    }
+    Py_INCREF(hook);
+    PyObject *retval = _PyObject_FastCallKeywords(hook, args, nargs, keywords);
+    Py_DECREF(hook);
+    return retval;
+}
+
+PyDoc_STRVAR(breakpoint_doc,
+"breakpoint(*args, **kws)\n\
+\n\
+Call sys.breakpointhook(*args, **kws).  sys.breakpointhook() must accept\n\
+whatever arguments are passed.\n\
+\n\
+By default, this drops you into the pdb debugger.");
 
 typedef struct {
     PyObject_HEAD
@@ -2627,6 +2649,7 @@ static PyMethodDef builtin_methods[] = {
     BUILTIN_ANY_METHODDEF
     BUILTIN_ASCII_METHODDEF
     BUILTIN_BIN_METHODDEF
+    {"breakpoint",      (PyCFunction)builtin_breakpoint, METH_FASTCALL | METH_KEYWORDS, breakpoint_doc},
     BUILTIN_CALLABLE_METHODDEF
     BUILTIN_CHR_METHODDEF
     BUILTIN_COMPILE_METHODDEF
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 6d2cc96b5eb..e38a200c005 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -96,6 +96,81 @@ PySys_SetObject(const char *name, PyObject *v)
         return PyDict_SetItemString(sd, name, v);
 }
 
+static PyObject *
+sys_breakpointhook(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *keywords)
+{
+    assert(!PyErr_Occurred());
+    char *envar = Py_GETENV("PYTHONBREAKPOINT");
+
+    if (envar == NULL || strlen(envar) == 0) {
+        envar = "pdb.set_trace";
+    }
+    else if (!strcmp(envar, "0")) {
+        /* The breakpoint is explicitly no-op'd. */
+        Py_RETURN_NONE;
+    }
+    char *last_dot = strrchr(envar, '.');
+    char *attrname = NULL;
+    PyObject *modulepath = NULL;
+
+    if (last_dot == NULL) {
+        /* The breakpoint is a built-in, e.g. PYTHONBREAKPOINT=int */
+        modulepath = PyUnicode_FromString("builtins");
+        attrname = envar;
+    }
+    else {
+        /* Split on the last dot; */
+        modulepath = PyUnicode_FromStringAndSize(envar, last_dot - envar);
+        attrname = last_dot + 1;
+    }
+    if (modulepath == NULL) {
+        return NULL;
+    }
+
+    PyObject *fromlist = Py_BuildValue("(s)", attrname);
+    if (fromlist == NULL) {
+        Py_DECREF(modulepath);
+        return NULL;
+    }
+    PyObject *module = PyImport_ImportModuleLevelObject(
+        modulepath, NULL, NULL, fromlist, 0);
+    Py_DECREF(modulepath);
+    Py_DECREF(fromlist);
+
+    if (module == NULL) {
+        goto error;
+    }
+
+    PyObject *hook = PyObject_GetAttrString(module, attrname);
+    Py_DECREF(module);
+
+    if (hook == NULL) {
+        goto error;
+    }
+    PyObject *retval = _PyObject_FastCallKeywords(hook, args, nargs, keywords);
+    Py_DECREF(hook);
+    return retval;
+
+  error:
+    /* If any of the imports went wrong, then warn and ignore. */
+    PyErr_Clear();
+    int status = PyErr_WarnFormat(
+        PyExc_RuntimeWarning, 0,
+        "Ignoring unimportable $PYTHONBREAKPOINT: \"%s\"", envar);
+    if (status < 0) {
+        /* Printing the warning raised an exception. */
+        return NULL;
+    }
+    /* The warning was (probably) issued. */
+    Py_RETURN_NONE;
+}
+
+PyDoc_STRVAR(breakpointhook_doc,
+"breakpointhook(*args, **kws)\n"
+"\n"
+"This hook function is called by built-in breakpoint().\n"
+);
+
 /* Write repr(o) to sys.stdout using sys.stdout.encoding and 'backslashreplace'
    error handler. If sys.stdout has a buffer attribute, use
    sys.stdout.buffer.write(encoded), otherwise redecode the string and use
@@ -1365,6 +1440,8 @@ sys_getandroidapilevel(PyObject *self)
 
 static PyMethodDef sys_methods[] = {
     /* Might as well keep this in alphabetic order */
+    {"breakpointhook",  (PyCFunction)sys_breakpointhook,
+     METH_FASTCALL | METH_KEYWORDS, breakpointhook_doc},
     {"callstats", (PyCFunction)sys_callstats, METH_NOARGS,
      callstats_doc},
     {"_clear_type_cache",       sys_clear_type_cache,     METH_NOARGS,
@@ -1977,6 +2054,9 @@ _PySys_BeginInit(void)
                                PyDict_GetItemString(sysdict, "displayhook"));
     SET_SYS_FROM_STRING_BORROW("__excepthook__",
                                PyDict_GetItemString(sysdict, "excepthook"));
+    SET_SYS_FROM_STRING_BORROW(
+        "__breakpointhook__",
+        PyDict_GetItemString(sysdict, "breakpointhook"));
     SET_SYS_FROM_STRING("version",
                          PyUnicode_FromString(Py_GetVersion()));
     SET_SYS_FROM_STRING("hexversion",


From lp_benchmark_robot at intel.com  Thu Oct  5 13:12:30 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Thu, 5 Oct 2017 10:12:30 -0700
Subject: [Python-checkins] [2 down, 1 up,
 62 flat] Results for Python (master branch) 2017-10-05
Message-ID: <d2f3713d-e21b-42dd-8a2b-0ff7a7d559aa@orsmsx104.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-05 03:02:49-07:00.
  - commit:		c1c47c1
  - previous commit:	bf477a9
  - revision date:	2017-10-05 17:19:26+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.059% |  +0.059%   |  +4.150%   |  +7.666%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 0.843% |  -0.029%   |  +16.505%  |  +17.788%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 0.662% |  +0.178%   |  +18.187%  |  +16.423%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.509% |  +0.202%   |  +16.871%  |  +16.435%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.056% |  +0.077%   |  +3.723%   |  +13.504%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.550% |  -1.119%   |  +10.401%  |  +9.115%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.656% |  -1.182%   |  +7.004%   |  +11.569%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( |            crypto_pyaes| 0.827% |  -2.850%   |  +0.753%   |  +9.657%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.500% |  +1.024%   |  +7.992%   |  +17.862%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 6.396% |  -2.792%   |  +8.144%   |  +12.233%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.159% |  +0.855%   |  +4.773%   |  +7.187%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.438% |  -1.078%   |  +5.855%   |  +5.575%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.676% |  -1.160%   |  +2.616%   |  +6.692%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.364% |  +0.310%   |  +8.641%   |  +12.215%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.507% |  +1.515%   |  +8.316%   |  +8.480%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.682% |  -1.097%   |  +6.052%   |  +11.420%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.484% |  -0.800%   |  +9.104%   |  +11.479%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 2.849% |  -0.466%   |  +9.210%   |  +8.276%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.951% |  +0.363%   |  +4.741%   |  +8.284%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 5.404% |  -5.844%   |  -3.315%   |  +15.960%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.154% |  -0.153%   |  +8.628%   |  +9.084%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.631% |  +0.632%   |  +46.735%  |  +12.183%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.701% |  -0.812%   |  +8.669%   |  +10.963%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.458% |  +0.493%   |  +17.417%  |  +12.727%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 1.370% |  -0.233%   |  +7.846%   |  +9.847%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.540% |  +0.103%   |  +4.129%   |  +4.506%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.489% |  -0.011%   |  -0.734%   |  +0.205%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.822% |  +0.175%   |  +2.295%   |  +8.363%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.446% |  +1.371%   |  +7.285%   |  +8.673%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.125% |  -1.642%   |  -0.624%   |  +21.698%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.253% |  -1.058%   |  +2.289%   |  +17.511%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.615% |  -1.564%   |  +5.508%   |  +14.067%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 4.116% |  -0.517%   |  +11.693%  |  +9.451%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.264% |  -0.050%   |  +0.375%   |  +9.569%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.125% |  -0.196%   |  +10.905%  |  +5.176%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.085% |  -0.244%   |  +2.064%   |  +5.115%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.192% |  -1.486%   |  +9.017%   |  +13.862%  |
+-----+------------------------+--------+------------+------------+------------+
| :-) |           regex_compile| 5.166% |  +11.822%  |  +3.798%   |  +9.242%   |
+-----+------------------------+--------+------------+------------+------------+
| :-( |               regex_dna| 0.376% |  -3.764%   |  -1.688%   |  +11.899%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 3.067% |  -0.450%   |  -2.314%   |  +4.980%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 2.880% |  -2.068%   |  +9.791%   |  +4.104%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.074% |  +0.520%   |  +7.238%   |  +14.766%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.684% |  -2.079%   |  +0.124%   |  +4.170%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.770% |  +0.014%   |  +26.896%  |  +9.520%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 3.494% |  -2.002%   |  +4.422%   |  +5.734%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 1.562% |  -1.628%   |  +14.479%  |  +8.267%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 1.681% |  -1.787%   |  +2.190%   |  -3.294%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.364% |  -2.443%   |  +3.619%   |  +5.395%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 0.948% |  +0.320%   |  +6.488%   |  +7.182%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.992% |  -0.252%   |  +5.942%   |  +4.860%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 3.899% |  +2.201%   |  +20.133%  |  +7.719%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.538% |  +0.598%   |  +11.207%  |  +8.841%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 2.158% |  +0.191%   |  +9.662%   |  +6.794%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.202% |  -0.426%   |  +10.643%  |  +9.446%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.346% |  +1.663%   |  +11.754%  |  +9.011%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 3.382% |  -2.848%   |  +22.265%  |  +11.754%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.341% |  -0.054%   |  +6.318%   |  +6.038%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 0.732% |  +3.446%   |  +2.116%   |  +3.125%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 6.644% |  -1.453%   |  +8.726%   |  +19.567%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 1.478% |  -3.087%   |  -2.840%   |  +19.805%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 1.685% |  -0.233%   |  +7.855%   |  +7.023%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.088% |  -0.260%   |  +6.369%   |  +7.435%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.732% |  +2.048%   |  +1.908%   |  +6.764%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 3.402% |  +3.408%   |  -6.535%   |  +9.436%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.416% |  -0.028%   |  +7.065%   |  +7.773%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

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

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 Oct  5 16:35:41 2017
From: webhook-mailer at python.org (Steve Dower)
Date: Thu, 05 Oct 2017 20:35:41 -0000
Subject: [Python-checkins] bpo-31523: Reliability improvements to the
 Windows build files (#3900)
Message-ID: <mailman.50.1507235742.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/2084b30e540d88b9fc752c5bdcc2f24334af4f2b
commit: 2084b30e540d88b9fc752c5bdcc2f24334af4f2b
branch: master
author: Steve Dower <steve.dower at microsoft.com>
committer: GitHub <noreply at github.com>
date: 2017-10-05T13:35:36-07:00
summary:

bpo-31523: Reliability improvements to the Windows build files (#3900)

files:
M PCbuild/pyproject.props
M Tools/msi/msi.props
M Tools/msi/purge.py
M Tools/msi/uploadrelease.bat
M Tools/msi/uploadrelease.proj

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index aed8f34583b..42ead00d5a1 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -6,7 +6,7 @@
     <OutDir>$(BuildPath)</OutDir>
     <OutDir Condition="!HasTrailingSlash($(OutDir))">$(OutDir)\</OutDir>
     <Py_IntDir Condition="'$(Py_IntDir)' == ''">$(MSBuildThisFileDirectory)obj\</Py_IntDir>
-    <IntDir>$(Py_IntDir)\$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir>$(Py_IntDir)\$(MajorVersionNumber)$(MinorVersionNumber)$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir>
     <TargetName Condition="'$(TargetName)' == ''">$(ProjectName)</TargetName>
     <TargetName>$(TargetName)$(PyDebugExt)</TargetName>
     <GenerateManifest>false</GenerateManifest>
diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props
index 24a90bd8cb1..0318f7aa8eb 100644
--- a/Tools/msi/msi.props
+++ b/Tools/msi/msi.props
@@ -48,7 +48,7 @@
     </ItemGroup>
 
     <PropertyGroup>
-        <IntermediateOutputPath>$(Py_IntDir)\$(Configuration)_$(Platform)_Setup\$(OutputName)</IntermediateOutputPath>
+        <IntermediateOutputPath>$(Py_IntDir)\$(MajorVersionNumber)$(MinorVersionNumber)$(ArchName)_$(Configuration)\msi_$(OutputName)</IntermediateOutputPath>
         <IntermediateOutputPath Condition="'$(OutputSuffix)' != ''">$(IntermediateOutputPath)_$(OutputSuffix)</IntermediateOutputPath>
         <OutputPath Condition="'$(OutputPath)' == ''">$(BuildPath)</OutputPath>
         <OutputPath Condition="!HasTrailingSlash($(OutputPath))">$(OutputPath)\</OutputPath>
diff --git a/Tools/msi/purge.py b/Tools/msi/purge.py
index 76dbc49ae82..24fdae24388 100644
--- a/Tools/msi/purge.py
+++ b/Tools/msi/purge.py
@@ -25,7 +25,7 @@
     sys.exit(1)
 
 URL = "https://www.python.org/ftp/python/{}/".format(m.group(1))
-
+REL = m.group(2) or ''
 
 FILES = [
     "core.msi",
@@ -64,7 +64,7 @@
     "python-{}-webinstall.exe".format(m.group(0)),
     "python-{}-amd64.exe".format(m.group(0)),
     "python-{}-amd64-webinstall.exe".format(m.group(0)),
-] + ["win32{}/{}".format(m.group(2), f) for f in FILES] + ["amd64{}/{}".format(m.group(2), f) for f in FILES]
+] + ["win32{}/{}".format(REL, f) for f in FILES] + ["amd64{}/{}".format(REL, f) for f in FILES]
 
 print('Purged:')
 for n in PATHS:
diff --git a/Tools/msi/uploadrelease.bat b/Tools/msi/uploadrelease.bat
index 4902b6cf3f7..3ae5dbc61bf 100644
--- a/Tools/msi/uploadrelease.bat
+++ b/Tools/msi/uploadrelease.bat
@@ -8,8 +8,9 @@ set HOST=
 set USER=
 set TARGET=
 set DRYRUN=false
+set NOUPLOAD=
 set NOGPG=
-set PURGE_OPTION=/p:Purge=true
+set NOPURGE=
 set NOTEST=
 
 :CheckOpts
@@ -21,8 +22,9 @@ if "%1" EQU "--user" (set USER=%~2) && shift && shift && goto CheckOpts
 if "%1" EQU "-t" (set TARGET=%~2) && shift && shift && goto CheckOpts
 if "%1" EQU "--target" (set TARGET=%~2) && shift && shift && goto CheckOpts
 if "%1" EQU "--dry-run" (set DRYRUN=true) && shift && goto CheckOpts
+if "%1" EQU "--skip-upload" (set NOUPLOAD=true) && shift && goto CheckOpts
 if "%1" EQU "--skip-gpg" (set NOGPG=true) && shift && goto CheckOpts
-if "%1" EQU "--skip-purge" (set PURGE_OPTION=) && shift && goto CheckOpts
+if "%1" EQU "--skip-purge" (set NOPURGE=true) && shift && goto CheckOpts
 if "%1" EQU "--skip-test" (set NOTEST=true) && shift && goto CheckOpts
 if "%1" EQU "-T" (set NOTEST=true) && shift && goto CheckOpts
 if "%1" NEQ "" echo Unexpected argument "%1" & exit /B 1
@@ -52,17 +54,43 @@ if defined NOGPG (
 call "%PCBUILD%find_msbuild.bat" %MSBUILD%
 if ERRORLEVEL 1 (echo Cannot locate MSBuild.exe on PATH or as MSBUILD variable & exit /b 2)
 pushd "%D%"
-%MSBUILD% /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x86 %PURGE_OPTION%
-%MSBUILD% /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x64 /p:IncludeDoc=false %PURGE_OPTION%
+if not defined NOUPLOAD (
+    %MSBUILD% /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x86
+    if errorlevel 1 goto :failed
+    %MSBUILD% /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x64 /p:IncludeDoc=false
+    if errorlevel 1 goto :failed
+)
+if not defined NOPURGE (
+    %MSBUILD% /v:m /nologo uploadrelease.proj /t:Purge
+)
 if not defined NOTEST (
-    %MSBUILD% /v:m /nologo uploadrelease.proj /t:Test /p:Platform=x86
-    %MSBUILD% /v:m /nologo uploadrelease.proj /t:Test /p:Platform=x64
+    call :test x86
+    if errorlevel 1 goto :failed
+    call :test x64
+    if errorlevel 1 goto :failed
 )
 %MSBUILD% /v:m /nologo uploadrelease.proj /t:ShowHashes /p:Platform=x86
+if errorlevel 1 goto :failed
 %MSBUILD% /v:m /nologo uploadrelease.proj /t:ShowHashes /p:Platform=x64 /p:IncludeDoc=false
+if errorlevel 1 goto :failed
+
 popd
 exit /B 0
 
+:test
+%MSBUILD% /v:m /nologo uploadrelease.proj /t:Test /p:Platform=%1
+if errorlevel 1 (
+    echo Test failed - purging and retrying
+    %MSBUILD% /v:m /nologo uploadrelease.proj /t:Purge
+    if errorlevel 1 exit /B
+    %MSBUILD% /v:m /nologo uploadrelease.proj /t:Test /p:Platform=%1
+)
+exit /B
+
+:failed
+popd
+exit /B
+
 :Help
 echo uploadrelease.bat --host HOST --user USERNAME [--target TARGET] [--dry-run] [-h]
 echo.
diff --git a/Tools/msi/uploadrelease.proj b/Tools/msi/uploadrelease.proj
index 75840f2f851..881b825e107 100644
--- a/Tools/msi/uploadrelease.proj
+++ b/Tools/msi/uploadrelease.proj
@@ -10,7 +10,6 @@
         <IncludeDoc Condition="'$(IncludeDoc)' == ''">true</IncludeDoc>
         <BuildForRelease Condition="'$(BuildForRelease)' == ''">true</BuildForRelease>
         <DryRun Condition="'$(DryRun)' == ''">false</DryRun>
-        <Purge Condition="'$(Purge)' == ''">false</Purge>
     </PropertyGroup>
 
     <Import Project="msi.props" />
@@ -43,7 +42,8 @@
     <Target Name="_RunGpg" Condition="'$(GPG)' != ''" Inputs="@(File)" Outputs="$(IntermediateOutputPath)\gpg\%(FileName)%(Extension).asc">
         <MakeDir Directories="$(IntermediateOutputPath)gpg" />
         <Delete Files="$(IntermediateOutputPath)\gpg\%(File.FileName)%(File.Extension).asc" Condition="Exists('$(IntermediateOutputPath)\gpg\%(File.FileName)%(File.Extension).asc')" />
-        <Exec Command="&quot;$(GPG)&quot; -ba -o &quot;$(IntermediateOutputPath)\gpg\%(File.FileName)%(File.Extension).asc&quot; &quot;%(File.FullPath)&quot;" />
+        <Exec Command="&quot;$(GPG)&quot; -ba -o &quot;$(IntermediateOutputPath)\gpg\%(File.FileName)%(File.Extension).asc&quot; &quot;%(File.FullPath)&quot;"
+              IgnoreExitCode="false" />
         <ItemGroup>
             <File Include="$(IntermediateOutputPath)\gpg\%(File.FileName)%(File.Extension).asc">
                 <CopyTo>%(File.CopyTo)</CopyTo>
@@ -52,23 +52,15 @@
     </Target>
     
     <Target Name="_Upload" Condition="!$(DryRun)">
-        <Exec Command="&quot;$(PLINK)&quot; $(User)@$(Host) mkdir %(File.CopyTo) ^&amp;^&amp; chgrp downloads %(File.CopyTo) ^&amp;^&amp; chmod g-w,o+rx %(File.CopyTo)
-&quot;$(PSCP)&quot; @(File,' ') $(User)@$(Host):%(File.CopyTo)
-&quot;$(PLINK)&quot; $(User)@$(Host) chgrp downloads %(File.CopyTo)/*; chmod g-w,o+r %(File.CopyTo)/*
-" />
+        <Exec Command="&quot;$(PLINK)&quot; $(User)@$(Host) mkdir %(File.CopyTo) ^&amp;^&amp; chgrp downloads %(File.CopyTo) ^&amp;^&amp; chmod g-w,o+rx %(File.CopyTo)" />
+        <Exec Command="&quot;$(PSCP)&quot; @(File,' ') $(User)@$(Host):%(File.CopyTo)" />
+        <Exec Command="&quot;$(PLINK)&quot; $(User)@$(Host) chgrp downloads %(File.CopyTo)/*; chmod g-w,o+r %(File.CopyTo)/*" />
     </Target>
     
     <Target Name="_PrintNames" Condition="$(DryRun)">
-        <Exec Command="echo &quot;$(PLINK)&quot; $(User)@$(Host) mkdir %(File.CopyTo) ^&amp;^&amp; chgrp downloads %(File.CopyTo) ^&amp;^&amp; chmod g-w,o+rx %(File.CopyTo)
-echo &quot;$(PSCP)&quot; @(File,' ') $(User)@$(Host):%(File.CopyTo)
-echo &quot;$(PLINK)&quot; $(User)@$(Host) chgrp downloads %(File.CopyTo)/*; chmod g-w,o+r %(File.CopyTo)/*
-echo.
-echo." />
-    </Target>
-    
-    <Target Name="_Purge" Condition="$(Purge) and !$(DryRun)">
-        <Error Condition="!Exists('$(PythonExe)')" Text="No Python executable available at $(PythonExe)" />
-        <Exec Command="&quot;$(PythonExe)&quot; purge.py $(PythonVersion)" />
+        <Exec Command="echo &quot;$(PLINK)&quot; $(User)@$(Host) mkdir %(File.CopyTo) ^&amp;^&amp; chgrp downloads %(File.CopyTo) ^&amp;^&amp; chmod g-w,o+rx %(File.CopyTo)" />
+        <Exec Command="echo &quot;$(PSCP)&quot; @(File,' ') $(User)@$(Host):%(File.CopyTo)" />
+        <Exec Command="echo &quot;$(PLINK)&quot; $(User)@$(Host) chgrp downloads %(File.CopyTo)/*; chmod g-w,o+r %(File.CopyTo)/*" />
     </Target>
     
     <Target Name="_TestLayout">
@@ -82,6 +74,7 @@ echo." />
                 <LogFile>$(OutputPath)\%(Filename)_layoutlog\%(Filename).log</LogFile>
             </WebInstaller>
         </ItemGroup>
+        <Error Text="Could not find installer" Condition="@(WebInstaller) == ''" />
         <RemoveDir Directories="%(WebInstaller.SourceDir)" Condition="Exists('%(WebInstaller.SourceDir)')" />
         <RemoveDir Directories="%(WebInstaller.LayoutDir)" Condition="Exists('%(WebInstaller.LayoutDir)')" />
         <RemoveDir Directories="%(WebInstaller.LogDir)" Condition="Exists('%(WebInstaller.LogDir)')" />
@@ -95,14 +88,22 @@ echo." />
         <Message Text="Successfully downloaded %(WebInstaller.Filename)%(WebInstaller.Extension) layout" Importance="high" />
     </Target>
     
-    <Target Name="Upload" DependsOnTargets="_ValidateProperties;_RunGpg;_PrintNames;_Upload;_Purge" />
+    <Target Name="Upload" DependsOnTargets="_ValidateProperties;_RunGpg;_PrintNames;_Upload" />
     <Target Name="Test" DependsOnTargets="_TestLayout" />
     
+    <Target Name="Purge">
+        <Error Condition="!Exists('$(PythonExe)')" Text="No Python executable available at $(PythonExe)" />
+        <Exec Command="echo &quot;$(PythonExe)&quot; purge.py $(PythonVersion)" Condition="$(DryRun)" />
+        <Exec Command="&quot;$(PythonExe)&quot; purge.py $(PythonVersion)" Condition="!$(DryRun)" />
+        <Message Text="Purged uploaded files" Importance="high" />
+    </Target>
+    
     <Target Name="ShowHashes">
         <ItemGroup>
             <UserFiles Include="@(File)" Condition="'%(File.CopyTo)' == '$(EXETarget)'" />
         </ItemGroup>
         
+        <Error Text="No files generated" Condition="@(UserFiles) == ''" />
         <Exec Command="&quot;$(PythonExe)&quot; generate_md5.py @(UserFiles->'&quot;%(FullPath)&quot;',' ')" />
     </Target>
     


From webhook-mailer at python.org  Thu Oct  5 17:09:33 2017
From: webhook-mailer at python.org (Steve Dower)
Date: Thu, 05 Oct 2017 21:09:33 -0000
Subject: [Python-checkins] [3.6] bpo-31523: Reliability improvements to the
 Windows build files (GH-3900) (#3902)
Message-ID: <mailman.51.1507237775.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/051295a8c57cc649fa5eaa43526143984a147411
commit: 051295a8c57cc649fa5eaa43526143984a147411
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Steve Dower <steve.dower at microsoft.com>
date: 2017-10-05T14:09:30-07:00
summary:

[3.6] bpo-31523: Reliability improvements to the Windows build files (GH-3900) (#3902)

(cherry picked from commit 2084b30e540d88b9fc752c5bdcc2f24334af4f2b)

files:
M PCbuild/pyproject.props
M Tools/msi/msi.props
M Tools/msi/purge.py
M Tools/msi/uploadrelease.bat
M Tools/msi/uploadrelease.proj

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 3d46a0fcba8..5a2da998c37 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -6,7 +6,7 @@
     <OutDir>$(BuildPath)</OutDir>
     <OutDir Condition="!HasTrailingSlash($(OutDir))">$(OutDir)\</OutDir>
     <Py_IntDir Condition="'$(Py_IntDir)' == ''">$(MSBuildThisFileDirectory)obj\</Py_IntDir>
-    <IntDir>$(Py_IntDir)\$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir>$(Py_IntDir)\$(MajorVersionNumber)$(MinorVersionNumber)$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir>
     <TargetName Condition="'$(TargetName)' == ''">$(ProjectName)</TargetName>
     <TargetName>$(TargetName)$(PyDebugExt)</TargetName>
     <GenerateManifest>false</GenerateManifest>
diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props
index 60abba1f7be..61095991088 100644
--- a/Tools/msi/msi.props
+++ b/Tools/msi/msi.props
@@ -48,7 +48,7 @@
     </ItemGroup>
 
     <PropertyGroup>
-        <IntermediateOutputPath>$(Py_IntDir)\$(Configuration)_$(Platform)_Setup\$(OutputName)</IntermediateOutputPath>
+        <IntermediateOutputPath>$(Py_IntDir)\$(MajorVersionNumber)$(MinorVersionNumber)$(ArchName)_$(Configuration)\msi_$(OutputName)</IntermediateOutputPath>
         <IntermediateOutputPath Condition="'$(OutputSuffix)' != ''">$(IntermediateOutputPath)_$(OutputSuffix)</IntermediateOutputPath>
         <OutputPath Condition="'$(OutputPath)' == ''">$(BuildPath)</OutputPath>
         <OutputPath Condition="!HasTrailingSlash($(OutputPath))">$(OutputPath)\</OutputPath>
diff --git a/Tools/msi/purge.py b/Tools/msi/purge.py
index 76dbc49ae82..24fdae24388 100644
--- a/Tools/msi/purge.py
+++ b/Tools/msi/purge.py
@@ -25,7 +25,7 @@
     sys.exit(1)
 
 URL = "https://www.python.org/ftp/python/{}/".format(m.group(1))
-
+REL = m.group(2) or ''
 
 FILES = [
     "core.msi",
@@ -64,7 +64,7 @@
     "python-{}-webinstall.exe".format(m.group(0)),
     "python-{}-amd64.exe".format(m.group(0)),
     "python-{}-amd64-webinstall.exe".format(m.group(0)),
-] + ["win32{}/{}".format(m.group(2), f) for f in FILES] + ["amd64{}/{}".format(m.group(2), f) for f in FILES]
+] + ["win32{}/{}".format(REL, f) for f in FILES] + ["amd64{}/{}".format(REL, f) for f in FILES]
 
 print('Purged:')
 for n in PATHS:
diff --git a/Tools/msi/uploadrelease.bat b/Tools/msi/uploadrelease.bat
index 6441db9ee6f..d9dcc7a09e0 100644
--- a/Tools/msi/uploadrelease.bat
+++ b/Tools/msi/uploadrelease.bat
@@ -8,8 +8,9 @@ set HOST=
 set USER=
 set TARGET=
 set DRYRUN=false
+set NOUPLOAD=
 set NOGPG=
-set PURGE_OPTION=/p:Purge=true
+set NOPURGE=
 set NOTEST=
 
 :CheckOpts
@@ -21,8 +22,9 @@ if "%1" EQU "--user" (set USER=%~2) && shift && shift && goto CheckOpts
 if "%1" EQU "-t" (set TARGET=%~2) && shift && shift && goto CheckOpts
 if "%1" EQU "--target" (set TARGET=%~2) && shift && shift && goto CheckOpts
 if "%1" EQU "--dry-run" (set DRYRUN=true) && shift && goto CheckOpts
+if "%1" EQU "--skip-upload" (set NOUPLOAD=true) && shift && goto CheckOpts
 if "%1" EQU "--skip-gpg" (set NOGPG=true) && shift && goto CheckOpts
-if "%1" EQU "--skip-purge" (set PURGE_OPTION=) && shift && goto CheckOpts
+if "%1" EQU "--skip-purge" (set NOPURGE=true) && shift && goto CheckOpts
 if "%1" EQU "--skip-test" (set NOTEST=true) && shift && goto CheckOpts
 if "%1" EQU "-T" (set NOTEST=true) && shift && goto CheckOpts
 if "%1" NEQ "" echo Unexpected argument "%1" & exit /B 1
@@ -52,17 +54,43 @@ if defined NOGPG (
 call "%PCBUILD%find_msbuild.bat" %MSBUILD%
 if ERRORLEVEL 1 (echo Cannot locate MSBuild.exe on PATH or as MSBUILD variable & exit /b 2)
 pushd "%D%"
-%MSBUILD% /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x86 %PURGE_OPTION%
-%MSBUILD% /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x64 /p:IncludeDoc=false %PURGE_OPTION%
+if not defined NOUPLOAD (
+    %MSBUILD% /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x86
+    if errorlevel 1 goto :failed
+    %MSBUILD% /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x64 /p:IncludeDoc=false
+    if errorlevel 1 goto :failed
+)
+if not defined NOPURGE (
+    %MSBUILD% /v:m /nologo uploadrelease.proj /t:Purge
+)
 if not defined NOTEST (
-    %MSBUILD% /v:m /nologo uploadrelease.proj /t:Test /p:Platform=x86
-    %MSBUILD% /v:m /nologo uploadrelease.proj /t:Test /p:Platform=x64
+    call :test x86
+    if errorlevel 1 goto :failed
+    call :test x64
+    if errorlevel 1 goto :failed
 )
 %MSBUILD% /v:m /nologo uploadrelease.proj /t:ShowHashes /p:Platform=x86
+if errorlevel 1 goto :failed
 %MSBUILD% /v:m /nologo uploadrelease.proj /t:ShowHashes /p:Platform=x64 /p:IncludeDoc=false
+if errorlevel 1 goto :failed
+
 popd
 exit /B 0
 
+:test
+%MSBUILD% /v:m /nologo uploadrelease.proj /t:Test /p:Platform=%1
+if errorlevel 1 (
+    echo Test failed - purging and retrying
+    %MSBUILD% /v:m /nologo uploadrelease.proj /t:Purge
+    if errorlevel 1 exit /B
+    %MSBUILD% /v:m /nologo uploadrelease.proj /t:Test /p:Platform=%1
+)
+exit /B
+
+:failed
+popd
+exit /B
+
 :Help
 echo uploadrelease.bat --host HOST --user USERNAME [--target TARGET] [--dry-run] [-h]
 echo.
diff --git a/Tools/msi/uploadrelease.proj b/Tools/msi/uploadrelease.proj
index 75840f2f851..881b825e107 100644
--- a/Tools/msi/uploadrelease.proj
+++ b/Tools/msi/uploadrelease.proj
@@ -10,7 +10,6 @@
         <IncludeDoc Condition="'$(IncludeDoc)' == ''">true</IncludeDoc>
         <BuildForRelease Condition="'$(BuildForRelease)' == ''">true</BuildForRelease>
         <DryRun Condition="'$(DryRun)' == ''">false</DryRun>
-        <Purge Condition="'$(Purge)' == ''">false</Purge>
     </PropertyGroup>
 
     <Import Project="msi.props" />
@@ -43,7 +42,8 @@
     <Target Name="_RunGpg" Condition="'$(GPG)' != ''" Inputs="@(File)" Outputs="$(IntermediateOutputPath)\gpg\%(FileName)%(Extension).asc">
         <MakeDir Directories="$(IntermediateOutputPath)gpg" />
         <Delete Files="$(IntermediateOutputPath)\gpg\%(File.FileName)%(File.Extension).asc" Condition="Exists('$(IntermediateOutputPath)\gpg\%(File.FileName)%(File.Extension).asc')" />
-        <Exec Command="&quot;$(GPG)&quot; -ba -o &quot;$(IntermediateOutputPath)\gpg\%(File.FileName)%(File.Extension).asc&quot; &quot;%(File.FullPath)&quot;" />
+        <Exec Command="&quot;$(GPG)&quot; -ba -o &quot;$(IntermediateOutputPath)\gpg\%(File.FileName)%(File.Extension).asc&quot; &quot;%(File.FullPath)&quot;"
+              IgnoreExitCode="false" />
         <ItemGroup>
             <File Include="$(IntermediateOutputPath)\gpg\%(File.FileName)%(File.Extension).asc">
                 <CopyTo>%(File.CopyTo)</CopyTo>
@@ -52,23 +52,15 @@
     </Target>
     
     <Target Name="_Upload" Condition="!$(DryRun)">
-        <Exec Command="&quot;$(PLINK)&quot; $(User)@$(Host) mkdir %(File.CopyTo) ^&amp;^&amp; chgrp downloads %(File.CopyTo) ^&amp;^&amp; chmod g-w,o+rx %(File.CopyTo)
-&quot;$(PSCP)&quot; @(File,' ') $(User)@$(Host):%(File.CopyTo)
-&quot;$(PLINK)&quot; $(User)@$(Host) chgrp downloads %(File.CopyTo)/*; chmod g-w,o+r %(File.CopyTo)/*
-" />
+        <Exec Command="&quot;$(PLINK)&quot; $(User)@$(Host) mkdir %(File.CopyTo) ^&amp;^&amp; chgrp downloads %(File.CopyTo) ^&amp;^&amp; chmod g-w,o+rx %(File.CopyTo)" />
+        <Exec Command="&quot;$(PSCP)&quot; @(File,' ') $(User)@$(Host):%(File.CopyTo)" />
+        <Exec Command="&quot;$(PLINK)&quot; $(User)@$(Host) chgrp downloads %(File.CopyTo)/*; chmod g-w,o+r %(File.CopyTo)/*" />
     </Target>
     
     <Target Name="_PrintNames" Condition="$(DryRun)">
-        <Exec Command="echo &quot;$(PLINK)&quot; $(User)@$(Host) mkdir %(File.CopyTo) ^&amp;^&amp; chgrp downloads %(File.CopyTo) ^&amp;^&amp; chmod g-w,o+rx %(File.CopyTo)
-echo &quot;$(PSCP)&quot; @(File,' ') $(User)@$(Host):%(File.CopyTo)
-echo &quot;$(PLINK)&quot; $(User)@$(Host) chgrp downloads %(File.CopyTo)/*; chmod g-w,o+r %(File.CopyTo)/*
-echo.
-echo." />
-    </Target>
-    
-    <Target Name="_Purge" Condition="$(Purge) and !$(DryRun)">
-        <Error Condition="!Exists('$(PythonExe)')" Text="No Python executable available at $(PythonExe)" />
-        <Exec Command="&quot;$(PythonExe)&quot; purge.py $(PythonVersion)" />
+        <Exec Command="echo &quot;$(PLINK)&quot; $(User)@$(Host) mkdir %(File.CopyTo) ^&amp;^&amp; chgrp downloads %(File.CopyTo) ^&amp;^&amp; chmod g-w,o+rx %(File.CopyTo)" />
+        <Exec Command="echo &quot;$(PSCP)&quot; @(File,' ') $(User)@$(Host):%(File.CopyTo)" />
+        <Exec Command="echo &quot;$(PLINK)&quot; $(User)@$(Host) chgrp downloads %(File.CopyTo)/*; chmod g-w,o+r %(File.CopyTo)/*" />
     </Target>
     
     <Target Name="_TestLayout">
@@ -82,6 +74,7 @@ echo." />
                 <LogFile>$(OutputPath)\%(Filename)_layoutlog\%(Filename).log</LogFile>
             </WebInstaller>
         </ItemGroup>
+        <Error Text="Could not find installer" Condition="@(WebInstaller) == ''" />
         <RemoveDir Directories="%(WebInstaller.SourceDir)" Condition="Exists('%(WebInstaller.SourceDir)')" />
         <RemoveDir Directories="%(WebInstaller.LayoutDir)" Condition="Exists('%(WebInstaller.LayoutDir)')" />
         <RemoveDir Directories="%(WebInstaller.LogDir)" Condition="Exists('%(WebInstaller.LogDir)')" />
@@ -95,14 +88,22 @@ echo." />
         <Message Text="Successfully downloaded %(WebInstaller.Filename)%(WebInstaller.Extension) layout" Importance="high" />
     </Target>
     
-    <Target Name="Upload" DependsOnTargets="_ValidateProperties;_RunGpg;_PrintNames;_Upload;_Purge" />
+    <Target Name="Upload" DependsOnTargets="_ValidateProperties;_RunGpg;_PrintNames;_Upload" />
     <Target Name="Test" DependsOnTargets="_TestLayout" />
     
+    <Target Name="Purge">
+        <Error Condition="!Exists('$(PythonExe)')" Text="No Python executable available at $(PythonExe)" />
+        <Exec Command="echo &quot;$(PythonExe)&quot; purge.py $(PythonVersion)" Condition="$(DryRun)" />
+        <Exec Command="&quot;$(PythonExe)&quot; purge.py $(PythonVersion)" Condition="!$(DryRun)" />
+        <Message Text="Purged uploaded files" Importance="high" />
+    </Target>
+    
     <Target Name="ShowHashes">
         <ItemGroup>
             <UserFiles Include="@(File)" Condition="'%(File.CopyTo)' == '$(EXETarget)'" />
         </ItemGroup>
         
+        <Error Text="No files generated" Condition="@(UserFiles) == ''" />
         <Exec Command="&quot;$(PythonExe)&quot; generate_md5.py @(UserFiles->'&quot;%(FullPath)&quot;',' ')" />
     </Target>
     


From webhook-mailer at python.org  Thu Oct  5 23:24:51 2017
From: webhook-mailer at python.org (Yury Selivanov)
Date: Fri, 06 Oct 2017 03:24:51 -0000
Subject: [Python-checkins] bpo-30406: Make async and await proper keywords
 (#1669)
Message-ID: <mailman.52.1507260292.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/ac317700ce7439e38a8b420218d9a5035bba92ed
commit: ac317700ce7439e38a8b420218d9a5035bba92ed
branch: master
author: Jelle Zijlstra <jelle.zijlstra at gmail.com>
committer: Yury Selivanov <yury at magic.io>
date: 2017-10-05T23:24:46-04:00
summary:

bpo-30406: Make async and await proper keywords (#1669)

Per PEP 492, 'async' and 'await' should become proper keywords in 3.7.

files:
A Misc/NEWS.d/next/Core and Builtins/2017-07-20-22-03-44.bpo-30406._kr47t.rst
M Doc/library/token.rst
M Doc/tools/extensions/pyspecific.py
M Grammar/Grammar
M Include/graminit.h
M Include/token.h
M Lib/keyword.py
M Lib/lib2to3/Grammar.txt
M Lib/lib2to3/pgen2/token.py
M Lib/lib2to3/pgen2/tokenize.py
M Lib/lib2to3/tests/test_parser.py
M Lib/pydoc.py
M Lib/symbol.py
M Lib/test/test_asyncio/test_tasks.py
M Lib/test/test_coroutines.py
M Lib/test/test_parser.py
M Lib/test/test_tokenize.py
M Lib/tokenize.py
M Parser/tokenizer.c
M Parser/tokenizer.h
M Python/ast.c
M Python/graminit.c

diff --git a/Doc/library/token.rst b/Doc/library/token.rst
index b7ca9dbca72..373991027e4 100644
--- a/Doc/library/token.rst
+++ b/Doc/library/token.rst
@@ -98,8 +98,6 @@ The token constants are:
           RARROW
           ELLIPSIS
           OP
-          AWAIT
-          ASYNC
           ERRORTOKEN
           N_TOKENS
           NT_OFFSET
@@ -129,9 +127,11 @@ the :mod:`tokenize` module.
 
 
 .. versionchanged:: 3.5
-   Added :data:`AWAIT` and :data:`ASYNC` tokens. Starting with
-   Python 3.7, "async" and "await" will be tokenized as :data:`NAME`
-   tokens, and :data:`AWAIT` and :data:`ASYNC` will be removed.
+   Added :data:`AWAIT` and :data:`ASYNC` tokens.
 
 .. versionchanged:: 3.7
    Added :data:`COMMENT`, :data:`NL` and :data:`ENCODING` tokens.
+
+.. versionchanged:: 3.7
+   Removed :data:`AWAIT` and :data:`ASYNC` tokens. "async" and "await" are
+   now tokenized as :data:`NAME` tokens.
diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py
index e8c88760a87..00acd4f55b8 100644
--- a/Doc/tools/extensions/pyspecific.py
+++ b/Doc/tools/extensions/pyspecific.py
@@ -272,9 +272,9 @@ def run(self):
 # Support for building "topic help" for pydoc
 
 pydoc_topic_labels = [
-    'assert', 'assignment', 'atom-identifiers', 'atom-literals',
-    'attribute-access', 'attribute-references', 'augassign', 'binary',
-    'bitwise', 'bltin-code-objects', 'bltin-ellipsis-object',
+    'assert', 'assignment', 'async', 'atom-identifiers', 'atom-literals',
+    'attribute-access', 'attribute-references', 'augassign', 'await',
+    'binary', 'bitwise', 'bltin-code-objects', 'bltin-ellipsis-object',
     'bltin-null-object', 'bltin-type-objects', 'booleans',
     'break', 'callable-types', 'calls', 'class', 'comparisons', 'compound',
     'context-managers', 'continue', 'conversions', 'customization', 'debugger',
diff --git a/Grammar/Grammar b/Grammar/Grammar
index 90582434bee..7d3dd0b86dc 100644
--- a/Grammar/Grammar
+++ b/Grammar/Grammar
@@ -16,7 +16,7 @@ decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
 decorators: decorator+
 decorated: decorators (classdef | funcdef | async_funcdef)
 
-async_funcdef: ASYNC funcdef
+async_funcdef: 'async' funcdef
 funcdef: 'def' NAME parameters ['->' test] ':' suite
 
 parameters: '(' [typedargslist] ')'
@@ -68,7 +68,7 @@ nonlocal_stmt: 'nonlocal' NAME (',' NAME)*
 assert_stmt: 'assert' test [',' test]
 
 compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | with_stmt | funcdef | classdef | decorated | async_stmt
-async_stmt: ASYNC (funcdef | with_stmt | for_stmt)
+async_stmt: 'async' (funcdef | with_stmt | for_stmt)
 if_stmt: 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
 while_stmt: 'while' test ':' suite ['else' ':' suite]
 for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite]
@@ -103,7 +103,7 @@ arith_expr: term (('+'|'-') term)*
 term: factor (('*'|'@'|'/'|'%'|'//') factor)*
 factor: ('+'|'-'|'~') factor | power
 power: atom_expr ['**' factor]
-atom_expr: [AWAIT] atom trailer*
+atom_expr: ['await'] atom trailer*
 atom: ('(' [yield_expr|testlist_comp] ')' |
        '[' [testlist_comp] ']' |
        '{' [dictorsetmaker] '}' |
@@ -139,7 +139,8 @@ argument: ( test [comp_for] |
             '*' test )
 
 comp_iter: comp_for | comp_if
-comp_for: [ASYNC] 'for' exprlist 'in' or_test [comp_iter]
+sync_comp_for: 'for' exprlist 'in' or_test [comp_iter]
+comp_for: ['async'] sync_comp_for
 comp_if: 'if' test_nocond [comp_iter]
 
 # not used in grammar, but may appear in "node" passed from Parser to Compiler
diff --git a/Include/graminit.h b/Include/graminit.h
index e9b4a938595..bdfe821ad71 100644
--- a/Include/graminit.h
+++ b/Include/graminit.h
@@ -81,8 +81,9 @@
 #define arglist 334
 #define argument 335
 #define comp_iter 336
-#define comp_for 337
-#define comp_if 338
-#define encoding_decl 339
-#define yield_expr 340
-#define yield_arg 341
+#define sync_comp_for 337
+#define comp_for 338
+#define comp_if 339
+#define encoding_decl 340
+#define yield_expr 341
+#define yield_arg 342
diff --git a/Include/token.h b/Include/token.h
index b28830b8b40..cd1cd00f09c 100644
--- a/Include/token.h
+++ b/Include/token.h
@@ -9,77 +9,75 @@ extern "C" {
 
 #undef TILDE   /* Prevent clash of our definition with system macro. Ex AIX, ioctl.h */
 
-#define ENDMARKER	0
-#define NAME		1
-#define NUMBER		2
-#define STRING		3
-#define NEWLINE		4
-#define INDENT		5
-#define DEDENT		6
-#define LPAR		7
-#define RPAR		8
-#define LSQB		9
-#define RSQB		10
-#define COLON		11
-#define COMMA		12
-#define SEMI		13
-#define PLUS		14
-#define MINUS		15
-#define STAR		16
-#define SLASH		17
-#define VBAR		18
-#define AMPER		19
-#define LESS		20
-#define GREATER		21
-#define EQUAL		22
-#define DOT		23
-#define PERCENT		24
-#define LBRACE		25
-#define RBRACE		26
-#define EQEQUAL		27
-#define NOTEQUAL	28
-#define LESSEQUAL	29
-#define GREATEREQUAL	30
-#define TILDE		31
-#define CIRCUMFLEX	32
-#define LEFTSHIFT	33
-#define RIGHTSHIFT	34
-#define DOUBLESTAR	35
-#define PLUSEQUAL	36
-#define MINEQUAL	37
-#define STAREQUAL	38
-#define SLASHEQUAL	39
-#define PERCENTEQUAL	40
-#define AMPEREQUAL	41
-#define VBAREQUAL	42
-#define CIRCUMFLEXEQUAL	43
-#define LEFTSHIFTEQUAL	44
-#define RIGHTSHIFTEQUAL	45
-#define DOUBLESTAREQUAL	46
-#define DOUBLESLASH	47
+#define ENDMARKER       0
+#define NAME            1
+#define NUMBER          2
+#define STRING          3
+#define NEWLINE         4
+#define INDENT          5
+#define DEDENT          6
+#define LPAR            7
+#define RPAR            8
+#define LSQB            9
+#define RSQB            10
+#define COLON           11
+#define COMMA           12
+#define SEMI            13
+#define PLUS            14
+#define MINUS           15
+#define STAR            16
+#define SLASH           17
+#define VBAR            18
+#define AMPER           19
+#define LESS            20
+#define GREATER         21
+#define EQUAL           22
+#define DOT             23
+#define PERCENT         24
+#define LBRACE          25
+#define RBRACE          26
+#define EQEQUAL         27
+#define NOTEQUAL        28
+#define LESSEQUAL       29
+#define GREATEREQUAL    30
+#define TILDE           31
+#define CIRCUMFLEX      32
+#define LEFTSHIFT       33
+#define RIGHTSHIFT      34
+#define DOUBLESTAR      35
+#define PLUSEQUAL       36
+#define MINEQUAL        37
+#define STAREQUAL       38
+#define SLASHEQUAL      39
+#define PERCENTEQUAL    40
+#define AMPEREQUAL      41
+#define VBAREQUAL       42
+#define CIRCUMFLEXEQUAL 43
+#define LEFTSHIFTEQUAL  44
+#define RIGHTSHIFTEQUAL 45
+#define DOUBLESTAREQUAL 46
+#define DOUBLESLASH     47
 #define DOUBLESLASHEQUAL 48
 #define AT              49
-#define ATEQUAL		50
+#define ATEQUAL         50
 #define RARROW          51
 #define ELLIPSIS        52
 /* Don't forget to update the table _PyParser_TokenNames in tokenizer.c! */
-#define OP		53
-#define AWAIT		54
-#define ASYNC		55
-#define ERRORTOKEN	56
+#define OP              53
+#define ERRORTOKEN      54
 /* These aren't used by the C tokenizer but are needed for tokenize.py */
-#define COMMENT		57
-#define NL		58
-#define ENCODING		59
-#define N_TOKENS	60
+#define COMMENT         55
+#define NL              56
+#define ENCODING                57
+#define N_TOKENS        58
 
 /* Special definitions for cooperation with parser */
 
-#define NT_OFFSET		256
+#define NT_OFFSET               256
 
-#define ISTERMINAL(x)		((x) < NT_OFFSET)
-#define ISNONTERMINAL(x)	((x) >= NT_OFFSET)
-#define ISEOF(x)		((x) == ENDMARKER)
+#define ISTERMINAL(x)           ((x) < NT_OFFSET)
+#define ISNONTERMINAL(x)        ((x) >= NT_OFFSET)
+#define ISEOF(x)                ((x) == ENDMARKER)
 
 
 PyAPI_DATA(const char *) _PyParser_TokenNames[]; /* Token names */
diff --git a/Lib/keyword.py b/Lib/keyword.py
index 6e1e882a91e..431991dcf4a 100755
--- a/Lib/keyword.py
+++ b/Lib/keyword.py
@@ -20,6 +20,8 @@
         'and',
         'as',
         'assert',
+        'async',
+        'await',
         'break',
         'class',
         'continue',
diff --git a/Lib/lib2to3/Grammar.txt b/Lib/lib2to3/Grammar.txt
index ded032522ba..0bdfcafcf3c 100644
--- a/Lib/lib2to3/Grammar.txt
+++ b/Lib/lib2to3/Grammar.txt
@@ -34,7 +34,7 @@ eval_input: testlist NEWLINE* ENDMARKER
 decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
 decorators: decorator+
 decorated: decorators (classdef | funcdef | async_funcdef)
-async_funcdef: ASYNC funcdef
+async_funcdef: 'async' funcdef
 funcdef: 'def' NAME parameters ['->' test] ':' suite
 parameters: '(' [typedargslist] ')'
 typedargslist: ((tfpdef ['=' test] ',')*
@@ -85,7 +85,7 @@ exec_stmt: 'exec' expr ['in' test [',' test]]
 assert_stmt: 'assert' test [',' test]
 
 compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | with_stmt | funcdef | classdef | decorated | async_stmt
-async_stmt: ASYNC (funcdef | with_stmt | for_stmt)
+async_stmt: 'async' (funcdef | with_stmt | for_stmt)
 if_stmt: 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
 while_stmt: 'while' test ':' suite ['else' ':' suite]
 for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite]
@@ -124,7 +124,7 @@ shift_expr: arith_expr (('<<'|'>>') arith_expr)*
 arith_expr: term (('+'|'-') term)*
 term: factor (('*'|'@'|'/'|'%'|'//') factor)*
 factor: ('+'|'-'|'~') factor | power
-power: [AWAIT] atom trailer* ['**' factor]
+power: ['await'] atom trailer* ['**' factor]
 atom: ('(' [yield_expr|testlist_gexp] ')' |
        '[' [listmaker] ']' |
        '{' [dictsetmaker] '}' |
@@ -161,7 +161,7 @@ argument: ( test [comp_for] |
 	    star_expr )
 
 comp_iter: comp_for | comp_if
-comp_for: [ASYNC] 'for' exprlist 'in' or_test [comp_iter]
+comp_for: ['async'] 'for' exprlist 'in' or_test [comp_iter]
 comp_if: 'if' old_test [comp_iter]
 
 # As noted above, testlist_safe extends the syntax allowed in list
@@ -180,7 +180,7 @@ comp_if: 'if' old_test [comp_iter]
 #
 # See https://bugs.python.org/issue27494
 old_comp_iter: old_comp_for | old_comp_if
-old_comp_for: [ASYNC] 'for' exprlist 'in' testlist_safe [old_comp_iter]
+old_comp_for: ['async'] 'for' exprlist 'in' testlist_safe [old_comp_iter]
 old_comp_if: 'if' old_test [old_comp_iter]
 
 testlist1: test (',' test)*
diff --git a/Lib/lib2to3/pgen2/token.py b/Lib/lib2to3/pgen2/token.py
index 1a679554d2d..7599396611b 100755
--- a/Lib/lib2to3/pgen2/token.py
+++ b/Lib/lib2to3/pgen2/token.py
@@ -62,10 +62,8 @@
 COMMENT = 53
 NL = 54
 RARROW = 55
-AWAIT = 56
-ASYNC = 57
-ERRORTOKEN = 58
-N_TOKENS = 59
+ERRORTOKEN = 56
+N_TOKENS = 57
 NT_OFFSET = 256
 #--end constants--
 
diff --git a/Lib/lib2to3/pgen2/tokenize.py b/Lib/lib2to3/pgen2/tokenize.py
index 45afc5f4e53..14560e4fddf 100644
--- a/Lib/lib2to3/pgen2/tokenize.py
+++ b/Lib/lib2to3/pgen2/tokenize.py
@@ -234,7 +234,7 @@ def compat(self, token, iterable):
         for tok in iterable:
             toknum, tokval = tok[:2]
 
-            if toknum in (NAME, NUMBER, ASYNC, AWAIT):
+            if toknum in (NAME, NUMBER):
                 tokval += ' '
 
             if toknum == INDENT:
@@ -380,12 +380,6 @@ def generate_tokens(readline):
     contline = None
     indents = [0]
 
-    # 'stashed' and 'async_*' are used for async/await parsing
-    stashed = None
-    async_def = False
-    async_def_indent = 0
-    async_def_nl = False
-
     while 1:                                   # loop over lines in stream
         try:
             line = readline()
@@ -426,10 +420,6 @@ def generate_tokens(readline):
                 pos = pos + 1
             if pos == max: break
 
-            if stashed:
-                yield stashed
-                stashed = None
-
             if line[pos] in '#\r\n':           # skip comments or blank lines
                 if line[pos] == '#':
                     comment_token = line[pos:].rstrip('\r\n')
@@ -453,18 +443,8 @@ def generate_tokens(readline):
                         ("<tokenize>", lnum, pos, line))
                 indents = indents[:-1]
 
-                if async_def and async_def_indent >= indents[-1]:
-                    async_def = False
-                    async_def_nl = False
-                    async_def_indent = 0
-
                 yield (DEDENT, '', (lnum, pos), (lnum, pos), line)
 
-            if async_def and async_def_nl and async_def_indent >= indents[-1]:
-                async_def = False
-                async_def_nl = False
-                async_def_indent = 0
-
         else:                                  # continued statement
             if not line:
                 raise TokenError("EOF in multi-line statement", (lnum, 0))
@@ -484,18 +464,10 @@ def generate_tokens(readline):
                     newline = NEWLINE
                     if parenlev > 0:
                         newline = NL
-                    elif async_def:
-                        async_def_nl = True
-                    if stashed:
-                        yield stashed
-                        stashed = None
                     yield (newline, token, spos, epos, line)
 
                 elif initial == '#':
                     assert not token.endswith("\n")
-                    if stashed:
-                        yield stashed
-                        stashed = None
                     yield (COMMENT, token, spos, epos, line)
                 elif token in triple_quoted:
                     endprog = endprogs[token]
@@ -503,9 +475,6 @@ def generate_tokens(readline):
                     if endmatch:                           # all on one line
                         pos = endmatch.end(0)
                         token = line[start:pos]
-                        if stashed:
-                            yield stashed
-                            stashed = None
                         yield (STRING, token, spos, (lnum, pos), line)
                     else:
                         strstart = (lnum, start)           # multiple lines
@@ -523,63 +492,22 @@ def generate_tokens(readline):
                         contline = line
                         break
                     else:                                  # ordinary string
-                        if stashed:
-                            yield stashed
-                            stashed = None
                         yield (STRING, token, spos, epos, line)
                 elif initial in namechars:                 # ordinary name
-                    if token in ('async', 'await'):
-                        if async_def:
-                            yield (ASYNC if token == 'async' else AWAIT,
-                                   token, spos, epos, line)
-                            continue
-
-                    tok = (NAME, token, spos, epos, line)
-                    if token == 'async' and not stashed:
-                        stashed = tok
-                        continue
-
-                    if token == 'def':
-                        if (stashed
-                                and stashed[0] == NAME
-                                and stashed[1] == 'async'):
-
-                            async_def = True
-                            async_def_indent = indents[-1]
-
-                            yield (ASYNC, stashed[1],
-                                   stashed[2], stashed[3],
-                                   stashed[4])
-                            stashed = None
-
-                    if stashed:
-                        yield stashed
-                        stashed = None
-
-                    yield tok
+                    yield (NAME, token, spos, epos, line)
                 elif initial == '\\':                      # continued stmt
                     # This yield is new; needed for better idempotency:
-                    if stashed:
-                        yield stashed
-                        stashed = None
                     yield (NL, token, spos, (lnum, pos), line)
                     continued = 1
                 else:
                     if initial in '([{': parenlev = parenlev + 1
                     elif initial in ')]}': parenlev = parenlev - 1
-                    if stashed:
-                        yield stashed
-                        stashed = None
                     yield (OP, token, spos, epos, line)
             else:
                 yield (ERRORTOKEN, line[pos],
                            (lnum, pos), (lnum, pos+1), line)
                 pos = pos + 1
 
-    if stashed:
-        yield stashed
-        stashed = None
-
     for indent in indents[1:]:                 # pop remaining indent levels
         yield (DEDENT, '', (lnum, 0), (lnum, 0), '')
     yield (ENDMARKER, '', (lnum, 0), (lnum, 0), '')
diff --git a/Lib/lib2to3/tests/test_parser.py b/Lib/lib2to3/tests/test_parser.py
index 2efcb80c2f9..dc94a69036a 100644
--- a/Lib/lib2to3/tests/test_parser.py
+++ b/Lib/lib2to3/tests/test_parser.py
@@ -167,34 +167,34 @@ def foo(): pass
             async def foo(): await x
         """)
 
-        self.invalid_syntax("await x")
-        self.invalid_syntax("""def foo():
-                                   await x""")
+        self.validate("await x")
+        self.validate("""def foo():
+                        await x""")
 
-        self.invalid_syntax("""def foo():
+        self.validate("""def foo():
             def foo(): pass
             async def foo(): pass
             await x
         """)
 
     def test_async_var(self):
-        self.validate("""async = 1""")
-        self.validate("""await = 1""")
-        self.validate("""def async(): pass""")
+        self.invalid_syntax("""async = 1""")
+        self.invalid_syntax("""await = 1""")
+        self.invalid_syntax("""def async(): pass""")
 
     def test_async_with(self):
         self.validate("""async def foo():
                              async for a in b: pass""")
 
-        self.invalid_syntax("""def foo():
-                                   async for a in b: pass""")
+        self.validate("""def foo():
+                             async for a in b: pass""")
 
     def test_async_for(self):
         self.validate("""async def foo():
                              async with a: pass""")
 
-        self.invalid_syntax("""def foo():
-                                   async with a: pass""")
+        self.validate("""def foo():
+                             async with a: pass""")
 
 
 class TestRaiseChanges(GrammarTest):
@@ -477,3 +477,7 @@ def diff(fn, result):
             os.remove("@")
         except OSError:
             pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 8dc3c0ace3c..01f7a32f454 100644
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1703,7 +1703,7 @@ class Helper:
     # in pydoc_data/topics.py.
     #
     # CAUTION: if you change one of these dictionaries, be sure to adapt the
-    #          list of needed labels in Doc/tools/pyspecific.py and
+    #          list of needed labels in Doc/tools/extensions/pyspecific.py and
     #          regenerate the pydoc_data/topics.py file by running
     #              make pydoc-topics
     #          in Doc/ and copying the output file into the Lib/ directory.
@@ -1715,6 +1715,8 @@ class Helper:
         'and': 'BOOLEAN',
         'as': 'with',
         'assert': ('assert', ''),
+        'async': ('async', ''),
+        'await': ('await', ''),
         'break': ('break', 'while for'),
         'class': ('class', 'CLASSES SPECIALMETHODS'),
         'continue': ('continue', 'while for'),
diff --git a/Lib/symbol.py b/Lib/symbol.py
index d9f01e081a7..dc7dcba5e4d 100755
--- a/Lib/symbol.py
+++ b/Lib/symbol.py
@@ -91,11 +91,12 @@
 arglist = 334
 argument = 335
 comp_iter = 336
-comp_for = 337
-comp_if = 338
-encoding_decl = 339
-yield_expr = 340
-yield_arg = 341
+sync_comp_for = 337
+comp_for = 338
+comp_if = 339
+encoding_decl = 340
+yield_expr = 341
+yield_arg = 342
 #--end constants--
 
 sym_name = {}
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 7ff56b560b6..e23963a6221 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -231,12 +231,6 @@ def test_ensure_future_neither(self):
         with self.assertRaises(TypeError):
             asyncio.ensure_future('ok')
 
-    def test_async_warning(self):
-        f = self.new_future(self.loop)
-        with self.assertWarnsRegex(DeprecationWarning,
-                                   'function is deprecated, use ensure_'):
-            self.assertIs(f, asyncio.async(f))
-
     def test_get_stack(self):
         T = None
 
diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
index 2b79a17ea70..ebd880bab0c 100644
--- a/Lib/test/test_coroutines.py
+++ b/Lib/test/test_coroutines.py
@@ -394,20 +394,14 @@ def async(): pass
         ]
 
         for code in samples:
-            with self.subTest(code=code), self.assertWarnsRegex(
-                    DeprecationWarning,
-                    "'await' will become reserved keywords"):
+            with self.subTest(code=code), self.assertRaises(SyntaxError):
                 compile(code, "<test>", "exec")
 
     def test_badsyntax_3(self):
-        with self.assertRaises(DeprecationWarning):
-            with warnings.catch_warnings():
-                warnings.simplefilter("error")
-                compile("async = 1", "<test>", "exec")
-
-    def test_goodsyntax_1(self):
-        # Tests for issue 24619
+        with self.assertRaises(SyntaxError):
+            compile("async = 1", "<test>", "exec")
 
+    def test_badsyntax_4(self):
         samples = [
             '''def foo(await):
                 async def foo(): pass
@@ -454,14 +448,8 @@ def foo(): pass
         ]
 
         for code in samples:
-            with self.subTest(code=code):
-                loc = {}
-
-                with warnings.catch_warnings():
-                    warnings.simplefilter("ignore")
-                    exec(code, loc, loc)
-
-                self.assertEqual(loc['foo'](10), 11)
+            with self.subTest(code=code), self.assertRaises(SyntaxError):
+                compile(code, "<test>", "exec")
 
 
 class TokenizerRegrTest(unittest.TestCase):
diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py
index 70cabb28598..647d391c798 100644
--- a/Lib/test/test_parser.py
+++ b/Lib/test/test_parser.py
@@ -679,16 +679,16 @@ def test_missing_import_source(self):
     def test_illegal_encoding(self):
         # Illegal encoding declaration
         tree = \
-            (339,
+            (340,
              (257, (0, '')))
         self.check_bad_tree(tree, "missed encoding")
         tree = \
-            (339,
+            (340,
              (257, (0, '')),
               b'iso-8859-1')
         self.check_bad_tree(tree, "non-string encoding")
         tree = \
-            (339,
+            (340,
              (257, (0, '')),
               '\udcff')
         with self.assertRaises(UnicodeEncodeError):
diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 21eee6de2d1..3520a67bd42 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -759,7 +759,7 @@ def test_async(self):
     """)
 
         self.check_tokenize("async def foo(): pass", """\
-    ASYNC      'async'       (1, 0) (1, 5)
+    NAME       'async'       (1, 0) (1, 5)
     NAME       'def'         (1, 6) (1, 9)
     NAME       'foo'         (1, 10) (1, 13)
     OP         '('           (1, 13) (1, 14)
@@ -776,7 +776,7 @@ def foo(await):
     await
 async += 1
 ''', """\
-    ASYNC      'async'       (1, 0) (1, 5)
+    NAME       'async'       (1, 0) (1, 5)
     NAME       'def'         (1, 6) (1, 9)
     NAME       'foo'         (1, 10) (1, 13)
     OP         '('           (1, 13) (1, 14)
@@ -787,12 +787,12 @@ def foo(await):
     NAME       'def'         (2, 2) (2, 5)
     NAME       'foo'         (2, 6) (2, 9)
     OP         '('           (2, 9) (2, 10)
-    AWAIT      'await'       (2, 10) (2, 15)
+    NAME       'await'       (2, 10) (2, 15)
     OP         ')'           (2, 15) (2, 16)
     OP         ':'           (2, 16) (2, 17)
     NEWLINE    '\\n'          (2, 17) (2, 18)
     INDENT     '    '        (3, 0) (3, 4)
-    AWAIT      'await'       (3, 4) (3, 9)
+    NAME       'await'       (3, 4) (3, 9)
     OP         '='           (3, 10) (3, 11)
     NUMBER     '1'           (3, 12) (3, 13)
     NEWLINE    '\\n'          (3, 13) (3, 14)
@@ -802,7 +802,7 @@ def foo(await):
     OP         ':'           (4, 6) (4, 7)
     NEWLINE    '\\n'          (4, 7) (4, 8)
     INDENT     '    '        (5, 0) (5, 4)
-    AWAIT      'await'       (5, 4) (5, 9)
+    NAME       'await'       (5, 4) (5, 9)
     NEWLINE    '\\n'          (5, 9) (5, 10)
     DEDENT     ''            (6, 0) (6, 0)
     DEDENT     ''            (6, 0) (6, 0)
@@ -815,7 +815,7 @@ def foo(await):
         self.check_tokenize('''\
 async def foo():
   async for i in 1: pass''', """\
-    ASYNC      'async'       (1, 0) (1, 5)
+    NAME       'async'       (1, 0) (1, 5)
     NAME       'def'         (1, 6) (1, 9)
     NAME       'foo'         (1, 10) (1, 13)
     OP         '('           (1, 13) (1, 14)
@@ -823,7 +823,7 @@ def foo(await):
     OP         ':'           (1, 15) (1, 16)
     NEWLINE    '\\n'          (1, 16) (1, 17)
     INDENT     '  '          (2, 0) (2, 2)
-    ASYNC      'async'       (2, 2) (2, 7)
+    NAME       'async'       (2, 2) (2, 7)
     NAME       'for'         (2, 8) (2, 11)
     NAME       'i'           (2, 12) (2, 13)
     NAME       'in'          (2, 14) (2, 16)
@@ -834,14 +834,14 @@ def foo(await):
     """)
 
         self.check_tokenize('''async def foo(async): await''', """\
-    ASYNC      'async'       (1, 0) (1, 5)
+    NAME       'async'       (1, 0) (1, 5)
     NAME       'def'         (1, 6) (1, 9)
     NAME       'foo'         (1, 10) (1, 13)
     OP         '('           (1, 13) (1, 14)
-    ASYNC      'async'       (1, 14) (1, 19)
+    NAME       'async'       (1, 14) (1, 19)
     OP         ')'           (1, 19) (1, 20)
     OP         ':'           (1, 20) (1, 21)
-    AWAIT      'await'       (1, 22) (1, 27)
+    NAME       'await'       (1, 22) (1, 27)
     """)
 
         self.check_tokenize('''\
@@ -866,7 +866,7 @@ def baz(): pass
     OP         ':'           (3, 11) (3, 12)
     NAME       'pass'        (3, 13) (3, 17)
     NEWLINE    '\\n'          (3, 17) (3, 18)
-    ASYNC      'async'       (4, 2) (4, 7)
+    NAME       'async'       (4, 2) (4, 7)
     NAME       'def'         (4, 8) (4, 11)
     NAME       'bar'         (4, 12) (4, 15)
     OP         '('           (4, 15) (4, 16)
@@ -888,7 +888,7 @@ def baz(): pass
   async def bar(): pass
 
   await = 2''', """\
-    ASYNC      'async'       (1, 0) (1, 5)
+    NAME       'async'       (1, 0) (1, 5)
     NAME       'def'         (1, 6) (1, 9)
     NAME       'f'           (1, 10) (1, 11)
     OP         '('           (1, 11) (1, 12)
@@ -904,7 +904,7 @@ def baz(): pass
     OP         ':'           (3, 11) (3, 12)
     NAME       'pass'        (3, 13) (3, 17)
     NEWLINE    '\\n'          (3, 17) (3, 18)
-    ASYNC      'async'       (4, 2) (4, 7)
+    NAME       'async'       (4, 2) (4, 7)
     NAME       'def'         (4, 8) (4, 11)
     NAME       'bar'         (4, 12) (4, 15)
     OP         '('           (4, 15) (4, 16)
@@ -913,7 +913,7 @@ def baz(): pass
     NAME       'pass'        (4, 19) (4, 23)
     NEWLINE    '\\n'          (4, 23) (4, 24)
     NL         '\\n'          (5, 0) (5, 1)
-    AWAIT      'await'       (6, 2) (6, 7)
+    NAME       'await'       (6, 2) (6, 7)
     OP         '='           (6, 8) (6, 9)
     NUMBER     '2'           (6, 10) (6, 11)
     DEDENT     ''            (7, 0) (7, 0)
diff --git a/Lib/tokenize.py b/Lib/tokenize.py
index 5fa41526093..f5c6ac7f5e0 100644
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -491,12 +491,6 @@ def _tokenize(readline, encoding):
     contline = None
     indents = [0]
 
-    # 'stashed' and 'async_*' are used for async/await parsing
-    stashed = None
-    async_def = False
-    async_def_indent = 0
-    async_def_nl = False
-
     if encoding is not None:
         if encoding == "utf-8-sig":
             # BOM will already have been stripped.
@@ -571,18 +565,8 @@ def _tokenize(readline, encoding):
                         ("<tokenize>", lnum, pos, line))
                 indents = indents[:-1]
 
-                if async_def and async_def_indent >= indents[-1]:
-                    async_def = False
-                    async_def_nl = False
-                    async_def_indent = 0
-
                 yield TokenInfo(DEDENT, '', (lnum, pos), (lnum, pos), line)
 
-            if async_def and async_def_nl and async_def_indent >= indents[-1]:
-                async_def = False
-                async_def_nl = False
-                async_def_indent = 0
-
         else:                                  # continued statement
             if not line:
                 raise TokenError("EOF in multi-line statement", (lnum, 0))
@@ -601,21 +585,13 @@ def _tokenize(readline, encoding):
                     (initial == '.' and token != '.' and token != '...')):
                     yield TokenInfo(NUMBER, token, spos, epos, line)
                 elif initial in '\r\n':
-                    if stashed:
-                        yield stashed
-                        stashed = None
                     if parenlev > 0:
                         yield TokenInfo(NL, token, spos, epos, line)
                     else:
                         yield TokenInfo(NEWLINE, token, spos, epos, line)
-                        if async_def:
-                            async_def_nl = True
 
                 elif initial == '#':
                     assert not token.endswith("\n")
-                    if stashed:
-                        yield stashed
-                        stashed = None
                     yield TokenInfo(COMMENT, token, spos, epos, line)
 
                 elif token in triple_quoted:
@@ -662,36 +638,7 @@ def _tokenize(readline, encoding):
                         yield TokenInfo(STRING, token, spos, epos, line)
 
                 elif initial.isidentifier():               # ordinary name
-                    if token in ('async', 'await'):
-                        if async_def:
-                            yield TokenInfo(
-                                ASYNC if token == 'async' else AWAIT,
-                                token, spos, epos, line)
-                            continue
-
-                    tok = TokenInfo(NAME, token, spos, epos, line)
-                    if token == 'async' and not stashed:
-                        stashed = tok
-                        continue
-
-                    if token == 'def':
-                        if (stashed
-                                and stashed.type == NAME
-                                and stashed.string == 'async'):
-
-                            async_def = True
-                            async_def_indent = indents[-1]
-
-                            yield TokenInfo(ASYNC, stashed.string,
-                                            stashed.start, stashed.end,
-                                            stashed.line)
-                            stashed = None
-
-                    if stashed:
-                        yield stashed
-                        stashed = None
-
-                    yield tok
+                    yield TokenInfo(NAME, token, spos, epos, line)
                 elif initial == '\\':                      # continued stmt
                     continued = 1
                 else:
@@ -699,19 +646,12 @@ def _tokenize(readline, encoding):
                         parenlev += 1
                     elif initial in ')]}':
                         parenlev -= 1
-                    if stashed:
-                        yield stashed
-                        stashed = None
                     yield TokenInfo(OP, token, spos, epos, line)
             else:
                 yield TokenInfo(ERRORTOKEN, line[pos],
                            (lnum, pos), (lnum, pos+1), line)
                 pos += 1
 
-    if stashed:
-        yield stashed
-        stashed = None
-
     for indent in indents[1:]:                 # pop remaining indent levels
         yield TokenInfo(DEDENT, '', (lnum, 0), (lnum, 0), '')
     yield TokenInfo(ENDMARKER, '', (lnum, 0), (lnum, 0), '')
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-07-20-22-03-44.bpo-30406._kr47t.rst b/Misc/NEWS.d/next/Core and Builtins/2017-07-20-22-03-44.bpo-30406._kr47t.rst
new file mode 100644
index 00000000000..caf56f03783
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-07-20-22-03-44.bpo-30406._kr47t.rst	
@@ -0,0 +1 @@
+Make ``async`` and ``await`` proper keywords, as specified in PEP 492.
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index 51f98e9b2e9..28254e10331 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -103,8 +103,6 @@ const char *_PyParser_TokenNames[] = {
     "ELLIPSIS",
     /* This table must match the #defines in token.h! */
     "OP",
-    "AWAIT",
-    "ASYNC",
     "<ERRORTOKEN>",
     "COMMENT",
     "NL",
@@ -151,10 +149,6 @@ tok_new(void)
     tok->decoding_buffer = NULL;
 #endif
 
-    tok->async_def = 0;
-    tok->async_def_indent = 0;
-    tok->async_def_nl = 0;
-
     return tok;
 }
 
@@ -1471,21 +1465,6 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end)
         }
     }
 
-    if (tok->async_def
-        && !blankline
-        && tok->level == 0
-        /* There was a NEWLINE after ASYNC DEF,
-           so we're past the signature. */
-        && tok->async_def_nl
-        /* Current indentation level is less than where
-           the async function was defined */
-        && tok->async_def_indent >= tok->indent)
-    {
-        tok->async_def = 0;
-        tok->async_def_indent = 0;
-        tok->async_def_nl = 0;
-    }
-
  again:
     tok->start = NULL;
     /* Skip spaces */
@@ -1550,43 +1529,6 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end)
         *p_start = tok->start;
         *p_end = tok->cur;
 
-        /* async/await parsing block. */
-        if (tok->cur - tok->start == 5) {
-            /* Current token length is 5. */
-            if (tok->async_def) {
-                /* We're inside an 'async def' function. */
-                if (memcmp(tok->start, "async", 5) == 0) {
-                    return ASYNC;
-                }
-                if (memcmp(tok->start, "await", 5) == 0) {
-                    return AWAIT;
-                }
-            }
-            else if (memcmp(tok->start, "async", 5) == 0) {
-                /* The current token is 'async'.
-                   Look ahead one token.*/
-
-                struct tok_state ahead_tok;
-                char *ahead_tok_start = NULL, *ahead_tok_end = NULL;
-                int ahead_tok_kind;
-
-                memcpy(&ahead_tok, tok, sizeof(ahead_tok));
-                ahead_tok_kind = tok_get(&ahead_tok, &ahead_tok_start,
-                                         &ahead_tok_end);
-
-                if (ahead_tok_kind == NAME
-                    && ahead_tok.cur - ahead_tok.start == 3
-                    && memcmp(ahead_tok.start, "def", 3) == 0)
-                {
-                    /* The next token is going to be 'def', so instead of
-                       returning 'async' NAME token, we return ASYNC. */
-                    tok->async_def_indent = tok->indent;
-                    tok->async_def = 1;
-                    return ASYNC;
-                }
-            }
-        }
-
         return NAME;
     }
 
@@ -1599,11 +1541,6 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end)
         *p_start = tok->start;
         *p_end = tok->cur - 1; /* Leave '\n' out of the string */
         tok->cont_line = 0;
-        if (tok->async_def) {
-            /* We're somewhere inside an 'async def' function, and
-               we've encountered a NEWLINE after its signature. */
-            tok->async_def_nl = 1;
-        }
         return NEWLINE;
     }
 
diff --git a/Parser/tokenizer.h b/Parser/tokenizer.h
index 0ad3551c894..ad8b1c80171 100644
--- a/Parser/tokenizer.h
+++ b/Parser/tokenizer.h
@@ -65,13 +65,6 @@ struct tok_state {
     const char* enc;        /* Encoding for the current str. */
     const char* str;
     const char* input; /* Tokenizer's newline translated copy of the string. */
-
-    /* async/await related fields; can be removed in 3.7 when async and await
-       become normal keywords. */
-    int async_def;        /* =1 if tokens are inside an 'async def' body. */
-    int async_def_indent; /* Indentation level of the outermost 'async def'. */
-    int async_def_nl;     /* =1 if the outermost 'async def' had at least one
-                             NEWLINE token after it. */
 };
 
 extern struct tok_state *PyTokenizer_FromString(const char *, int);
diff --git a/Python/ast.c b/Python/ast.c
index 33356da0756..6989965efab 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -949,28 +949,6 @@ forbidden_name(struct compiling *c, identifier name, const node *n,
         ast_error(c, n, "assignment to keyword");
         return 1;
     }
-    if (_PyUnicode_EqualToASCIIString(name, "async") ||
-        _PyUnicode_EqualToASCIIString(name, "await"))
-    {
-        PyObject *message = PyUnicode_FromString(
-            "'async' and 'await' will become reserved keywords"
-            " in Python 3.7");
-        int ret;
-        if (message == NULL) {
-            return 1;
-        }
-        ret = PyErr_WarnExplicitObject(
-                PyExc_DeprecationWarning,
-                message,
-                c->c_filename,
-                LINENO(n),
-                NULL,
-                NULL);
-        Py_DECREF(message);
-        if (ret < 0) {
-            return 1;
-        }
-    }
     if (full_checks) {
         const char * const *p;
         for (p = FORBIDDEN; *p; p++) {
@@ -1642,9 +1620,10 @@ ast_for_funcdef_impl(struct compiling *c, const node *n,
 static stmt_ty
 ast_for_async_funcdef(struct compiling *c, const node *n, asdl_seq *decorator_seq)
 {
-    /* async_funcdef: ASYNC funcdef */
+    /* async_funcdef: 'async' funcdef */
     REQ(n, async_funcdef);
-    REQ(CHILD(n, 0), ASYNC);
+    REQ(CHILD(n, 0), NAME);
+    assert(strcmp(STR(CHILD(n, 0)), "async") == 0);
     REQ(CHILD(n, 1), funcdef);
 
     return ast_for_funcdef_impl(c, CHILD(n, 1), decorator_seq,
@@ -1663,9 +1642,10 @@ ast_for_funcdef(struct compiling *c, const node *n, asdl_seq *decorator_seq)
 static stmt_ty
 ast_for_async_stmt(struct compiling *c, const node *n)
 {
-    /* async_stmt: ASYNC (funcdef | with_stmt | for_stmt) */
+    /* async_stmt: 'async' (funcdef | with_stmt | for_stmt) */
     REQ(n, async_stmt);
-    REQ(CHILD(n, 0), ASYNC);
+    REQ(CHILD(n, 0), NAME);
+    assert(strcmp(STR(CHILD(n, 0)), "async") == 0);
 
     switch (TYPE(CHILD(n, 1))) {
         case funcdef:
@@ -1778,17 +1758,23 @@ static int
 count_comp_fors(struct compiling *c, const node *n)
 {
     int n_fors = 0;
-    int is_async;
 
   count_comp_for:
-    is_async = 0;
     n_fors++;
     REQ(n, comp_for);
-    if (TYPE(CHILD(n, 0)) == ASYNC) {
-        is_async = 1;
+    if (NCH(n) == 2) {
+        REQ(CHILD(n, 0), NAME);
+        assert(strcmp(STR(CHILD(n, 0)), "async") == 0);
+        n = CHILD(n, 1);
     }
-    if (NCH(n) == (5 + is_async)) {
-        n = CHILD(n, 4 + is_async);
+    else if (NCH(n) == 1) {
+        n = CHILD(n, 0);
+    }
+    else {
+        goto error;
+    }
+    if (NCH(n) == (5)) {
+        n = CHILD(n, 4);
     }
     else {
         return n_fors;
@@ -1807,6 +1793,7 @@ count_comp_fors(struct compiling *c, const node *n)
             return n_fors;
     }
 
+  error:
     /* Should never be reached */
     PyErr_SetString(PyExc_SystemError,
                     "logic error in count_comp_fors");
@@ -1855,19 +1842,27 @@ ast_for_comprehension(struct compiling *c, const node *n)
         asdl_seq *t;
         expr_ty expression, first;
         node *for_ch;
+        node *sync_n;
         int is_async = 0;
 
         REQ(n, comp_for);
 
-        if (TYPE(CHILD(n, 0)) == ASYNC) {
+        if (NCH(n) == 2) {
             is_async = 1;
+            REQ(CHILD(n, 0), NAME);
+            assert(strcmp(STR(CHILD(n, 0)), "async") == 0);
+            sync_n = CHILD(n, 1);
+        }
+        else {
+            sync_n = CHILD(n, 0);
         }
+        REQ(sync_n, sync_comp_for);
 
-        for_ch = CHILD(n, 1 + is_async);
+        for_ch = CHILD(sync_n, 1);
         t = ast_for_exprlist(c, for_ch, Store);
         if (!t)
             return NULL;
-        expression = ast_for_expr(c, CHILD(n, 3 + is_async));
+        expression = ast_for_expr(c, CHILD(sync_n, 3));
         if (!expression)
             return NULL;
 
@@ -1884,11 +1879,11 @@ ast_for_comprehension(struct compiling *c, const node *n)
         if (!comp)
             return NULL;
 
-        if (NCH(n) == (5 + is_async)) {
+        if (NCH(sync_n) == 5) {
             int j, n_ifs;
             asdl_seq *ifs;
 
-            n = CHILD(n, 4 + is_async);
+            n = CHILD(sync_n, 4);
             n_ifs = count_comp_ifs(c, n);
             if (n_ifs == -1)
                 return NULL;
@@ -2470,7 +2465,7 @@ ast_for_atom_expr(struct compiling *c, const node *n)
     REQ(n, atom_expr);
     nch = NCH(n);
 
-    if (TYPE(CHILD(n, 0)) == AWAIT) {
+    if (TYPE(CHILD(n, 0)) == NAME && strcmp(STR(CHILD(n, 0)), "await") == 0) {
         start = 1;
         assert(nch > 1);
     }
@@ -2497,7 +2492,7 @@ ast_for_atom_expr(struct compiling *c, const node *n)
     }
 
     if (start) {
-        /* there was an AWAIT */
+        /* there was an 'await' */
         return Await(e, LINENO(n), n->n_col_offset, c->c_arena);
     }
     else {
@@ -2562,7 +2557,7 @@ ast_for_expr(struct compiling *c, const node *n)
        term: factor (('*'|'@'|'/'|'%'|'//') factor)*
        factor: ('+'|'-'|'~') factor | power
        power: atom_expr ['**' factor]
-       atom_expr: [AWAIT] atom trailer*
+       atom_expr: ['await'] atom trailer*
        yield_expr: 'yield' [yield_arg]
     */
 
diff --git a/Python/graminit.c b/Python/graminit.c
index f2584e0a2ad..8e89ccea3ba 100644
--- a/Python/graminit.c
+++ b/Python/graminit.c
@@ -1812,272 +1812,284 @@ static state states_80[2] = {
     {2, arcs_80_0},
     {1, arcs_80_1},
 };
-static arc arcs_81_0[2] = {
-    {21, 1},
-    {101, 2},
+static arc arcs_81_0[1] = {
+    {101, 1},
 };
 static arc arcs_81_1[1] = {
-    {101, 2},
+    {66, 2},
 };
 static arc arcs_81_2[1] = {
-    {66, 3},
+    {102, 3},
 };
 static arc arcs_81_3[1] = {
-    {102, 4},
+    {112, 4},
 };
-static arc arcs_81_4[1] = {
-    {112, 5},
+static arc arcs_81_4[2] = {
+    {171, 5},
+    {0, 4},
 };
-static arc arcs_81_5[2] = {
-    {171, 6},
+static arc arcs_81_5[1] = {
     {0, 5},
 };
-static arc arcs_81_6[1] = {
-    {0, 6},
-};
-static state states_81[7] = {
-    {2, arcs_81_0},
+static state states_81[6] = {
+    {1, arcs_81_0},
     {1, arcs_81_1},
     {1, arcs_81_2},
     {1, arcs_81_3},
-    {1, arcs_81_4},
-    {2, arcs_81_5},
-    {1, arcs_81_6},
+    {2, arcs_81_4},
+    {1, arcs_81_5},
 };
-static arc arcs_82_0[1] = {
-    {97, 1},
+static arc arcs_82_0[2] = {
+    {21, 1},
+    {173, 2},
 };
 static arc arcs_82_1[1] = {
-    {114, 2},
+    {173, 2},
 };
-static arc arcs_82_2[2] = {
-    {171, 3},
+static arc arcs_82_2[1] = {
     {0, 2},
 };
-static arc arcs_82_3[1] = {
-    {0, 3},
-};
-static state states_82[4] = {
-    {1, arcs_82_0},
+static state states_82[3] = {
+    {2, arcs_82_0},
     {1, arcs_82_1},
-    {2, arcs_82_2},
-    {1, arcs_82_3},
+    {1, arcs_82_2},
 };
 static arc arcs_83_0[1] = {
-    {23, 1},
+    {97, 1},
 };
 static arc arcs_83_1[1] = {
-    {0, 1},
+    {114, 2},
+};
+static arc arcs_83_2[2] = {
+    {171, 3},
+    {0, 2},
+};
+static arc arcs_83_3[1] = {
+    {0, 3},
 };
-static state states_83[2] = {
+static state states_83[4] = {
     {1, arcs_83_0},
     {1, arcs_83_1},
+    {2, arcs_83_2},
+    {1, arcs_83_3},
 };
 static arc arcs_84_0[1] = {
-    {174, 1},
+    {23, 1},
 };
-static arc arcs_84_1[2] = {
-    {175, 2},
+static arc arcs_84_1[1] = {
     {0, 1},
 };
-static arc arcs_84_2[1] = {
+static state states_84[2] = {
+    {1, arcs_84_0},
+    {1, arcs_84_1},
+};
+static arc arcs_85_0[1] = {
+    {175, 1},
+};
+static arc arcs_85_1[2] = {
+    {176, 2},
+    {0, 1},
+};
+static arc arcs_85_2[1] = {
     {0, 2},
 };
-static state states_84[3] = {
-    {1, arcs_84_0},
-    {2, arcs_84_1},
-    {1, arcs_84_2},
+static state states_85[3] = {
+    {1, arcs_85_0},
+    {2, arcs_85_1},
+    {1, arcs_85_2},
 };
-static arc arcs_85_0[2] = {
+static arc arcs_86_0[2] = {
     {77, 1},
     {9, 2},
 };
-static arc arcs_85_1[1] = {
+static arc arcs_86_1[1] = {
     {26, 2},
 };
-static arc arcs_85_2[1] = {
+static arc arcs_86_2[1] = {
     {0, 2},
 };
-static state states_85[3] = {
-    {2, arcs_85_0},
-    {1, arcs_85_1},
-    {1, arcs_85_2},
+static state states_86[3] = {
+    {2, arcs_86_0},
+    {1, arcs_86_1},
+    {1, arcs_86_2},
 };
-static dfa dfas[86] = {
+static dfa dfas[87] = {
     {256, "single_input", 0, 3, states_0,
-     "\004\050\340\000\002\000\000\000\012\076\011\007\262\004\020\002\000\300\220\050\037\102"},
+     "\004\050\340\000\002\000\000\000\012\076\011\007\262\004\020\002\000\300\220\050\037\202\000"},
     {257, "file_input", 0, 2, states_1,
-     "\204\050\340\000\002\000\000\000\012\076\011\007\262\004\020\002\000\300\220\050\037\102"},
+     "\204\050\340\000\002\000\000\000\012\076\011\007\262\004\020\002\000\300\220\050\037\202\000"},
     {258, "eval_input", 0, 3, states_2,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"},
     {259, "decorator", 0, 7, states_3,
-     "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {260, "decorators", 0, 2, states_4,
-     "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {261, "decorated", 0, 3, states_5,
-     "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {262, "async_funcdef", 0, 3, states_6,
-     "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {263, "funcdef", 0, 8, states_7,
-     "\000\000\100\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\100\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {264, "parameters", 0, 4, states_8,
-     "\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {265, "typedargslist", 0, 19, states_9,
-     "\000\000\200\000\006\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\200\000\006\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {266, "tfpdef", 0, 4, states_10,
-     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {267, "varargslist", 0, 19, states_11,
-     "\000\000\200\000\006\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\200\000\006\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {268, "vfpdef", 0, 2, states_12,
-     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {269, "stmt", 0, 2, states_13,
-     "\000\050\340\000\002\000\000\000\012\076\011\007\262\004\020\002\000\300\220\050\037\102"},
+     "\000\050\340\000\002\000\000\000\012\076\011\007\262\004\020\002\000\300\220\050\037\202\000"},
     {270, "simple_stmt", 0, 4, states_14,
-     "\000\040\200\000\002\000\000\000\012\076\011\007\000\000\020\002\000\300\220\050\037\100"},
+     "\000\040\200\000\002\000\000\000\012\076\011\007\000\000\020\002\000\300\220\050\037\200\000"},
     {271, "small_stmt", 0, 2, states_15,
-     "\000\040\200\000\002\000\000\000\012\076\011\007\000\000\020\002\000\300\220\050\037\100"},
+     "\000\040\200\000\002\000\000\000\012\076\011\007\000\000\020\002\000\300\220\050\037\200\000"},
     {272, "expr_stmt", 0, 6, states_16,
-     "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"},
+     "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"},
     {273, "annassign", 0, 5, states_17,
-     "\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {274, "testlist_star_expr", 0, 3, states_18,
-     "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"},
+     "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"},
     {275, "augassign", 0, 2, states_19,
-     "\000\000\000\000\000\000\360\377\001\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\360\377\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {276, "del_stmt", 0, 3, states_20,
-     "\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {277, "pass_stmt", 0, 2, states_21,
-     "\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {278, "flow_stmt", 0, 2, states_22,
-     "\000\000\000\000\000\000\000\000\000\036\000\000\000\000\000\000\000\000\000\000\000\100"},
+     "\000\000\000\000\000\000\000\000\000\036\000\000\000\000\000\000\000\000\000\000\000\200\000"},
     {279, "break_stmt", 0, 2, states_23,
-     "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {280, "continue_stmt", 0, 2, states_24,
-     "\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {281, "return_stmt", 0, 3, states_25,
-     "\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {282, "yield_stmt", 0, 2, states_26,
-     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100"},
+     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\200\000"},
     {283, "raise_stmt", 0, 5, states_27,
-     "\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {284, "import_stmt", 0, 2, states_28,
-     "\000\000\000\000\000\000\000\000\000\040\001\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\040\001\000\000\000\000\000\000\000\000\000\000\000\000"},
     {285, "import_name", 0, 3, states_29,
-     "\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000"},
     {286, "import_from", 0, 8, states_30,
-     "\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {287, "import_as_name", 0, 4, states_31,
-     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {288, "dotted_as_name", 0, 4, states_32,
-     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {289, "import_as_names", 0, 3, states_33,
-     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {290, "dotted_as_names", 0, 2, states_34,
-     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {291, "dotted_name", 0, 2, states_35,
-     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {292, "global_stmt", 0, 3, states_36,
-     "\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000"},
     {293, "nonlocal_stmt", 0, 3, states_37,
-     "\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000"},
     {294, "assert_stmt", 0, 5, states_38,
-     "\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000"},
     {295, "compound_stmt", 0, 2, states_39,
-     "\000\010\140\000\000\000\000\000\000\000\000\000\262\004\000\000\000\000\000\000\000\002"},
+     "\000\010\140\000\000\000\000\000\000\000\000\000\262\004\000\000\000\000\000\000\000\002\000"},
     {296, "async_stmt", 0, 3, states_40,
-     "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {297, "if_stmt", 0, 8, states_41,
-     "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000"},
     {298, "while_stmt", 0, 8, states_42,
-     "\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000"},
     {299, "for_stmt", 0, 10, states_43,
-     "\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"},
     {300, "try_stmt", 0, 13, states_44,
-     "\000\000\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000"},
     {301, "with_stmt", 0, 5, states_45,
-     "\000\000\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000"},
     {302, "with_item", 0, 4, states_46,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"},
     {303, "except_clause", 0, 5, states_47,
-     "\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"},
     {304, "suite", 0, 5, states_48,
-     "\004\040\200\000\002\000\000\000\012\076\011\007\000\000\020\002\000\300\220\050\037\100"},
+     "\004\040\200\000\002\000\000\000\012\076\011\007\000\000\020\002\000\300\220\050\037\200\000"},
     {305, "test", 0, 6, states_49,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"},
     {306, "test_nocond", 0, 2, states_50,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"},
     {307, "lambdef", 0, 5, states_51,
-     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000"},
     {308, "lambdef_nocond", 0, 5, states_52,
-     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000"},
     {309, "or_test", 0, 2, states_53,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\002\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\002\000\300\220\050\037\000\000"},
     {310, "and_test", 0, 2, states_54,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\002\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\002\000\300\220\050\037\000\000"},
     {311, "not_test", 0, 3, states_55,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\002\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\002\000\300\220\050\037\000\000"},
     {312, "comparison", 0, 2, states_56,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"},
     {313, "comp_op", 0, 4, states_57,
-     "\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\362\017\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\362\017\000\000\000\000\000\000"},
     {314, "star_expr", 0, 3, states_58,
-     "\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {315, "expr", 0, 2, states_59,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"},
     {316, "xor_expr", 0, 2, states_60,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"},
     {317, "and_expr", 0, 2, states_61,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"},
     {318, "shift_expr", 0, 2, states_62,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"},
     {319, "arith_expr", 0, 2, states_63,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"},
     {320, "term", 0, 2, states_64,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"},
     {321, "factor", 0, 3, states_65,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"},
     {322, "power", 0, 4, states_66,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\200\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\200\050\037\000\000"},
     {323, "atom_expr", 0, 3, states_67,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\200\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\200\050\037\000\000"},
     {324, "atom", 0, 9, states_68,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\050\037\000\000"},
     {325, "testlist_comp", 0, 5, states_69,
-     "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"},
+     "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"},
     {326, "trailer", 0, 7, states_70,
-     "\000\040\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\010\000\000"},
+     "\000\040\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\010\000\000\000"},
     {327, "subscriptlist", 0, 3, states_71,
-     "\000\040\200\010\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"},
+     "\000\040\200\010\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"},
     {328, "subscript", 0, 5, states_72,
-     "\000\040\200\010\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"},
+     "\000\040\200\010\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"},
     {329, "sliceop", 0, 3, states_73,
-     "\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {330, "exprlist", 0, 3, states_74,
-     "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"},
+     "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"},
     {331, "testlist", 0, 3, states_75,
-     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"},
+     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"},
     {332, "dictorsetmaker", 0, 14, states_76,
-     "\000\040\200\000\006\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"},
+     "\000\040\200\000\006\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"},
     {333, "classdef", 0, 8, states_77,
-     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"},
+     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000"},
     {334, "arglist", 0, 3, states_78,
-     "\000\040\200\000\006\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"},
+     "\000\040\200\000\006\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"},
     {335, "argument", 0, 4, states_79,
-     "\000\040\200\000\006\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"},
+     "\000\040\200\000\006\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"},
     {336, "comp_iter", 0, 2, states_80,
-     "\000\000\040\000\000\000\000\000\000\000\000\000\042\000\000\000\000\000\000\000\000\000"},
-    {337, "comp_for", 0, 7, states_81,
-     "\000\000\040\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"},
-    {338, "comp_if", 0, 4, states_82,
-     "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000"},
-    {339, "encoding_decl", 0, 2, states_83,
-     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-    {340, "yield_expr", 0, 3, states_84,
-     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100"},
-    {341, "yield_arg", 0, 3, states_85,
-     "\000\040\200\000\000\000\000\000\000\040\010\000\000\000\020\002\000\300\220\050\037\000"},
-};
-static label labels[176] = {
+     "\000\000\040\000\000\000\000\000\000\000\000\000\042\000\000\000\000\000\000\000\000\000\000"},
+    {337, "sync_comp_for", 0, 6, states_81,
+     "\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"},
+    {338, "comp_for", 0, 3, states_82,
+     "\000\000\040\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"},
+    {339, "comp_if", 0, 4, states_83,
+     "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000"},
+    {340, "encoding_decl", 0, 2, states_84,
+     "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+    {341, "yield_expr", 0, 3, states_85,
+     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\200\000"},
+    {342, "yield_arg", 0, 3, states_86,
+     "\000\040\200\000\000\000\000\000\000\040\010\000\000\000\020\002\000\300\220\050\037\000\000"},
+};
+static label labels[177] = {
     {0, "EMPTY"},
     {256, 0},
     {4, 0},
@@ -2099,7 +2111,7 @@ static label labels[176] = {
     {333, 0},
     {263, 0},
     {262, 0},
-    {55, 0},
+    {1, "async"},
     {1, "def"},
     {1, 0},
     {264, 0},
@@ -2128,7 +2140,7 @@ static label labels[176] = {
     {274, 0},
     {273, 0},
     {275, 0},
-    {340, 0},
+    {341, 0},
     {314, 0},
     {36, 0},
     {37, 0},
@@ -2229,7 +2241,7 @@ static label labels[176] = {
     {31, 0},
     {322, 0},
     {323, 0},
-    {54, 0},
+    {1, "await"},
     {324, 0},
     {326, 0},
     {325, 0},
@@ -2243,21 +2255,22 @@ static label labels[176] = {
     {1, "None"},
     {1, "True"},
     {1, "False"},
-    {337, 0},
+    {338, 0},
     {327, 0},
     {328, 0},
     {329, 0},
     {1, "class"},
     {335, 0},
     {336, 0},
-    {338, 0},
     {339, 0},
+    {337, 0},
+    {340, 0},
     {1, "yield"},
-    {341, 0},
+    {342, 0},
 };
 grammar _PyParser_Grammar = {
-    86,
+    87,
     dfas,
-    {176, labels},
+    {177, labels},
     256
 };


From webhook-mailer at python.org  Fri Oct  6 00:15:17 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Fri, 06 Oct 2017 04:15:17 -0000
Subject: [Python-checkins] closes bpo-31696: don't mention GCC in
 sys.version when building with clang (#3891)
Message-ID: <mailman.53.1507263318.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/7faf7e50757dde2cb8583ee08ef31f4b8312e44f
commit: 7faf7e50757dde2cb8583ee08ef31f4b8312e44f
branch: master
author: Benjamin Peterson <benjamin at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-05T21:15:14-07:00
summary:

closes bpo-31696: don't mention GCC in sys.version when building with clang (#3891)

files:
A Misc/NEWS.d/next/Build/2017-10-04-23-40-32.bpo-31696.Y3_aBV.rst
M Python/getcompiler.c

diff --git a/Misc/NEWS.d/next/Build/2017-10-04-23-40-32.bpo-31696.Y3_aBV.rst b/Misc/NEWS.d/next/Build/2017-10-04-23-40-32.bpo-31696.Y3_aBV.rst
new file mode 100644
index 00000000000..00aae0b8ae1
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2017-10-04-23-40-32.bpo-31696.Y3_aBV.rst
@@ -0,0 +1,2 @@
+Improve compiler version information in :data:`sys.version` when Python is
+built with Clang.
diff --git a/Python/getcompiler.c b/Python/getcompiler.c
index 9d9c33ac2de..59c0dbf92ae 100644
--- a/Python/getcompiler.c
+++ b/Python/getcompiler.c
@@ -5,15 +5,14 @@
 
 #ifndef COMPILER
 
-#ifdef __GNUC__
+// Note the __clang__ conditional has to come before the __GNUC__ one because
+// clang pretends to be GCC.
+#if defined(__clang__)
+#define COMPILER "\n[Clang " __clang_version__ "]"
+#elif defined(__GNUC__)
 #define COMPILER "\n[GCC " __VERSION__ "]"
-#endif
-
-#endif /* !COMPILER */
-
-#ifndef COMPILER
-
-#ifdef __cplusplus
+// Generic fallbacks.
+#elif defined(__cplusplus)
 #define COMPILER "[C++]"
 #else
 #define COMPILER "[C]"


From webhook-mailer at python.org  Fri Oct  6 01:50:45 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Fri, 06 Oct 2017 05:50:45 -0000
Subject: [Python-checkins] weaken pthread_getcpuclockid test (more
 bpo-31596) (#3904)
Message-ID: <mailman.54.1507269047.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/86566702f311f8e90600e85350f6b6769a384ea5
commit: 86566702f311f8e90600e85350f6b6769a384ea5
branch: master
author: Benjamin Peterson <benjamin at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-05T22:50:42-07:00
summary:

weaken pthread_getcpuclockid test (more bpo-31596) (#3904)

There just isn't much we can assert in a portable way.

files:
M Lib/test/test_time.py

diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 1456748ed8e..c92e66bf49a 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -85,20 +85,13 @@ def test_clock_monotonic(self):
                          'need time.pthread_getcpuclockid()')
     @unittest.skipUnless(hasattr(time, 'clock_gettime'),
                          'need time.clock_gettime()')
-    @unittest.skipUnless(hasattr(time, 'CLOCK_THREAD_CPUTIME_ID'),
-                         'need time.CLOCK_THREAD_CPUTIME_ID')
     def test_pthread_getcpuclockid(self):
         clk_id = time.pthread_getcpuclockid(threading.get_ident())
         self.assertTrue(type(clk_id) is int)
         self.assertNotEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID)
-        # This should suffice to show that both calls are measuring the same clock.
         t1 = time.clock_gettime(clk_id)
-        t2 = time.clock_gettime(time.CLOCK_THREAD_CPUTIME_ID)
-        t3 = time.clock_gettime(clk_id)
-        t4 = time.clock_gettime(time.CLOCK_THREAD_CPUTIME_ID)
+        t2 = time.clock_gettime(clk_id)
         self.assertLessEqual(t1, t2)
-        self.assertLessEqual(t2, t3)
-        self.assertLessEqual(t3, t4)
 
     @unittest.skipUnless(hasattr(time, 'clock_getres'),
                          'need time.clock_getres()')


From webhook-mailer at python.org  Fri Oct  6 02:09:00 2017
From: webhook-mailer at python.org (Yury Selivanov)
Date: Fri, 06 Oct 2017 06:09:00 -0000
Subject: [Python-checkins] bpo-31709: Drop support for asynchronous
 __aiter__. (#3903)
Message-ID: <mailman.55.1507270143.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/faa135acbfcd55f79fb97f7525c8aa6f5a5b6a22
commit: faa135acbfcd55f79fb97f7525c8aa6f5a5b6a22
branch: master
author: Yury Selivanov <yury at magic.io>
committer: GitHub <noreply at github.com>
date: 2017-10-06T02:08:57-04:00
summary:

bpo-31709: Drop support for asynchronous __aiter__. (#3903)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-06-00-27-04.bpo-31709._PmU51.rst
M Doc/reference/datamodel.rst
M Include/genobject.h
M Lib/asyncio/streams.py
M Lib/test/test_collections.py
M Lib/test/test_coroutines.py
M Objects/genobject.c
M Python/ceval.c
M Python/compile.c

diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 31a7671f55f..153b58b4fbf 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -2520,9 +2520,8 @@ generators, coroutines do not directly support iteration.
 Asynchronous Iterators
 ----------------------
 
-An *asynchronous iterable* is able to call asynchronous code in its
-``__aiter__`` implementation, and an *asynchronous iterator* can call
-asynchronous code in its ``__anext__`` method.
+An *asynchronous iterator* can call asynchronous code in
+its ``__anext__`` method.
 
 Asynchronous iterators can be used in an :keyword:`async for` statement.
 
@@ -2552,48 +2551,14 @@ An example of an asynchronous iterable object::
 
 .. versionadded:: 3.5
 
-.. note::
+.. versionchanged:: 3.7
+   Prior to Python 3.7, ``__aiter__`` could return an *awaitable*
+   that would resolve to an
+   :term:`asynchronous iterator <asynchronous iterator>`.
 
-   .. versionchanged:: 3.5.2
-      Starting with CPython 3.5.2, ``__aiter__`` can directly return
-      :term:`asynchronous iterators <asynchronous iterator>`.  Returning
-      an :term:`awaitable` object will result in a
-      :exc:`PendingDeprecationWarning`.
-
-      The recommended way of writing backwards compatible code in
-      CPython 3.5.x is to continue returning awaitables from
-      ``__aiter__``.  If you want to avoid the PendingDeprecationWarning
-      and keep the code backwards compatible, the following decorator
-      can be used::
-
-          import functools
-          import sys
-
-          if sys.version_info < (3, 5, 2):
-              def aiter_compat(func):
-                  @functools.wraps(func)
-                  async def wrapper(self):
-                      return func(self)
-                  return wrapper
-          else:
-              def aiter_compat(func):
-                  return func
-
-      Example::
-
-          class AsyncIterator:
-
-              @aiter_compat
-              def __aiter__(self):
-                  return self
-
-              async def __anext__(self):
-                  ...
-
-      Starting with CPython 3.6, the :exc:`PendingDeprecationWarning`
-      will be replaced with the :exc:`DeprecationWarning`.
-      In CPython 3.7, returning an awaitable from ``__aiter__`` will
-      result in a :exc:`RuntimeError`.
+   Starting with Python 3.7, ``__aiter__`` must return an
+   asynchronous iterator object.  Returning anything else
+   will result in a :exc:`TypeError` error.
 
 
 .. _async-context-managers:
diff --git a/Include/genobject.h b/Include/genobject.h
index 8c1825fc070..b9db9f9c1c4 100644
--- a/Include/genobject.h
+++ b/Include/genobject.h
@@ -56,7 +56,6 @@ PyAPI_DATA(PyTypeObject) PyCoro_Type;
 PyAPI_DATA(PyTypeObject) _PyCoroWrapper_Type;
 
 PyAPI_DATA(PyTypeObject) _PyAIterWrapper_Type;
-PyObject *_PyAIterWrapper_New(PyObject *aiter);
 
 #define PyCoro_CheckExact(op) (Py_TYPE(op) == &PyCoro_Type)
 PyObject *_PyCoro_GetAwaitableIter(PyObject *o);
diff --git a/Lib/asyncio/streams.py b/Lib/asyncio/streams.py
index a82cc79acaa..9fda8537686 100644
--- a/Lib/asyncio/streams.py
+++ b/Lib/asyncio/streams.py
@@ -676,20 +676,12 @@ def readexactly(self, n):
         self._maybe_resume_transport()
         return data
 
-    if compat.PY35:
-        @coroutine
-        def __aiter__(self):
-            return self
-
-        @coroutine
-        def __anext__(self):
-            val = yield from self.readline()
-            if val == b'':
-                raise StopAsyncIteration
-            return val
-
-    if compat.PY352:
-        # In Python 3.5.2 and greater, __aiter__ should return
-        # the asynchronous iterator directly.
-        def __aiter__(self):
-            return self
+    def __aiter__(self):
+        return self
+
+    @coroutine
+    def __anext__(self):
+        val = yield from self.readline()
+        if val == b'':
+            raise StopAsyncIteration
+        return val
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index 75defa12739..7e106affbe0 100644
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -660,7 +660,7 @@ def __hash__(self):
 
     def test_AsyncIterable(self):
         class AI:
-            async def __aiter__(self):
+            def __aiter__(self):
                 return self
         self.assertTrue(isinstance(AI(), AsyncIterable))
         self.assertTrue(issubclass(AI, AsyncIterable))
@@ -674,7 +674,7 @@ class AI:
 
     def test_AsyncIterator(self):
         class AI:
-            async def __aiter__(self):
+            def __aiter__(self):
                 return self
             async def __anext__(self):
                 raise StopAsyncIteration
diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
index ebd880bab0c..08035173d99 100644
--- a/Lib/test/test_coroutines.py
+++ b/Lib/test/test_coroutines.py
@@ -1382,7 +1382,7 @@ class AsyncIter:
             def __init__(self):
                 self.i = 0
 
-            async def __aiter__(self):
+            def __aiter__(self):
                 nonlocal aiter_calls
                 aiter_calls += 1
                 return self
@@ -1401,9 +1401,8 @@ def __init__(self):
 
         buffer = []
         async def test1():
-            with self.assertWarnsRegex(DeprecationWarning, "legacy"):
-                async for i1, i2 in AsyncIter():
-                    buffer.append(i1 + i2)
+            async for i1, i2 in AsyncIter():
+                buffer.append(i1 + i2)
 
         yielded, _ = run_async(test1())
         # Make sure that __aiter__ was called only once
@@ -1415,13 +1414,12 @@ def __init__(self):
         buffer = []
         async def test2():
             nonlocal buffer
-            with self.assertWarnsRegex(DeprecationWarning, "legacy"):
-                async for i in AsyncIter():
-                    buffer.append(i[0])
-                    if i[0] == 20:
-                        break
-                else:
-                    buffer.append('what?')
+            async for i in AsyncIter():
+                buffer.append(i[0])
+                if i[0] == 20:
+                    break
+            else:
+                buffer.append('what?')
             buffer.append('end')
 
         yielded, _ = run_async(test2())
@@ -1434,13 +1432,12 @@ def __init__(self):
         buffer = []
         async def test3():
             nonlocal buffer
-            with self.assertWarnsRegex(DeprecationWarning, "legacy"):
-                async for i in AsyncIter():
-                    if i[0] > 20:
-                        continue
-                    buffer.append(i[0])
-                else:
-                    buffer.append('what?')
+            async for i in AsyncIter():
+                if i[0] > 20:
+                    continue
+                buffer.append(i[0])
+            else:
+                buffer.append('what?')
             buffer.append('end')
 
         yielded, _ = run_async(test3())
@@ -1479,7 +1476,7 @@ def __aiter__(self):
 
         with self.assertRaisesRegex(
                 TypeError,
-                r"async for' received an invalid object.*__aiter.*\: I"):
+                r"that does not implement __anext__"):
 
             run_async(foo())
 
@@ -1508,25 +1505,6 @@ def __anext__(self):
 
         self.assertEqual(sys.getrefcount(aiter), refs_before)
 
-    def test_for_5(self):
-        class I:
-            async def __aiter__(self):
-                return self
-
-            def __anext__(self):
-                return 123
-
-        async def foo():
-            with self.assertWarnsRegex(DeprecationWarning, "legacy"):
-                async for i in I():
-                    print('never going to happen')
-
-        with self.assertRaisesRegex(
-                TypeError,
-                "async for' received an invalid object.*__anext.*int"):
-
-            run_async(foo())
-
     def test_for_6(self):
         I = 0
 
@@ -1622,13 +1600,12 @@ def __aiter__(self):
     def test_for_7(self):
         CNT = 0
         class AI:
-            async def __aiter__(self):
+            def __aiter__(self):
                 1/0
         async def foo():
             nonlocal CNT
-            with self.assertWarnsRegex(DeprecationWarning, "legacy"):
-                async for i in AI():
-                    CNT += 1
+            async for i in AI():
+                CNT += 1
             CNT += 10
         with self.assertRaises(ZeroDivisionError):
             run_async(foo())
@@ -1652,37 +1629,6 @@ def __aiter__(self):
                 run_async(foo())
         self.assertEqual(CNT, 0)
 
-    def test_for_9(self):
-        # Test that DeprecationWarning can safely be converted into
-        # an exception (__aiter__ should not have a chance to raise
-        # a ZeroDivisionError.)
-        class AI:
-            async def __aiter__(self):
-                1/0
-        async def foo():
-            async for i in AI():
-                pass
-
-        with self.assertRaises(DeprecationWarning):
-            with warnings.catch_warnings():
-                warnings.simplefilter("error")
-                run_async(foo())
-
-    def test_for_10(self):
-        # Test that DeprecationWarning can safely be converted into
-        # an exception.
-        class AI:
-            async def __aiter__(self):
-                pass
-        async def foo():
-            async for i in AI():
-                pass
-
-        with self.assertRaises(DeprecationWarning):
-            with warnings.catch_warnings():
-                warnings.simplefilter("error")
-                run_async(foo())
-
     def test_for_11(self):
         class F:
             def __aiter__(self):
@@ -1703,24 +1649,6 @@ def __await__(self):
         err = c.exception
         self.assertIsInstance(err.__cause__, ZeroDivisionError)
 
-    def test_for_12(self):
-        class F:
-            def __aiter__(self):
-                return self
-            def __await__(self):
-                1 / 0
-
-        async def main():
-            async for _ in F():
-                pass
-
-        with self.assertRaisesRegex(TypeError,
-                                    'an invalid object from __aiter__') as c:
-            main().send(None)
-
-        err = c.exception
-        self.assertIsInstance(err.__cause__, ZeroDivisionError)
-
     def test_for_tuple(self):
         class Done(Exception): pass
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-06-00-27-04.bpo-31709._PmU51.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-06-00-27-04.bpo-31709._PmU51.rst
new file mode 100644
index 00000000000..6c342eacae3
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-06-00-27-04.bpo-31709._PmU51.rst	
@@ -0,0 +1 @@
+Drop support of asynchronous __aiter__.
diff --git a/Objects/genobject.c b/Objects/genobject.c
index 1a8c37abf23..5d5798c2f48 100644
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -1141,100 +1141,6 @@ PyCoro_New(PyFrameObject *f, PyObject *name, PyObject *qualname)
 }
 
 
-/* __aiter__ wrapper; see http://bugs.python.org/issue27243 for details. */
-
-typedef struct {
-    PyObject_HEAD
-    PyObject *ags_aiter;
-} PyAIterWrapper;
-
-
-static PyObject *
-aiter_wrapper_iternext(PyAIterWrapper *aw)
-{
-    _PyGen_SetStopIterationValue(aw->ags_aiter);
-    return NULL;
-}
-
-static int
-aiter_wrapper_traverse(PyAIterWrapper *aw, visitproc visit, void *arg)
-{
-    Py_VISIT((PyObject *)aw->ags_aiter);
-    return 0;
-}
-
-static void
-aiter_wrapper_dealloc(PyAIterWrapper *aw)
-{
-    _PyObject_GC_UNTRACK((PyObject *)aw);
-    Py_CLEAR(aw->ags_aiter);
-    PyObject_GC_Del(aw);
-}
-
-static PyAsyncMethods aiter_wrapper_as_async = {
-    PyObject_SelfIter,                          /* am_await */
-    0,                                          /* am_aiter */
-    0                                           /* am_anext */
-};
-
-PyTypeObject _PyAIterWrapper_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0)
-    "aiter_wrapper",
-    sizeof(PyAIterWrapper),                     /* tp_basicsize */
-    0,                                          /* tp_itemsize */
-    (destructor)aiter_wrapper_dealloc,          /* destructor tp_dealloc */
-    0,                                          /* tp_print */
-    0,                                          /* tp_getattr */
-    0,                                          /* tp_setattr */
-    &aiter_wrapper_as_async,                    /* tp_as_async */
-    0,                                          /* tp_repr */
-    0,                                          /* tp_as_number */
-    0,                                          /* tp_as_sequence */
-    0,                                          /* tp_as_mapping */
-    0,                                          /* tp_hash */
-    0,                                          /* tp_call */
-    0,                                          /* tp_str */
-    PyObject_GenericGetAttr,                    /* tp_getattro */
-    0,                                          /* tp_setattro */
-    0,                                          /* tp_as_buffer */
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,    /* tp_flags */
-    "A wrapper object for __aiter__ bakwards compatibility.",
-    (traverseproc)aiter_wrapper_traverse,       /* tp_traverse */
-    0,                                          /* tp_clear */
-    0,                                          /* tp_richcompare */
-    0,                                          /* tp_weaklistoffset */
-    PyObject_SelfIter,                          /* tp_iter */
-    (iternextfunc)aiter_wrapper_iternext,       /* tp_iternext */
-    0,                                          /* tp_methods */
-    0,                                          /* tp_members */
-    0,                                          /* tp_getset */
-    0,                                          /* tp_base */
-    0,                                          /* tp_dict */
-    0,                                          /* tp_descr_get */
-    0,                                          /* tp_descr_set */
-    0,                                          /* tp_dictoffset */
-    0,                                          /* tp_init */
-    0,                                          /* tp_alloc */
-    0,                                          /* tp_new */
-    0,                                          /* tp_free */
-};
-
-
-PyObject *
-_PyAIterWrapper_New(PyObject *aiter)
-{
-    PyAIterWrapper *aw = PyObject_GC_New(PyAIterWrapper,
-                                         &_PyAIterWrapper_Type);
-    if (aw == NULL) {
-        return NULL;
-    }
-    Py_INCREF(aiter);
-    aw->ags_aiter = aiter;
-    _PyObject_GC_TRACK(aw);
-    return (PyObject *)aw;
-}
-
-
 /* ========= Asynchronous Generators ========= */
 
 
diff --git a/Python/ceval.c b/Python/ceval.c
index cf0c6c9ae2f..86ffec42b31 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1708,7 +1708,6 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
         TARGET(GET_AITER) {
             unaryfunc getter = NULL;
             PyObject *iter = NULL;
-            PyObject *awaitable = NULL;
             PyObject *obj = TOP();
             PyTypeObject *type = Py_TYPE(obj);
 
@@ -1735,57 +1734,20 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
                 goto error;
             }
 
-            if (Py_TYPE(iter)->tp_as_async != NULL &&
-                    Py_TYPE(iter)->tp_as_async->am_anext != NULL) {
-
-                /* Starting with CPython 3.5.2 __aiter__ should return
-                   asynchronous iterators directly (not awaitables that
-                   resolve to asynchronous iterators.)
-
-                   Therefore, we check if the object that was returned
-                   from __aiter__ has an __anext__ method.  If it does,
-                   we wrap it in an awaitable that resolves to `iter`.
+            if (Py_TYPE(iter)->tp_as_async == NULL ||
+                    Py_TYPE(iter)->tp_as_async->am_anext == NULL) {
 
-                   See http://bugs.python.org/issue27243 for more
-                   details.
-                */
-
-                PyObject *wrapper = _PyAIterWrapper_New(iter);
-                Py_DECREF(iter);
-                SET_TOP(wrapper);
-                DISPATCH();
-            }
-
-            awaitable = _PyCoro_GetAwaitableIter(iter);
-            if (awaitable == NULL) {
-                _PyErr_FormatFromCause(
+                SET_TOP(NULL);
+                PyErr_Format(
                     PyExc_TypeError,
-                    "'async for' received an invalid object "
-                    "from __aiter__: %.100s",
+                    "'async for' received an object from __aiter__ "
+                    "that does not implement __anext__: %.100s",
                     Py_TYPE(iter)->tp_name);
-
-                SET_TOP(NULL);
                 Py_DECREF(iter);
                 goto error;
-            } else {
-                Py_DECREF(iter);
-
-                if (PyErr_WarnFormat(
-                        PyExc_DeprecationWarning, 1,
-                        "'%.100s' implements legacy __aiter__ protocol; "
-                        "__aiter__ should return an asynchronous "
-                        "iterator, not awaitable",
-                        type->tp_name))
-                {
-                    /* Warning was converted to an error. */
-                    Py_DECREF(awaitable);
-                    SET_TOP(NULL);
-                    goto error;
-                }
             }
 
-            SET_TOP(awaitable);
-            PREDICT(LOAD_CONST);
+            SET_TOP(iter);
             DISPATCH();
         }
 
diff --git a/Python/compile.c b/Python/compile.c
index df5070aad2a..431e7531e84 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -2298,8 +2298,6 @@ compiler_async_for(struct compiler *c, stmt_ty s)
 
     VISIT(c, expr, s->v.AsyncFor.iter);
     ADDOP(c, GET_AITER);
-    ADDOP_O(c, LOAD_CONST, Py_None, consts);
-    ADDOP(c, YIELD_FROM);
 
     compiler_use_next_block(c, try);
 
@@ -3867,8 +3865,6 @@ compiler_async_comprehension_generator(struct compiler *c,
         /* Sub-iter - calculate on the fly */
         VISIT(c, expr, gen->iter);
         ADDOP(c, GET_AITER);
-        ADDOP_O(c, LOAD_CONST, Py_None, consts);
-        ADDOP(c, YIELD_FROM);
     }
 
     compiler_use_next_block(c, try);
@@ -4033,8 +4029,6 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type,
 
     if (outermost->is_async) {
         ADDOP(c, GET_AITER);
-        ADDOP_O(c, LOAD_CONST, Py_None, consts);
-        ADDOP(c, YIELD_FROM);
     } else {
         ADDOP(c, GET_ITER);
     }


From webhook-mailer at python.org  Fri Oct  6 02:58:30 2017
From: webhook-mailer at python.org (Yury Selivanov)
Date: Fri, 06 Oct 2017 06:58:30 -0000
Subject: [Python-checkins] bpo-31708: Allow async generator expressions in
 synchronous functions (#3905)
Message-ID: <mailman.56.1507273112.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/b8ab9d3fc816f85f4d6dbef12b7414e6dc10e4dd
commit: b8ab9d3fc816f85f4d6dbef12b7414e6dc10e4dd
branch: master
author: Yury Selivanov <yury at magic.io>
committer: GitHub <noreply at github.com>
date: 2017-10-06T02:58:28-04:00
summary:

bpo-31708: Allow async generator expressions in synchronous functions (#3905)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-06-02-10-48.bpo-31708.66CCVU.rst
M Doc/reference/expressions.rst
M Lib/test/test_asyncgen.py
M Lib/test/test_coroutines.py
M Python/compile.c

diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
index 094b92841e2..1cff8a52df9 100644
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -326,14 +326,16 @@ range(10) for y in bar(x))``.
 The parentheses can be omitted on calls with only one argument.  See section
 :ref:`calls` for details.
 
-Since Python 3.6, if the generator appears in an :keyword:`async def` function,
-then :keyword:`async for` clauses and :keyword:`await` expressions are permitted
-as with an asynchronous comprehension.  If a generator expression
-contains either :keyword:`async for` clauses or :keyword:`await` expressions
-it is called an :dfn:`asynchronous generator expression`.
-An asynchronous generator expression yields a new asynchronous
-generator object, which is an asynchronous iterator
-(see :ref:`async-iterators`).
+If a generator expression contains either :keyword:`async for`
+clauses or :keyword:`await` expressions it is called an
+:dfn:`asynchronous generator expression`.  An asynchronous generator
+expression returns a new asynchronous generator object,
+which is an asynchronous iterator (see :ref:`async-iterators`).
+
+.. versionchanged:: 3.7
+   Prior to Python 3.7, asynchronous generator expressions could
+   only appear in :keyword:`async def` coroutines.  Starting
+   with 3.7, any function can use asynchronous generator expressions.
 
 .. _yieldexpr:
 
diff --git a/Lib/test/test_asyncgen.py b/Lib/test/test_asyncgen.py
index 8c69d2bf45d..5a36423dc97 100644
--- a/Lib/test/test_asyncgen.py
+++ b/Lib/test/test_asyncgen.py
@@ -1037,5 +1037,37 @@ def logger(loop, context):
         t.cancel()
         self.loop.run_until_complete(asyncio.sleep(0.1, loop=self.loop))
 
+    def test_async_gen_expression_01(self):
+        async def arange(n):
+            for i in range(n):
+                await asyncio.sleep(0.01, loop=self.loop)
+                yield i
+
+        def make_arange(n):
+            # This syntax is legal starting with Python 3.7
+            return (i * 2 async for i in arange(n))
+
+        async def run():
+            return [i async for i in make_arange(10)]
+
+        res = self.loop.run_until_complete(run())
+        self.assertEqual(res, [i * 2 for i in range(10)])
+
+    def test_async_gen_expression_02(self):
+        async def wrap(n):
+            await asyncio.sleep(0.01, loop=self.loop)
+            return n
+
+        def make_arange(n):
+            # This syntax is legal starting with Python 3.7
+            return (i * 2 for i in range(n) if await wrap(i))
+
+        async def run():
+            return [i async for i in make_arange(10)]
+
+        res = self.loop.run_until_complete(run())
+        self.assertEqual(res, [i * 2 for i in range(1, 10)])
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
index 08035173d99..d7d38a3bf9d 100644
--- a/Lib/test/test_coroutines.py
+++ b/Lib/test/test_coroutines.py
@@ -150,6 +150,14 @@ def bar():
             """,
 
             """def bar():
+                 {i: i async for i in els}
+            """,
+
+            """def bar():
+                 {i async for i in els}
+            """,
+
+            """def bar():
                  [await i for i in els]
             """,
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-06-02-10-48.bpo-31708.66CCVU.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-06-02-10-48.bpo-31708.66CCVU.rst
new file mode 100644
index 00000000000..f732fee755e
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-06-02-10-48.bpo-31708.66CCVU.rst	
@@ -0,0 +1 @@
+Allow use of asynchronous generator expressions in synchronous functions.
diff --git a/Python/compile.c b/Python/compile.c
index 431e7531e84..58a708ce23e 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -3974,7 +3974,7 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type,
 
     is_async_generator = c->u->u_ste->ste_coroutine;
 
-    if (is_async_generator && !is_async_function) {
+    if (is_async_generator && !is_async_function && type != COMP_GENEXP) {
         if (e->lineno > c->u->u_lineno) {
             c->u->u_lineno = e->lineno;
             c->u->u_lineno_set = 0;


From solipsis at pitrou.net  Fri Oct  6 05:05:44 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 06 Oct 2017 09:05:44 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=-4
Message-ID: <20171006090543.90593.BE6FEE63FCD0CE00@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_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/reflogGu6uli', '--timeout', '7200']

From webhook-mailer at python.org  Fri Oct  6 06:41:38 2017
From: webhook-mailer at python.org (Nick Coghlan)
Date: Fri, 06 Oct 2017 10:41:38 -0000
Subject: [Python-checkins] bpo-25658: Implement PEP 539 for Thread Specific
 Storage (TSS) API (GH-1362)
Message-ID: <mailman.57.1507286500.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/731e18901484c75b60167a06a0ba0719a6d4827d
commit: 731e18901484c75b60167a06a0ba0719a6d4827d
branch: master
author: Masayuki Yamamoto <ma3yuki.8mamo10 at gmail.com>
committer: Nick Coghlan <ncoghlan at gmail.com>
date: 2017-10-06T20:41:34+10:00
summary:

bpo-25658: Implement PEP 539 for Thread Specific Storage (TSS) API (GH-1362)

See PEP 539 for details.

Highlights of changes:

- Add Thread Specific Storage (TSS) API
- Document the Thread Local Storage (TLS) API as deprecated
- Update code that used TLS API to use TSS API

files:
A Misc/NEWS.d/next/C API/2017-06-24-14-30-44.bpo-25658.vm8vGE.rst
M Doc/c-api/init.rst
M Doc/whatsnew/3.7.rst
M Include/internal/pystate.h
M Include/pythread.h
M Modules/_testcapimodule.c
M Modules/_tracemalloc.c
M Modules/faulthandler.c
M Modules/posixmodule.c
M PC/python3.def
M Python/pystate.c
M Python/thread.c
M Python/thread_nt.h
M Python/thread_pthread.h
M Python/traceback.c
M configure
M configure.ac
M pyconfig.h.in

diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index c12e1c7fba3..7792058683d 100644
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -1192,3 +1192,160 @@ These functions are only intended to be used by advanced debugging tools.
    Return the next thread state object after *tstate* from the list of all such
    objects belonging to the same :c:type:`PyInterpreterState` object.
 
+
+.. _thread-local-storage:
+
+Thread Local Storage Support
+============================
+
+.. sectionauthor:: Masayuki Yamamoto <ma3yuki.8mamo10 at gmail.com>
+
+The Python interpreter provides low-level support for thread-local storage
+(TLS) which wraps the underlying native TLS implementation to support the
+Python-level thread local storage API (:class:`threading.local`).  The
+CPython C level APIs are similar to those offered by pthreads and Windows:
+use a thread key and functions to associate a :c:type:`void\*` value per
+thread.
+
+The GIL does *not* need to be held when calling these functions; they supply
+their own locking.
+
+Note that :file:`Python.h` does not include the declaration of the TLS APIs,
+you need to include :file:`pythread.h` to use thread-local storage.
+
+.. note::
+   None of these API functions handle memory management on behalf of the
+   :c:type:`void\*` values.  You need to allocate and deallocate them yourself.
+   If the :c:type:`void\*` values happen to be :c:type:`PyObject\*`, these
+   functions don't do refcount operations on them either.
+
+.. _thread-specific-storage-api:
+
+Thread Specific Storage (TSS) API
+---------------------------------
+
+TSS API is introduced to supersede the use of the existing TLS API within the
+CPython interpreter.  This API uses a new type :c:type:`Py_tss_t` instead of
+:c:type:`int` to represent thread keys.
+
+.. versionadded:: 3.7
+
+.. seealso:: "A New C-API for Thread-Local Storage in CPython" (:pep:`539`)
+
+
+.. c:type:: Py_tss_t
+
+   This data structure represents the state of a thread key, the definition of
+   which may depend on the underlying TLS implementation, and it has an
+   internal field representing the key's initialization state.  There are no
+   public members in this structure.
+
+   When :ref:`Py_LIMITED_API <stable>` is not defined, static allocation of
+   this type by :c:macro:`Py_tss_NEEDS_INIT` is allowed.
+
+
+.. c:macro:: Py_tss_NEEDS_INIT
+
+   This macro expands to the default value for :c:type:`Py_tss_t` variables.
+   Note that this macro won't be defined with :ref:`Py_LIMITED_API <stable>`.
+
+
+Dynamic Allocation
+~~~~~~~~~~~~~~~~~~
+
+Dynamic allocation of the :c:type:`Py_tss_t`, required in extension modules
+built with :ref:`Py_LIMITED_API <stable>`, where static allocation of this type
+is not possible due to its implementation being opaque at build time.
+
+
+.. c:function:: Py_tss_t* PyThread_tss_alloc()
+
+   Return a value which is the same state as a value initialized with
+   :c:macro:`Py_tss_NEEDS_INIT`, or *NULL* in the case of dynamic allocation
+   failure.
+
+
+.. c:function:: void PyThread_tss_free(Py_tss_t *key)
+
+   Free the given *key* allocated by :c:func:`PyThread_tss_alloc`, after
+   first calling :c:func:`PyThread_tss_delete` to ensure any associated
+   thread locals have been unassigned. This is a no-op if the *key*
+   argument is `NULL`.
+
+   .. note::
+      A freed key becomes a dangling pointer, you should reset the key to
+      `NULL`.
+
+
+Methods
+~~~~~~~
+
+The parameter *key* of these functions must not be *NULL*.  Moreover, the
+behaviors of :c:func:`PyThread_tss_set` and :c:func:`PyThread_tss_get` are
+undefined if the given :c:type:`Py_tss_t` has not been initialized by
+:c:func:`PyThread_tss_create`.
+
+
+.. c:function:: int PyThread_tss_is_created(Py_tss_t *key)
+
+   Return a non-zero value if the given :c:type:`Py_tss_t` has been initialized
+   by :c:func:`PyThread_tss_create`.
+
+
+.. c:function:: int PyThread_tss_create(Py_tss_t *key)
+
+   Return a zero value on successful initialization of a TSS key.  The behavior
+   is undefined if the value pointed to by the *key* argument is not
+   initialized by :c:macro:`Py_tss_NEEDS_INIT`.  This function can be called
+   repeatedly on the same key -- calling it on an already initialized key is a
+   no-op and immediately returns success.
+
+
+.. c:function:: void PyThread_tss_delete(Py_tss_t *key)
+
+   Destroy a TSS key to forget the values associated with the key across all
+   threads, and change the key's initialization state to uninitialized.  A
+   destroyed key is able to be initialized again by
+   :c:func:`PyThread_tss_create`. This function can be called repeatedly on
+   the same key -- calling it on an already destroyed key is a no-op.
+
+
+.. c:function:: int PyThread_tss_set(Py_tss_t *key, void *value)
+
+   Return a zero value to indicate successfully associating a :c:type:`void\*`
+   value with a TSS key in the current thread.  Each thread has a distinct
+   mapping of the key to a :c:type:`void\*` value.
+
+
+.. c:function:: void* PyThread_tss_get(Py_tss_t *key)
+
+   Return the :c:type:`void\*` value associated with a TSS key in the current
+   thread.  This returns *NULL* if no value is associated with the key in the
+   current thread.
+
+
+.. _thread-local-storage-api:
+
+Thread Local Storage (TLS) API
+------------------------------
+
+.. deprecated:: 3.7
+   This API is superseded by
+   :ref:`Thread Specific Storage (TSS) API <thread-specific-storage-api>`.
+
+.. note::
+   This version of the API does not support platforms where the native TLS key
+   is defined in a way that cannot be safely cast to ``int``.  On such platforms,
+   :c:func:`PyThread_create_key` will return immediately with a failure status,
+   and the other TLS functions will all be no-ops on such platforms.
+
+Due to the compatibility problem noted above, this version of the API should not
+be used in new code.
+
+.. c:function:: int PyThread_create_key()
+.. c:function:: void PyThread_delete_key(int key)
+.. c:function:: int PyThread_set_key_value(int key, void *value)
+.. c:function:: void* PyThread_get_key_value(int key)
+.. c:function:: void PyThread_delete_key_value(int key)
+.. c:function:: void PyThread_ReInitTLS()
+
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index 3e8617ef2a1..ecdd2fe2713 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -127,6 +127,38 @@ built-in ``breakpoint()``.
       PEP written and implemented by Barry Warsaw
 
 
+.. _whatsnew37-pep539:
+
+PEP 539: A New C-API for Thread-Local Storage in CPython
+--------------------------------------------------------
+
+While Python provides a C API for thread-local storage support; the existing
+:ref:`Thread Local Storage (TLS) API <thread-local-storage-api>` has used
+:c:type:`int` to represent TLS keys across all platforms.  This has not
+generally been a problem for officially-support platforms, but that is neither
+POSIX-compliant, nor portable in any practical sense.
+
+:pep:`539` changes this by providing a new :ref:`Thread Specific Storage (TSS)
+API <thread-specific-storage-api>` to CPython which supersedes use of the
+existing TLS API within the CPython interpreter, while deprecating the existing
+API.  The TSS API uses a new type :c:type:`Py_tss_t` instead of :c:type:`int`
+to represent TSS keys--an opaque type the definition of which may depend on
+the underlying TLS implementation.  Therefore, this will allow to build CPython
+on platforms where the native TLS key is defined in a way that cannot be safely
+cast to :c:type:`int`.
+
+Note that on platforms where the native TLS key is defined in a way that cannot
+be safely cast to :c:type:`int`, all functions of the existing TLS API will be
+no-op and immediately return failure. This indicates clearly that the old API
+is not supported on platforms where it cannot be used reliably, and that no
+effort will be made to add such support.
+
+.. seealso::
+
+    :pep:`539` -- A New C-API for Thread-Local Storage in CPython
+       PEP written by Erik M. Bray; implementation by Masayuki Yamamoto.
+
+
 Other Language Changes
 ======================
 
diff --git a/Include/internal/pystate.h b/Include/internal/pystate.h
index 20c5946b14f..210917bb325 100644
--- a/Include/internal/pystate.h
+++ b/Include/internal/pystate.h
@@ -26,7 +26,7 @@ struct _gilstate_runtime_state {
     */
     /* TODO: Given interp_main, it may be possible to kill this ref */
     PyInterpreterState *autoInterpreterState;
-    int autoTLSkey;
+    Py_tss_t autoTSSkey;
 };
 
 /* hook for PyEval_GetFrame(), requested for Psyco */
diff --git a/Include/pythread.h b/Include/pythread.h
index dbacb8bbbcd..d6674685f28 100644
--- a/Include/pythread.h
+++ b/Include/pythread.h
@@ -29,8 +29,8 @@ PyAPI_FUNC(unsigned long) PyThread_get_thread_ident(void);
 PyAPI_FUNC(PyThread_type_lock) PyThread_allocate_lock(void);
 PyAPI_FUNC(void) PyThread_free_lock(PyThread_type_lock);
 PyAPI_FUNC(int) PyThread_acquire_lock(PyThread_type_lock, int);
-#define WAIT_LOCK	1
-#define NOWAIT_LOCK	0
+#define WAIT_LOCK       1
+#define NOWAIT_LOCK     0
 
 /* PY_TIMEOUT_T is the integral type used to specify timeouts when waiting
    on a lock (see PyThread_acquire_lock_timed() below).
@@ -77,15 +77,69 @@ PyAPI_FUNC(int) PyThread_set_stacksize(size_t);
 PyAPI_FUNC(PyObject*) PyThread_GetInfo(void);
 #endif
 
-/* Thread Local Storage (TLS) API */
-PyAPI_FUNC(int) PyThread_create_key(void);
-PyAPI_FUNC(void) PyThread_delete_key(int);
-PyAPI_FUNC(int) PyThread_set_key_value(int, void *);
-PyAPI_FUNC(void *) PyThread_get_key_value(int);
-PyAPI_FUNC(void) PyThread_delete_key_value(int key);
+
+/* Thread Local Storage (TLS) API
+   TLS API is DEPRECATED.  Use Thread Specific Storage (TSS) API.
+
+   The existing TLS API has used int to represent TLS keys across all
+   platforms, but it is not POSIX-compliant.  Therefore, the new TSS API uses
+   opaque data type to represent TSS keys to be compatible (see PEP 539).
+*/
+PyAPI_FUNC(int) PyThread_create_key(void) Py_DEPRECATED(3.7);
+PyAPI_FUNC(void) PyThread_delete_key(int key) Py_DEPRECATED(3.7);
+PyAPI_FUNC(int) PyThread_set_key_value(int key, void *value) Py_DEPRECATED(3.7);
+PyAPI_FUNC(void *) PyThread_get_key_value(int key) Py_DEPRECATED(3.7);
+PyAPI_FUNC(void) PyThread_delete_key_value(int key) Py_DEPRECATED(3.7);
 
 /* Cleanup after a fork */
-PyAPI_FUNC(void) PyThread_ReInitTLS(void);
+PyAPI_FUNC(void) PyThread_ReInitTLS(void) Py_DEPRECATED(3.7);
+
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
+/* New in 3.7 */
+/* Thread Specific Storage (TSS) API */
+
+typedef struct _Py_tss_t Py_tss_t;  /* opaque */
+
+#ifndef Py_LIMITED_API
+#if defined(_POSIX_THREADS)
+    /* Darwin needs pthread.h to know type name the pthread_key_t. */
+#   include <pthread.h>
+#   define NATIVE_TSS_KEY_T     pthread_key_t
+#elif defined(NT_THREADS)
+    /* In Windows, native TSS key type is DWORD,
+       but hardcode the unsigned long to avoid errors for include directive.
+    */
+#   define NATIVE_TSS_KEY_T     unsigned long
+#else
+#   error "Require native threads. See https://bugs.python.org/issue31370"
+#endif
+
+/* When Py_LIMITED_API is not defined, the type layout of Py_tss_t is
+   exposed to allow static allocation in the API clients.  Even in this case,
+   you must handle TSS keys through API functions due to compatibility.
+*/
+struct _Py_tss_t {
+    int _is_initialized;
+    NATIVE_TSS_KEY_T _key;
+};
+
+#undef NATIVE_TSS_KEY_T
+
+/* When static allocation, you must initialize with Py_tss_NEEDS_INIT. */
+#define Py_tss_NEEDS_INIT   {0}
+#endif  /* !Py_LIMITED_API */
+
+PyAPI_FUNC(Py_tss_t *) PyThread_tss_alloc(void);
+PyAPI_FUNC(void) PyThread_tss_free(Py_tss_t *key);
+
+/* The parameter key must not be NULL. */
+PyAPI_FUNC(int) PyThread_tss_is_created(Py_tss_t *key);
+PyAPI_FUNC(int) PyThread_tss_create(Py_tss_t *key);
+PyAPI_FUNC(void) PyThread_tss_delete(Py_tss_t *key);
+PyAPI_FUNC(int) PyThread_tss_set(Py_tss_t *key, void *value);
+PyAPI_FUNC(void *) PyThread_tss_get(Py_tss_t *key);
+#endif  /* New in 3.7 */
 
 #ifdef __cplusplus
 }
diff --git a/Misc/NEWS.d/next/C API/2017-06-24-14-30-44.bpo-25658.vm8vGE.rst b/Misc/NEWS.d/next/C API/2017-06-24-14-30-44.bpo-25658.vm8vGE.rst
new file mode 100644
index 00000000000..d4bb19acc4b
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2017-06-24-14-30-44.bpo-25658.vm8vGE.rst	
@@ -0,0 +1,4 @@
+Implement PEP 539 for Thread Specific Stroage (TSS) API: it is a new Thread
+Local Storage (TLS) API to CPython which would supersede use of the existing
+TLS API within the CPython interpreter, while deprecating the existing API.
+PEP written by Erik M. Bray, patch by Masayuki Yamamoto.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 1a296214739..b512c05a3fe 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -4306,6 +4306,61 @@ py_w_stopcode(PyObject *self, PyObject *args)
 #endif
 
 
+static PyObject *
+test_pythread_tss_key_state(PyObject *self, PyObject *args)
+{
+    Py_tss_t tss_key = Py_tss_NEEDS_INIT;
+    if (PyThread_tss_is_created(&tss_key)) {
+        return raiseTestError("test_pythread_tss_key_state",
+                              "TSS key not in an uninitialized state at "
+                              "creation time");
+    }
+    if (PyThread_tss_create(&tss_key) != 0) {
+        PyErr_SetString(PyExc_RuntimeError, "PyThread_tss_create failed");
+        return NULL;
+    }
+    if (!PyThread_tss_is_created(&tss_key)) {
+        return raiseTestError("test_pythread_tss_key_state",
+                              "PyThread_tss_create succeeded, "
+                              "but with TSS key in an uninitialized state");
+    }
+    if (PyThread_tss_create(&tss_key) != 0) {
+        return raiseTestError("test_pythread_tss_key_state",
+                              "PyThread_tss_create unsuccessful with "
+                              "an already initialized key");
+    }
+#define CHECK_TSS_API(expr) \
+        (void)(expr); \
+        if (!PyThread_tss_is_created(&tss_key)) { \
+            return raiseTestError("test_pythread_tss_key_state", \
+                                  "TSS key initialization state was not " \
+                                  "preserved after calling " #expr); }
+    CHECK_TSS_API(PyThread_tss_set(&tss_key, NULL));
+    CHECK_TSS_API(PyThread_tss_get(&tss_key));
+#undef CHECK_TSS_API
+    PyThread_tss_delete(&tss_key);
+    if (PyThread_tss_is_created(&tss_key)) {
+        return raiseTestError("test_pythread_tss_key_state",
+                              "PyThread_tss_delete called, but did not "
+                              "set the key state to uninitialized");
+    }
+
+    Py_tss_t *ptr_key = PyThread_tss_alloc();
+    if (ptr_key == NULL) {
+        PyErr_SetString(PyExc_RuntimeError, "PyThread_tss_alloc failed");
+        return NULL;
+    }
+    if (PyThread_tss_is_created(ptr_key)) {
+        return raiseTestError("test_pythread_tss_key_state",
+                              "TSS key not in an uninitialized state at "
+                              "allocation time");
+    }
+    PyThread_tss_free(ptr_key);
+    ptr_key = NULL;
+    Py_RETURN_NONE;
+}
+
+
 static PyMethodDef TestMethods[] = {
     {"raise_exception",         raise_exception,                 METH_VARARGS},
     {"raise_memoryerror",   (PyCFunction)raise_memoryerror,  METH_NOARGS},
@@ -4518,6 +4573,7 @@ static PyMethodDef TestMethods[] = {
 #ifdef W_STOPCODE
     {"W_STOPCODE", py_w_stopcode, METH_VARARGS},
 #endif
+    {"test_pythread_tss_key_state", test_pythread_tss_key_state, METH_VARARGS},
     {NULL, NULL} /* sentinel */
 };
 
diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c
index 386f2f11ba7..af2a2fa4d52 100644
--- a/Modules/_tracemalloc.c
+++ b/Modules/_tracemalloc.c
@@ -167,14 +167,7 @@ tracemalloc_error(const char *format, ...)
 #if defined(TRACE_RAW_MALLOC)
 #define REENTRANT_THREADLOCAL
 
-/* If your OS does not provide native thread local storage, you can implement
-   it manually using a lock. Functions of thread.c cannot be used because
-   they use PyMem_RawMalloc() which leads to a reentrant call. */
-#if !(defined(_POSIX_THREADS) || defined(NT_THREADS))
-#  error "need native thread local storage (TLS)"
-#endif
-
-static int tracemalloc_reentrant_key = -1;
+static Py_tss_t tracemalloc_reentrant_key = Py_tss_NEEDS_INIT;
 
 /* Any non-NULL pointer can be used */
 #define REENTRANT Py_True
@@ -184,8 +177,8 @@ get_reentrant(void)
 {
     void *ptr;
 
-    assert(tracemalloc_reentrant_key != -1);
-    ptr = PyThread_get_key_value(tracemalloc_reentrant_key);
+    assert(PyThread_tss_is_created(&tracemalloc_reentrant_key));
+    ptr = PyThread_tss_get(&tracemalloc_reentrant_key);
     if (ptr != NULL) {
         assert(ptr == REENTRANT);
         return 1;
@@ -198,15 +191,15 @@ static void
 set_reentrant(int reentrant)
 {
     assert(reentrant == 0 || reentrant == 1);
-    assert(tracemalloc_reentrant_key != -1);
+    assert(PyThread_tss_is_created(&tracemalloc_reentrant_key));
 
     if (reentrant) {
         assert(!get_reentrant());
-        PyThread_set_key_value(tracemalloc_reentrant_key, REENTRANT);
+        PyThread_tss_set(&tracemalloc_reentrant_key, REENTRANT);
     }
     else {
         assert(get_reentrant());
-        PyThread_set_key_value(tracemalloc_reentrant_key, NULL);
+        PyThread_tss_set(&tracemalloc_reentrant_key, NULL);
     }
 }
 
@@ -975,8 +968,7 @@ tracemalloc_init(void)
     PyMem_GetAllocator(PYMEM_DOMAIN_RAW, &allocators.raw);
 
 #ifdef REENTRANT_THREADLOCAL
-    tracemalloc_reentrant_key = PyThread_create_key();
-    if (tracemalloc_reentrant_key == -1) {
+    if (PyThread_tss_create(&tracemalloc_reentrant_key) != 0) {
 #ifdef MS_WINDOWS
         PyErr_SetFromWindowsErr(0);
 #else
@@ -1061,8 +1053,7 @@ tracemalloc_deinit(void)
 #endif
 
 #ifdef REENTRANT_THREADLOCAL
-    PyThread_delete_key(tracemalloc_reentrant_key);
-    tracemalloc_reentrant_key = -1;
+    PyThread_tss_delete(&tracemalloc_reentrant_key);
 #endif
 
     Py_XDECREF(unknown_filename);
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
index 4f3d971bc52..c2c2c537b12 100644
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -232,7 +232,7 @@ faulthandler_dump_traceback(int fd, int all_threads,
 
        PyThreadState_Get() doesn't give the state of the thread that caused the
        fault if the thread released the GIL, and so this function cannot be
-       used. Read the thread local storage (TLS) instead: call
+       used. Read the thread specific storage (TSS) instead: call
        PyGILState_GetThisThreadState(). */
     tstate = PyGILState_GetThisThreadState();
 
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 13ff9166e71..5f30b202ec6 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -454,9 +454,6 @@ PyOS_AfterFork_Parent(void)
 void
 PyOS_AfterFork_Child(void)
 {
-    /* PyThread_ReInitTLS() must be called early, to make sure that the TLS API
-     * can be called safely. */
-    PyThread_ReInitTLS();
     _PyGILState_Reinit();
     PyEval_ReInitThreads();
     _PyImport_ReInitLock();
diff --git a/PC/python3.def b/PC/python3.def
index ad65294045f..1d089ec28b1 100644
--- a/PC/python3.def
+++ b/PC/python3.def
@@ -570,6 +570,13 @@ EXPORTS
   PyThreadState_New=python37.PyThreadState_New
   PyThreadState_SetAsyncExc=python37.PyThreadState_SetAsyncExc
   PyThreadState_Swap=python37.PyThreadState_Swap
+  PyThread_tss_alloc=python37.PyThread_tss_alloc
+  PyThread_tss_create=python37.PyThread_tss_create
+  PyThread_tss_delete=python37.PyThread_tss_delete
+  PyThread_tss_free=python37.PyThread_tss_free
+  PyThread_tss_get=python37.PyThread_tss_get
+  PyThread_tss_is_created=python37.PyThread_tss_is_created
+  PyThread_tss_set=python37.PyThread_tss_set
   PyTraceBack_Here=python37.PyTraceBack_Here
   PyTraceBack_Print=python37.PyTraceBack_Print
   PyTraceBack_Type=python37.PyTraceBack_Type DATA
diff --git a/Python/pystate.c b/Python/pystate.c
index 53c12361457..3feae346d44 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -46,7 +46,12 @@ _PyRuntimeState_Init(_PyRuntimeState *runtime)
     _PyEval_Initialize(&runtime->ceval);
 
     runtime->gilstate.check_enabled = 1;
-    runtime->gilstate.autoTLSkey = -1;
+    /* A TSS key must be initialized with Py_tss_NEEDS_INIT
+       in accordance with the specification. */
+    {
+        Py_tss_t initial = Py_tss_NEEDS_INIT;
+        runtime->gilstate.autoTSSkey = initial;
+    }
 
     runtime->interpreters.mutex = PyThread_allocate_lock();
     if (runtime->interpreters.mutex == NULL)
@@ -485,9 +490,9 @@ PyThreadState_Delete(PyThreadState *tstate)
     if (tstate == GET_TSTATE())
         Py_FatalError("PyThreadState_Delete: tstate is still current");
     if (_PyRuntime.gilstate.autoInterpreterState &&
-        PyThread_get_key_value(_PyRuntime.gilstate.autoTLSkey) == tstate)
+        PyThread_tss_get(&_PyRuntime.gilstate.autoTSSkey) == tstate)
     {
-        PyThread_delete_key_value(_PyRuntime.gilstate.autoTLSkey);
+        PyThread_tss_set(&_PyRuntime.gilstate.autoTSSkey, NULL);
     }
     tstate_delete_common(tstate);
 }
@@ -502,9 +507,9 @@ PyThreadState_DeleteCurrent()
             "PyThreadState_DeleteCurrent: no current tstate");
     tstate_delete_common(tstate);
     if (_PyRuntime.gilstate.autoInterpreterState &&
-        PyThread_get_key_value(_PyRuntime.gilstate.autoTLSkey) == tstate)
+        PyThread_tss_get(&_PyRuntime.gilstate.autoTSSkey) == tstate)
     {
-        PyThread_delete_key_value(_PyRuntime.gilstate.autoTLSkey);
+        PyThread_tss_set(&_PyRuntime.gilstate.autoTSSkey, NULL);
     }
     SET_TSTATE(NULL);
     PyEval_ReleaseLock();
@@ -761,11 +766,11 @@ void
 _PyGILState_Init(PyInterpreterState *i, PyThreadState *t)
 {
     assert(i && t); /* must init with valid states */
-    _PyRuntime.gilstate.autoTLSkey = PyThread_create_key();
-    if (_PyRuntime.gilstate.autoTLSkey == -1)
-        Py_FatalError("Could not allocate TLS entry");
+    if (PyThread_tss_create(&_PyRuntime.gilstate.autoTSSkey) != 0) {
+        Py_FatalError("Could not allocate TSS entry");
+    }
     _PyRuntime.gilstate.autoInterpreterState = i;
-    assert(PyThread_get_key_value(_PyRuntime.gilstate.autoTLSkey) == NULL);
+    assert(PyThread_tss_get(&_PyRuntime.gilstate.autoTSSkey) == NULL);
     assert(t->gilstate_counter == 0);
 
     _PyGILState_NoteThreadState(t);
@@ -780,14 +785,13 @@ _PyGILState_GetInterpreterStateUnsafe(void)
 void
 _PyGILState_Fini(void)
 {
-    PyThread_delete_key(_PyRuntime.gilstate.autoTLSkey);
-    _PyRuntime.gilstate.autoTLSkey = -1;
+    PyThread_tss_delete(&_PyRuntime.gilstate.autoTSSkey);
     _PyRuntime.gilstate.autoInterpreterState = NULL;
 }
 
-/* Reset the TLS key - called by PyOS_AfterFork_Child().
+/* Reset the TSS key - called by PyOS_AfterFork_Child().
  * This should not be necessary, but some - buggy - pthread implementations
- * don't reset TLS upon fork(), see issue #10517.
+ * don't reset TSS upon fork(), see issue #10517.
  */
 void
 _PyGILState_Reinit(void)
@@ -796,15 +800,18 @@ _PyGILState_Reinit(void)
     if (_PyRuntime.interpreters.mutex == NULL)
         Py_FatalError("Can't initialize threads for interpreter");
     PyThreadState *tstate = PyGILState_GetThisThreadState();
-    PyThread_delete_key(_PyRuntime.gilstate.autoTLSkey);
-    if ((_PyRuntime.gilstate.autoTLSkey = PyThread_create_key()) == -1)
-        Py_FatalError("Could not allocate TLS entry");
+    PyThread_tss_delete(&_PyRuntime.gilstate.autoTSSkey);
+    if (PyThread_tss_create(&_PyRuntime.gilstate.autoTSSkey) != 0) {
+        Py_FatalError("Could not allocate TSS entry");
+    }
 
     /* If the thread had an associated auto thread state, reassociate it with
      * the new key. */
-    if (tstate && PyThread_set_key_value(_PyRuntime.gilstate.autoTLSkey,
-                                         (void *)tstate) < 0)
-        Py_FatalError("Couldn't create autoTLSkey mapping");
+    if (tstate &&
+        PyThread_tss_set(&_PyRuntime.gilstate.autoTSSkey, (void *)tstate) != 0)
+    {
+        Py_FatalError("Couldn't create autoTSSkey mapping");
+    }
 }
 
 /* When a thread state is created for a thread by some mechanism other than
@@ -815,13 +822,13 @@ _PyGILState_Reinit(void)
 static void
 _PyGILState_NoteThreadState(PyThreadState* tstate)
 {
-    /* If autoTLSkey isn't initialized, this must be the very first
+    /* If autoTSSkey isn't initialized, this must be the very first
        threadstate created in Py_Initialize().  Don't do anything for now
        (we'll be back here when _PyGILState_Init is called). */
     if (!_PyRuntime.gilstate.autoInterpreterState)
         return;
 
-    /* Stick the thread state for this thread in thread local storage.
+    /* Stick the thread state for this thread in thread specific storage.
 
        The only situation where you can legitimately have more than one
        thread state for an OS level thread is when there are multiple
@@ -833,12 +840,11 @@ _PyGILState_NoteThreadState(PyThreadState* tstate)
        The first thread state created for that given OS level thread will
        "win", which seems reasonable behaviour.
     */
-    if (PyThread_get_key_value(_PyRuntime.gilstate.autoTLSkey) == NULL) {
-        if ((PyThread_set_key_value(_PyRuntime.gilstate.autoTLSkey,
-                                    (void *)tstate)
-             ) < 0)
+    if (PyThread_tss_get(&_PyRuntime.gilstate.autoTSSkey) == NULL) {
+        if ((PyThread_tss_set(&_PyRuntime.gilstate.autoTSSkey, (void *)tstate)
+             ) != 0)
         {
-            Py_FatalError("Couldn't create autoTLSkey mapping");
+            Py_FatalError("Couldn't create autoTSSkey mapping");
         }
     }
 
@@ -852,8 +858,7 @@ PyGILState_GetThisThreadState(void)
 {
     if (_PyRuntime.gilstate.autoInterpreterState == NULL)
         return NULL;
-    return (PyThreadState *)PyThread_get_key_value(
-                _PyRuntime.gilstate.autoTLSkey);
+    return (PyThreadState *)PyThread_tss_get(&_PyRuntime.gilstate.autoTSSkey);
 }
 
 int
@@ -864,8 +869,9 @@ PyGILState_Check(void)
     if (!_PyGILState_check_enabled)
         return 1;
 
-    if (_PyRuntime.gilstate.autoTLSkey == -1)
+    if (!PyThread_tss_is_created(&_PyRuntime.gilstate.autoTSSkey)) {
         return 1;
+    }
 
     tstate = GET_TSTATE();
     if (tstate == NULL)
@@ -886,8 +892,7 @@ PyGILState_Ensure(void)
     */
     /* Py_Initialize() hasn't been called! */
     assert(_PyRuntime.gilstate.autoInterpreterState);
-    tcur = (PyThreadState *)PyThread_get_key_value(
-                _PyRuntime.gilstate.autoTLSkey);
+    tcur = (PyThreadState *)PyThread_tss_get(&_PyRuntime.gilstate.autoTSSkey);
     if (tcur == NULL) {
         /* At startup, Python has no concrete GIL. If PyGILState_Ensure() is
            called from a new thread for the first time, we need the create the
@@ -919,8 +924,8 @@ PyGILState_Ensure(void)
 void
 PyGILState_Release(PyGILState_STATE oldstate)
 {
-    PyThreadState *tcur = (PyThreadState *)PyThread_get_key_value(
-                                _PyRuntime.gilstate.autoTLSkey);
+    PyThreadState *tcur = (PyThreadState *)PyThread_tss_get(
+                                &_PyRuntime.gilstate.autoTSSkey);
     if (tcur == NULL)
         Py_FatalError("auto-releasing thread-state, "
                       "but no thread-state for this thread");
diff --git a/Python/thread.c b/Python/thread.c
index f742d0521e1..7eac836dc16 100644
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -84,7 +84,7 @@ PyThread_init_thread(void)
 #   define PYTHREAD_NAME "nt"
 #   include "thread_nt.h"
 #else
-#   error "Require native thread feature. See https://bugs.python.org/issue30832"
+#   error "Require native threads. See https://bugs.python.org/issue31370"
 #endif
 
 
@@ -111,41 +111,37 @@ PyThread_set_stacksize(size_t size)
 }
 
 
-/* ------------------------------------------------------------------------
-Per-thread data ("key") support.
+/* Thread Specific Storage (TSS) API
 
-Use PyThread_create_key() to create a new key.  This is typically shared
-across threads.
-
-Use PyThread_set_key_value(thekey, value) to associate void* value with
-thekey in the current thread.  Each thread has a distinct mapping of thekey
-to a void* value.  Caution:  if the current thread already has a mapping
-for thekey, value is ignored.
-
-Use PyThread_get_key_value(thekey) to retrieve the void* value associated
-with thekey in the current thread.  This returns NULL if no value is
-associated with thekey in the current thread.
-
-Use PyThread_delete_key_value(thekey) to forget the current thread's associated
-value for thekey.  PyThread_delete_key(thekey) forgets the values associated
-with thekey across *all* threads.
-
-While some of these functions have error-return values, none set any
-Python exception.
+   Cross-platform components of TSS API implementation.
+*/
 
-None of the functions does memory management on behalf of the void* values.
-You need to allocate and deallocate them yourself.  If the void* values
-happen to be PyObject*, these functions don't do refcount operations on
-them either.
+Py_tss_t *
+PyThread_tss_alloc(void)
+{
+    Py_tss_t *new_key = (Py_tss_t *)PyMem_RawMalloc(sizeof(Py_tss_t));
+    if (new_key == NULL) {
+        return NULL;
+    }
+    new_key->_is_initialized = 0;
+    return new_key;
+}
 
-The GIL does not need to be held when calling these functions; they supply
-their own locking.  This isn't true of PyThread_create_key(), though (see
-next paragraph).
+void
+PyThread_tss_free(Py_tss_t *key)
+{
+    if (key != NULL) {
+        PyThread_tss_delete(key);
+        PyMem_RawFree((void *)key);
+    }
+}
 
-There's a hidden assumption that PyThread_create_key() will be called before
-any of the other functions are called.  There's also a hidden assumption
-that calls to PyThread_create_key() are serialized externally.
------------------------------------------------------------------------- */
+int
+PyThread_tss_is_created(Py_tss_t *key)
+{
+    assert(key != NULL);
+    return key->_is_initialized;
+}
 
 
 PyDoc_STRVAR(threadinfo__doc__,
diff --git a/Python/thread_nt.h b/Python/thread_nt.h
index 2f3a71b86ad..bae8bcc3566 100644
--- a/Python/thread_nt.h
+++ b/Python/thread_nt.h
@@ -349,10 +349,15 @@ _pythread_nt_set_stacksize(size_t size)
 #define THREAD_SET_STACKSIZE(x) _pythread_nt_set_stacksize(x)
 
 
+/* Thread Local Storage (TLS) API
+
+   This API is DEPRECATED since Python 3.7.  See PEP 539 for details.
+*/
+
 int
 PyThread_create_key(void)
 {
-    DWORD result= TlsAlloc();
+    DWORD result = TlsAlloc();
     if (result == TLS_OUT_OF_INDEXES)
         return -1;
     return (int)result;
@@ -367,12 +372,8 @@ PyThread_delete_key(int key)
 int
 PyThread_set_key_value(int key, void *value)
 {
-    BOOL ok;
-
-    ok = TlsSetValue(key, value);
-    if (!ok)
-        return -1;
-    return 0;
+    BOOL ok = TlsSetValue(key, value);
+    return ok ? 0 : -1;
 }
 
 void *
@@ -399,9 +400,74 @@ PyThread_delete_key_value(int key)
     TlsSetValue(key, NULL);
 }
 
+
 /* reinitialization of TLS is not necessary after fork when using
  * the native TLS functions.  And forking isn't supported on Windows either.
  */
 void
 PyThread_ReInitTLS(void)
-{}
+{
+}
+
+
+/* Thread Specific Storage (TSS) API
+
+   Platform-specific components of TSS API implementation.
+*/
+
+int
+PyThread_tss_create(Py_tss_t *key)
+{
+    assert(key != NULL);
+    /* If the key has been created, function is silently skipped. */
+    if (key->_is_initialized) {
+        return 0;
+    }
+
+    DWORD result = TlsAlloc();
+    if (result == TLS_OUT_OF_INDEXES) {
+        return -1;
+    }
+    /* In Windows, platform-specific key type is DWORD. */
+    key->_key = result;
+    key->_is_initialized = 1;
+    return 0;
+}
+
+void
+PyThread_tss_delete(Py_tss_t *key)
+{
+    assert(key != NULL);
+    /* If the key has not been created, function is silently skipped. */
+    if (!key->_is_initialized) {
+        return;
+    }
+
+    TlsFree(key->_key);
+    key->_key = TLS_OUT_OF_INDEXES;
+    key->_is_initialized = 0;
+}
+
+int
+PyThread_tss_set(Py_tss_t *key, void *value)
+{
+    assert(key != NULL);
+    BOOL ok = TlsSetValue(key->_key, value);
+    return ok ? 0 : -1;
+}
+
+void *
+PyThread_tss_get(Py_tss_t *key)
+{
+    assert(key != NULL);
+    /* because TSS is used in the Py_END_ALLOW_THREAD macro,
+     * it is necessary to preserve the windows error state, because
+     * it is assumed to be preserved across the call to the macro.
+     * Ideally, the macro should be fixed, but it is simpler to
+     * do it here.
+     */
+    DWORD error = GetLastError();
+    void *result = TlsGetValue(key->_key);
+    SetLastError(error);
+    return result;
+}
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
index 2dcd107c2ce..c5b7f3256fa 100644
--- a/Python/thread_pthread.h
+++ b/Python/thread_pthread.h
@@ -589,9 +589,25 @@ _pythread_pthread_set_stacksize(size_t size)
 #define THREAD_SET_STACKSIZE(x) _pythread_pthread_set_stacksize(x)
 
 
+/* Thread Local Storage (TLS) API
+
+   This API is DEPRECATED since Python 3.7.  See PEP 539 for details.
+*/
+
+/* Issue #25658: On platforms where native TLS key is defined in a way that
+   cannot be safely cast to int, PyThread_create_key returns immediately a
+   failure status and other TLS functions all are no-ops.  This indicates
+   clearly that the old API is not supported on platforms where it cannot be
+   used reliably, and that no effort will be made to add such support.
+
+   Note: PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT will be unnecessary after
+   removing this API.
+*/
+
 int
 PyThread_create_key(void)
 {
+#ifdef PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT
     pthread_key_t key;
     int fail = pthread_key_create(&key, NULL);
     if (fail)
@@ -603,34 +619,102 @@ PyThread_create_key(void)
         return -1;
     }
     return (int)key;
+#else
+    return -1;  /* never return valid key value. */
+#endif
 }
 
 void
 PyThread_delete_key(int key)
 {
+#ifdef PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT
     pthread_key_delete(key);
+#endif
 }
 
 void
 PyThread_delete_key_value(int key)
 {
+#ifdef PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT
     pthread_setspecific(key, NULL);
+#endif
 }
 
 int
 PyThread_set_key_value(int key, void *value)
 {
-    int fail;
-    fail = pthread_setspecific(key, value);
+#ifdef PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT
+    int fail = pthread_setspecific(key, value);
     return fail ? -1 : 0;
+#else
+    return -1;
+#endif
 }
 
 void *
 PyThread_get_key_value(int key)
 {
+#ifdef PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT
     return pthread_getspecific(key);
+#else
+    return NULL;
+#endif
 }
 
+
 void
 PyThread_ReInitTLS(void)
-{}
+{
+}
+
+
+/* Thread Specific Storage (TSS) API
+
+   Platform-specific components of TSS API implementation.
+*/
+
+int
+PyThread_tss_create(Py_tss_t *key)
+{
+    assert(key != NULL);
+    /* If the key has been created, function is silently skipped. */
+    if (key->_is_initialized) {
+        return 0;
+    }
+
+    int fail = pthread_key_create(&(key->_key), NULL);
+    if (fail) {
+        return -1;
+    }
+    key->_is_initialized = 1;
+    return 0;
+}
+
+void
+PyThread_tss_delete(Py_tss_t *key)
+{
+    assert(key != NULL);
+    /* If the key has not been created, function is silently skipped. */
+    if (!key->_is_initialized) {
+        return;
+    }
+
+    pthread_key_delete(key->_key);
+    /* pthread has not provided the defined invalid value for the key. */
+    key->_is_initialized = 0;
+}
+
+int
+PyThread_tss_set(Py_tss_t *key, void *value)
+{
+    assert(key != NULL);
+    int fail = pthread_setspecific(key->_key, value);
+    return fail ? -1 : 0;
+}
+
+void *
+PyThread_tss_get(Py_tss_t *key)
+{
+    assert(key != NULL);
+    return pthread_getspecific(key->_key);
+}
diff --git a/Python/traceback.c b/Python/traceback.c
index ba979aad8fa..21b36b14719 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -760,7 +760,7 @@ _Py_DumpTracebackThreads(int fd, PyInterpreterState *interp,
 
            PyThreadState_Get() doesn't give the state of the thread that caused
            the fault if the thread released the GIL, and so this function
-           cannot be used. Read the thread local storage (TLS) instead: call
+           cannot be used. Read the thread specific storage (TSS) instead: call
            PyGILState_GetThisThreadState(). */
         current_tstate = PyGILState_GetThisThreadState();
     }
diff --git a/configure b/configure
index 2d1bed22476..741a834ab38 100755
--- a/configure
+++ b/configure
@@ -8884,6 +8884,75 @@ _ACEOF
 
 
 fi
+
+# Issue #25658: POSIX hasn't defined that pthread_key_t is compatible with int.
+# This checking will be unnecessary after removing deprecated TLS API.
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pthread_key_t" >&5
+$as_echo_n "checking size of pthread_key_t... " >&6; }
+if ${ac_cv_sizeof_pthread_key_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pthread_key_t))" "ac_cv_sizeof_pthread_key_t"        "#include <pthread.h>
+"; then :
+
+else
+  if test "$ac_cv_type_pthread_key_t" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (pthread_key_t)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_pthread_key_t=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pthread_key_t" >&5
+$as_echo "$ac_cv_sizeof_pthread_key_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_PTHREAD_KEY_T $ac_cv_sizeof_pthread_key_t
+_ACEOF
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_key_t is compatible with int" >&5
+$as_echo_n "checking whether pthread_key_t is compatible with int... " >&6; }
+if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+int
+main ()
+{
+pthread_key_t k; k * 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_pthread_key_t_is_arithmetic_type=yes
+else
+  ac_pthread_key_t_is_arithmetic_type=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pthread_key_t_is_arithmetic_type" >&5
+$as_echo "$ac_pthread_key_t_is_arithmetic_type" >&6; }
+  if test "$ac_pthread_key_t_is_arithmetic_type" = yes ; then
+
+$as_echo "#define PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT 1" >>confdefs.h
+
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 CC="$ac_save_cc"
 
 
diff --git a/configure.ac b/configure.ac
index b562fe405a4..a3114be7387 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2263,6 +2263,25 @@ if test "$have_pthread_t" = yes ; then
 #endif
   ])
 fi
+
+# Issue #25658: POSIX hasn't defined that pthread_key_t is compatible with int.
+# This checking will be unnecessary after removing deprecated TLS API.
+AC_CHECK_SIZEOF(pthread_key_t, [], [[#include <pthread.h>]])
+AC_MSG_CHECKING(whether pthread_key_t is compatible with int)
+if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then
+  AC_COMPILE_IFELSE(
+    [AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_key_t k; k * 1;]])],
+    [ac_pthread_key_t_is_arithmetic_type=yes],
+    [ac_pthread_key_t_is_arithmetic_type=no]
+  )
+  AC_MSG_RESULT($ac_pthread_key_t_is_arithmetic_type)
+  if test "$ac_pthread_key_t_is_arithmetic_type" = yes ; then
+    AC_DEFINE(PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT, 1,
+              [Define if pthread_key_t is compatible with int.])
+  fi
+else
+  AC_MSG_RESULT(no)
+fi
 CC="$ac_save_cc"
 
 AC_SUBST(OTHER_LIBTOOL_OPT)
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 637341afee3..7f0c6b33a95 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -1241,6 +1241,9 @@
 /* Define if POSIX semaphores aren't enabled on your system */
 #undef POSIX_SEMAPHORES_NOT_ENABLED
 
+/* Define if pthread_key_t is compatible with int. */
+#undef PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT
+
 /* Defined if PTHREAD_SCOPE_SYSTEM supported. */
 #undef PTHREAD_SYSTEM_SCHED_SUPPORTED
 
@@ -1302,6 +1305,9 @@
 /* The size of `pid_t', as computed by sizeof. */
 #undef SIZEOF_PID_T
 
+/* The size of `pthread_key_t', as computed by sizeof. */
+#undef SIZEOF_PTHREAD_KEY_T
+
 /* The size of `pthread_t', as computed by sizeof. */
 #undef SIZEOF_PTHREAD_T
 


From webhook-mailer at python.org  Fri Oct  6 09:53:51 2017
From: webhook-mailer at python.org (Barry Warsaw)
Date: Fri, 06 Oct 2017 13:53:51 -0000
Subject: [Python-checkins] Document Py_GETENV() (#3890)
Message-ID: <mailman.58.1507298032.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/a51b90a31399a8826e590da8e327bd65dd29e5a4
commit: a51b90a31399a8826e590da8e327bd65dd29e5a4
branch: master
author: Barry Warsaw <barry at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-06T09:53:48-04:00
summary:

Document Py_GETENV() (#3890)

files:
M Doc/c-api/intro.rst

diff --git a/Doc/c-api/intro.rst b/Doc/c-api/intro.rst
index 4942b1a4698..e654c4c0126 100644
--- a/Doc/c-api/intro.rst
+++ b/Doc/c-api/intro.rst
@@ -132,6 +132,11 @@ complete listing.
    Argument must be a character or an integer in the range [-128, 127] or [0,
    255].  This macro returns ``c`` cast to an ``unsigned char``.
 
+.. c:macro:: Py_GETENV(s)
+
+   Like ``getenv(s)``, but returns *NULL* if :option:`-E` was passed on the
+   command line (i.e. if ``Py_IgnoreEnvironmentFlag`` is set).
+
 
 .. _api-objects:
 


From webhook-mailer at python.org  Fri Oct  6 10:18:14 2017
From: webhook-mailer at python.org (Yury Selivanov)
Date: Fri, 06 Oct 2017 14:18:14 -0000
Subject: [Python-checkins] bpo-31709: Update importlib magic (#3906)
Message-ID: <mailman.59.1507299496.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/02e82a0596121e7b6fcd1142b60c744e8e254d41
commit: 02e82a0596121e7b6fcd1142b60c744e8e254d41
branch: master
author: Yury Selivanov <yury at magic.io>
committer: GitHub <noreply at github.com>
date: 2017-10-06T10:18:10-04:00
summary:

bpo-31709: Update importlib magic (#3906)

files:
M Doc/library/dis.rst
M Lib/importlib/_bootstrap_external.py
M Python/importlib_external.h

diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 7b7c84df776..4d011036d7a 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -558,8 +558,11 @@ the original TOS1.
 
 .. opcode:: GET_AITER
 
-   Implements ``TOS = get_awaitable(TOS.__aiter__())``.  See ``GET_AWAITABLE``
-   for details about ``get_awaitable``
+   Implements ``TOS = TOS.__aiter__()``.
+
+   .. versionchanged:: 3.7
+      Returning awaitable objects from ``__aiter__`` is no longer
+      supported.
 
 
 .. opcode:: GET_ANEXT
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
index e9f870bf7f4..41de8a7b863 100644
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
@@ -241,6 +241,7 @@ def _write_atomic(path, data, mode=0o666):
 #     Python 3.6b2  3378 (add BUILD_TUPLE_UNPACK_WITH_CALL #28257)
 #     Python 3.6rc1 3379 (more thorough __class__ validation #23722)
 #     Python 3.7a0  3390 (add LOAD_METHOD and CALL_METHOD opcodes)
+#     Python 3.7a0  3391 (update GET_AITER #31709)
 #
 # MAGIC must change whenever the bytecode emitted by the compiler may no
 # longer be understood by older implementations of the eval loop (usually
@@ -249,7 +250,7 @@ def _write_atomic(path, data, mode=0o666):
 # Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
 # in PC/launcher.c must also be updated.
 
-MAGIC_NUMBER = (3390).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3391).to_bytes(2, 'little') + b'\r\n'
 _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little')  # For import.c
 
 _PYCACHE = '__pycache__'
diff --git a/Python/importlib_external.h b/Python/importlib_external.h
index 83fe39c0762..f122f14f542 100644
--- a/Python/importlib_external.h
+++ b/Python/importlib_external.h
@@ -242,7 +242,7 @@ const unsigned char _Py_M__importlib_external[] = {
     101,95,97,116,111,109,105,99,106,0,0,0,115,26,0,0,
     0,0,5,16,1,6,1,26,1,2,3,14,1,20,1,16,
     1,14,1,2,1,14,1,14,1,6,1,114,58,0,0,0,
-    105,62,13,0,0,233,2,0,0,0,114,15,0,0,0,115,
+    105,63,13,0,0,233,2,0,0,0,114,15,0,0,0,115,
     2,0,0,0,13,10,90,11,95,95,112,121,99,97,99,104,
     101,95,95,122,4,111,112,116,45,122,3,46,112,121,122,4,
     46,112,121,99,78,41,1,218,12,111,112,116,105,109,105,122,
@@ -346,7 +346,7 @@ const unsigned char _Py_M__importlib_external[] = {
     103,90,15,97,108,109,111,115,116,95,102,105,108,101,110,97,
     109,101,114,4,0,0,0,114,4,0,0,0,114,6,0,0,
     0,218,17,99,97,99,104,101,95,102,114,111,109,95,115,111,
-    117,114,99,101,8,1,0,0,115,48,0,0,0,0,18,8,
+    117,114,99,101,9,1,0,0,115,48,0,0,0,0,18,8,
     1,6,1,6,1,8,1,4,1,8,1,12,1,10,1,12,
     1,16,1,8,1,8,1,8,1,24,1,8,1,12,1,6,
     2,8,1,8,1,8,1,8,1,14,1,14,1,114,83,0,
@@ -420,7 +420,7 @@ const unsigned char _Py_M__importlib_external[] = {
     112,116,95,108,101,118,101,108,90,13,98,97,115,101,95,102,
     105,108,101,110,97,109,101,114,4,0,0,0,114,4,0,0,
     0,114,6,0,0,0,218,17,115,111,117,114,99,101,95,102,
-    114,111,109,95,99,97,99,104,101,53,1,0,0,115,46,0,
+    114,111,109,95,99,97,99,104,101,54,1,0,0,115,46,0,
     0,0,0,9,12,1,8,1,10,1,12,1,12,1,8,1,
     6,1,10,1,10,1,8,1,6,1,10,1,8,1,16,1,
     10,1,6,1,8,1,16,1,8,1,6,1,8,1,14,1,
@@ -455,7 +455,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,114,38,0,0,0,90,9,101,120,116,101,110,115,105,
     111,110,218,11,115,111,117,114,99,101,95,112,97,116,104,114,
     4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,15,
-    95,103,101,116,95,115,111,117,114,99,101,102,105,108,101,87,
+    95,103,101,116,95,115,111,117,114,99,101,102,105,108,101,88,
     1,0,0,115,20,0,0,0,0,7,12,1,4,1,16,1,
     24,1,4,1,2,1,12,1,18,1,18,1,114,95,0,0,
     0,99,1,0,0,0,0,0,0,0,1,0,0,0,11,0,
@@ -469,7 +469,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,0,114,70,0,0,0,114,78,0,0,0,41,1,218,
     8,102,105,108,101,110,97,109,101,114,4,0,0,0,114,4,
     0,0,0,114,6,0,0,0,218,11,95,103,101,116,95,99,
-    97,99,104,101,100,106,1,0,0,115,16,0,0,0,0,1,
+    97,99,104,101,100,107,1,0,0,115,16,0,0,0,0,1,
     14,1,2,1,8,1,14,1,8,1,14,1,4,2,114,99,
     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,52,0,0,0,121,14,116,
@@ -483,7 +483,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,41,3,114,41,0,0,0,114,43,0,0,0,114,42,
     0,0,0,41,2,114,37,0,0,0,114,44,0,0,0,114,
     4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,10,
-    95,99,97,108,99,95,109,111,100,101,118,1,0,0,115,12,
+    95,99,97,108,99,95,109,111,100,101,119,1,0,0,115,12,
     0,0,0,0,2,2,1,14,1,14,1,10,3,8,1,114,
     101,0,0,0,99,1,0,0,0,0,0,0,0,3,0,0,
     0,11,0,0,0,3,0,0,0,115,68,0,0,0,100,6,
@@ -521,7 +521,7 @@ const unsigned char _Py_M__importlib_external[] = {
     115,90,6,107,119,97,114,103,115,41,1,218,6,109,101,116,
     104,111,100,114,4,0,0,0,114,6,0,0,0,218,19,95,
     99,104,101,99,107,95,110,97,109,101,95,119,114,97,112,112,
-    101,114,138,1,0,0,115,12,0,0,0,0,1,8,1,8,
+    101,114,139,1,0,0,115,12,0,0,0,0,1,8,1,8,
     1,10,1,4,1,18,1,122,40,95,99,104,101,99,107,95,
     110,97,109,101,46,60,108,111,99,97,108,115,62,46,95,99,
     104,101,99,107,95,110,97,109,101,95,119,114,97,112,112,101,
@@ -540,7 +540,7 @@ const unsigned char _Py_M__importlib_external[] = {
     99,116,95,95,218,6,117,112,100,97,116,101,41,3,90,3,
     110,101,119,90,3,111,108,100,114,55,0,0,0,114,4,0,
     0,0,114,4,0,0,0,114,6,0,0,0,218,5,95,119,
-    114,97,112,149,1,0,0,115,8,0,0,0,0,1,10,1,
+    114,97,112,150,1,0,0,115,8,0,0,0,0,1,10,1,
     10,1,22,1,122,26,95,99,104,101,99,107,95,110,97,109,
     101,46,60,108,111,99,97,108,115,62,46,95,119,114,97,112,
     41,1,78,41,3,218,10,95,98,111,111,116,115,116,114,97,
@@ -548,7 +548,7 @@ const unsigned char _Py_M__importlib_external[] = {
     114,41,3,114,106,0,0,0,114,107,0,0,0,114,117,0,
     0,0,114,4,0,0,0,41,1,114,106,0,0,0,114,6,
     0,0,0,218,11,95,99,104,101,99,107,95,110,97,109,101,
-    130,1,0,0,115,14,0,0,0,0,8,14,7,2,1,10,
+    131,1,0,0,115,14,0,0,0,0,8,14,7,2,1,10,
     1,14,2,14,5,10,1,114,120,0,0,0,99,2,0,0,
     0,0,0,0,0,5,0,0,0,6,0,0,0,67,0,0,
     0,115,60,0,0,0,124,0,160,0,124,1,161,1,92,2,
@@ -576,7 +576,7 @@ const unsigned char _Py_M__importlib_external[] = {
     218,8,112,111,114,116,105,111,110,115,218,3,109,115,103,114,
     4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,17,
     95,102,105,110,100,95,109,111,100,117,108,101,95,115,104,105,
-    109,158,1,0,0,115,10,0,0,0,0,10,14,1,16,1,
+    109,159,1,0,0,115,10,0,0,0,0,10,14,1,16,1,
     4,1,22,1,114,127,0,0,0,99,4,0,0,0,0,0,
     0,0,11,0,0,0,20,0,0,0,67,0,0,0,115,136,
     1,0,0,105,0,125,4,124,2,100,1,107,9,114,22,124,
@@ -656,7 +656,7 @@ const unsigned char _Py_M__importlib_external[] = {
     117,114,99,101,95,115,105,122,101,114,4,0,0,0,114,4,
     0,0,0,114,6,0,0,0,218,25,95,118,97,108,105,100,
     97,116,101,95,98,121,116,101,99,111,100,101,95,104,101,97,
-    100,101,114,175,1,0,0,115,76,0,0,0,0,11,4,1,
+    100,101,114,176,1,0,0,115,76,0,0,0,0,11,4,1,
     8,1,10,3,4,1,8,1,8,1,12,1,12,1,12,1,
     8,1,12,1,12,1,14,1,12,1,10,1,12,1,10,1,
     12,1,10,1,12,1,8,1,10,1,2,1,16,1,16,1,
@@ -685,7 +685,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,114,102,0,0,0,114,93,0,0,0,114,94,0,0,0,
     218,4,99,111,100,101,114,4,0,0,0,114,4,0,0,0,
     114,6,0,0,0,218,17,95,99,111,109,112,105,108,101,95,
-    98,121,116,101,99,111,100,101,230,1,0,0,115,16,0,0,
+    98,121,116,101,99,111,100,101,231,1,0,0,115,16,0,0,
     0,0,2,10,1,10,1,12,1,8,1,12,1,4,2,10,
     1,114,145,0,0,0,114,62,0,0,0,99,3,0,0,0,
     0,0,0,0,4,0,0,0,5,0,0,0,67,0,0,0,
@@ -704,7 +704,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,0,114,130,0,0,0,114,138,0,0,0,114,56,0,
     0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,
     0,218,17,95,99,111,100,101,95,116,111,95,98,121,116,101,
-    99,111,100,101,242,1,0,0,115,10,0,0,0,0,3,8,
+    99,111,100,101,243,1,0,0,115,10,0,0,0,0,3,8,
     1,14,1,14,1,16,1,114,148,0,0,0,99,1,0,0,
     0,0,0,0,0,5,0,0,0,6,0,0,0,67,0,0,
     0,115,62,0,0,0,100,1,100,2,108,0,125,1,116,1,
@@ -731,7 +731,7 @@ const unsigned char _Py_M__importlib_external[] = {
     99,111,100,105,110,103,90,15,110,101,119,108,105,110,101,95,
     100,101,99,111,100,101,114,114,4,0,0,0,114,4,0,0,
     0,114,6,0,0,0,218,13,100,101,99,111,100,101,95,115,
-    111,117,114,99,101,252,1,0,0,115,10,0,0,0,0,5,
+    111,117,114,99,101,253,1,0,0,115,10,0,0,0,0,5,
     8,1,12,1,10,1,12,1,114,153,0,0,0,41,2,114,
     124,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,
@@ -792,7 +792,7 @@ const unsigned char _Py_M__importlib_external[] = {
     115,117,102,102,105,120,101,115,114,157,0,0,0,90,7,100,
     105,114,110,97,109,101,114,4,0,0,0,114,4,0,0,0,
     114,6,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,13,2,
+    95,102,105,108,101,95,108,111,99,97,116,105,111,110,14,2,
     0,0,115,62,0,0,0,0,12,8,4,4,1,10,2,2,
     1,14,1,14,1,8,2,10,8,16,1,6,3,8,1,16,
     1,14,1,10,1,6,1,6,2,4,3,8,2,10,1,2,
@@ -829,7 +829,7 @@ const unsigned char _Py_M__importlib_external[] = {
     76,79,67,65,76,95,77,65,67,72,73,78,69,41,2,218,
     3,99,108,115,114,5,0,0,0,114,4,0,0,0,114,4,
     0,0,0,114,6,0,0,0,218,14,95,111,112,101,110,95,
-    114,101,103,105,115,116,114,121,93,2,0,0,115,8,0,0,
+    114,101,103,105,115,116,114,121,94,2,0,0,115,8,0,0,
     0,0,2,2,1,14,1,14,1,122,36,87,105,110,100,111,
     119,115,82,101,103,105,115,116,114,121,70,105,110,100,101,114,
     46,95,111,112,101,110,95,114,101,103,105,115,116,114,121,99,
@@ -855,7 +855,7 @@ const unsigned char _Py_M__importlib_external[] = {
     5,0,0,0,90,4,104,107,101,121,218,8,102,105,108,101,
     112,97,116,104,114,4,0,0,0,114,4,0,0,0,114,6,
     0,0,0,218,16,95,115,101,97,114,99,104,95,114,101,103,
-    105,115,116,114,121,100,2,0,0,115,22,0,0,0,0,2,
+    105,115,116,114,121,101,2,0,0,115,22,0,0,0,0,2,
     6,1,8,2,6,1,6,1,22,1,2,1,12,1,26,1,
     14,1,6,1,122,38,87,105,110,100,111,119,115,82,101,103,
     105,115,116,114,121,70,105,110,100,101,114,46,95,115,101,97,
@@ -877,7 +877,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,218,6,116,97,114,103,101,116,114,174,0,0,0,114,124,
     0,0,0,114,164,0,0,0,114,162,0,0,0,114,4,0,
     0,0,114,4,0,0,0,114,6,0,0,0,218,9,102,105,
-    110,100,95,115,112,101,99,115,2,0,0,115,26,0,0,0,
+    110,100,95,115,112,101,99,116,2,0,0,115,26,0,0,0,
     0,2,10,1,8,1,4,1,2,1,12,1,14,1,6,1,
     16,1,14,1,6,1,8,1,8,1,122,31,87,105,110,100,
     111,119,115,82,101,103,105,115,116,114,121,70,105,110,100,101,
@@ -896,7 +896,7 @@ const unsigned char _Py_M__importlib_external[] = {
     124,0,0,0,41,4,114,168,0,0,0,114,123,0,0,0,
     114,37,0,0,0,114,162,0,0,0,114,4,0,0,0,114,
     4,0,0,0,114,6,0,0,0,218,11,102,105,110,100,95,
-    109,111,100,117,108,101,131,2,0,0,115,8,0,0,0,0,
+    109,111,100,117,108,101,132,2,0,0,115,8,0,0,0,0,
     7,12,1,8,1,6,2,122,33,87,105,110,100,111,119,115,
     82,101,103,105,115,116,114,121,70,105,110,100,101,114,46,102,
     105,110,100,95,109,111,100,117,108,101,41,2,78,78,41,1,
@@ -906,7 +906,7 @@ const unsigned char _Py_M__importlib_external[] = {
     104,111,100,114,169,0,0,0,114,175,0,0,0,114,178,0,
     0,0,114,179,0,0,0,114,4,0,0,0,114,4,0,0,
     0,114,4,0,0,0,114,6,0,0,0,114,166,0,0,0,
-    81,2,0,0,115,18,0,0,0,12,5,4,3,4,2,4,
+    82,2,0,0,115,18,0,0,0,12,5,4,3,4,2,4,
     2,12,7,12,15,2,1,12,15,2,1,114,166,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,48,0,0,0,101,0,90,1,100,0,
@@ -940,7 +940,7 @@ const unsigned char _Py_M__importlib_external[] = {
     5,114,104,0,0,0,114,123,0,0,0,114,98,0,0,0,
     90,13,102,105,108,101,110,97,109,101,95,98,97,115,101,90,
     9,116,97,105,108,95,110,97,109,101,114,4,0,0,0,114,
-    4,0,0,0,114,6,0,0,0,114,157,0,0,0,150,2,
+    4,0,0,0,114,6,0,0,0,114,157,0,0,0,151,2,
     0,0,115,8,0,0,0,0,3,18,1,16,1,14,1,122,
     24,95,76,111,97,100,101,114,66,97,115,105,99,115,46,105,
     115,95,112,97,99,107,97,103,101,99,2,0,0,0,0,0,
@@ -951,7 +951,7 @@ const unsigned char _Py_M__importlib_external[] = {
     116,105,111,110,46,78,114,4,0,0,0,41,2,114,104,0,
     0,0,114,162,0,0,0,114,4,0,0,0,114,4,0,0,
     0,114,6,0,0,0,218,13,99,114,101,97,116,101,95,109,
-    111,100,117,108,101,158,2,0,0,115,0,0,0,0,122,27,
+    111,100,117,108,101,159,2,0,0,115,0,0,0,0,122,27,
     95,76,111,97,100,101,114,66,97,115,105,99,115,46,99,114,
     101,97,116,101,95,109,111,100,117,108,101,99,2,0,0,0,
     0,0,0,0,3,0,0,0,5,0,0,0,67,0,0,0,
@@ -971,7 +971,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,41,3,114,104,0,0,0,218,6,109,111,100,117,108,101,
     114,144,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
     6,0,0,0,218,11,101,120,101,99,95,109,111,100,117,108,
-    101,161,2,0,0,115,10,0,0,0,0,2,12,1,8,1,
+    101,162,2,0,0,115,10,0,0,0,0,2,12,1,8,1,
     6,1,10,1,122,25,95,76,111,97,100,101,114,66,97,115,
     105,99,115,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,4,0,0,0,
@@ -982,13 +982,13 @@ const unsigned char _Py_M__importlib_external[] = {
     100,95,109,111,100,117,108,101,95,115,104,105,109,41,2,114,
     104,0,0,0,114,123,0,0,0,114,4,0,0,0,114,4,
     0,0,0,114,6,0,0,0,218,11,108,111,97,100,95,109,
-    111,100,117,108,101,169,2,0,0,115,2,0,0,0,0,2,
+    111,100,117,108,101,170,2,0,0,115,2,0,0,0,0,2,
     122,25,95,76,111,97,100,101,114,66,97,115,105,99,115,46,
     108,111,97,100,95,109,111,100,117,108,101,78,41,8,114,109,
     0,0,0,114,108,0,0,0,114,110,0,0,0,114,111,0,
     0,0,114,157,0,0,0,114,183,0,0,0,114,188,0,0,
     0,114,190,0,0,0,114,4,0,0,0,114,4,0,0,0,
-    114,4,0,0,0,114,6,0,0,0,114,181,0,0,0,145,
+    114,4,0,0,0,114,6,0,0,0,114,181,0,0,0,146,
     2,0,0,115,8,0,0,0,12,5,8,8,8,3,8,8,
     114,181,0,0,0,99,0,0,0,0,0,0,0,0,0,0,
     0,0,3,0,0,0,64,0,0,0,115,74,0,0,0,101,
@@ -1014,7 +1014,7 @@ const unsigned char _Py_M__importlib_external[] = {
     32,78,41,1,114,42,0,0,0,41,2,114,104,0,0,0,
     114,37,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
     6,0,0,0,218,10,112,97,116,104,95,109,116,105,109,101,
-    176,2,0,0,115,2,0,0,0,0,6,122,23,83,111,117,
+    177,2,0,0,115,2,0,0,0,0,6,122,23,83,111,117,
     114,99,101,76,111,97,100,101,114,46,112,97,116,104,95,109,
     116,105,109,101,99,2,0,0,0,0,0,0,0,2,0,0,
     0,4,0,0,0,67,0,0,0,115,14,0,0,0,100,1,
@@ -1049,7 +1049,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,41,1,114,192,0,0,0,41,2,114,104,0,0,0,
     114,37,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
     6,0,0,0,218,10,112,97,116,104,95,115,116,97,116,115,
-    184,2,0,0,115,2,0,0,0,0,11,122,23,83,111,117,
+    185,2,0,0,115,2,0,0,0,0,11,122,23,83,111,117,
     114,99,101,76,111,97,100,101,114,46,112,97,116,104,95,115,
     116,97,116,115,99,4,0,0,0,0,0,0,0,4,0,0,
     0,4,0,0,0,67,0,0,0,115,12,0,0,0,124,0,
@@ -1072,7 +1072,7 @@ const unsigned char _Py_M__importlib_external[] = {
     114,104,0,0,0,114,94,0,0,0,90,10,99,97,99,104,
     101,95,112,97,116,104,114,56,0,0,0,114,4,0,0,0,
     114,4,0,0,0,114,6,0,0,0,218,15,95,99,97,99,
-    104,101,95,98,121,116,101,99,111,100,101,197,2,0,0,115,
+    104,101,95,98,121,116,101,99,111,100,101,198,2,0,0,115,
     2,0,0,0,0,8,122,28,83,111,117,114,99,101,76,111,
     97,100,101,114,46,95,99,97,99,104,101,95,98,121,116,101,
     99,111,100,101,99,3,0,0,0,0,0,0,0,3,0,0,
@@ -1089,7 +1089,7 @@ const unsigned char _Py_M__importlib_external[] = {
     101,115,46,10,32,32,32,32,32,32,32,32,78,114,4,0,
     0,0,41,3,114,104,0,0,0,114,37,0,0,0,114,56,
     0,0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,
-    0,0,114,194,0,0,0,207,2,0,0,115,0,0,0,0,
+    0,0,114,194,0,0,0,208,2,0,0,115,0,0,0,0,
     122,21,83,111,117,114,99,101,76,111,97,100,101,114,46,115,
     101,116,95,100,97,116,97,99,2,0,0,0,0,0,0,0,
     5,0,0,0,16,0,0,0,67,0,0,0,115,82,0,0,
@@ -1110,7 +1110,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,0,114,123,0,0,0,114,37,0,0,0,114,151,0,
     0,0,218,3,101,120,99,114,4,0,0,0,114,4,0,0,
     0,114,6,0,0,0,218,10,103,101,116,95,115,111,117,114,
-    99,101,214,2,0,0,115,14,0,0,0,0,2,10,1,2,
+    99,101,215,2,0,0,115,14,0,0,0,0,2,10,1,2,
     1,14,1,16,1,4,1,28,1,122,23,83,111,117,114,99,
     101,76,111,97,100,101,114,46,103,101,116,95,115,111,117,114,
     99,101,114,31,0,0,0,41,1,218,9,95,111,112,116,105,
@@ -1131,7 +1131,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,218,7,99,111,109,112,105,108,101,41,4,114,104,0,0,
     0,114,56,0,0,0,114,37,0,0,0,114,199,0,0,0,
     114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,
-    14,115,111,117,114,99,101,95,116,111,95,99,111,100,101,224,
+    14,115,111,117,114,99,101,95,116,111,95,99,111,100,101,225,
     2,0,0,115,4,0,0,0,0,5,12,1,122,27,83,111,
     117,114,99,101,76,111,97,100,101,114,46,115,111,117,114,99,
     101,95,116,111,95,99,111,100,101,99,2,0,0,0,0,0,
@@ -1188,7 +1188,7 @@ const unsigned char _Py_M__importlib_external[] = {
     98,121,116,101,115,95,100,97,116,97,114,151,0,0,0,90,
     11,99,111,100,101,95,111,98,106,101,99,116,114,4,0,0,
     0,114,4,0,0,0,114,6,0,0,0,114,184,0,0,0,
-    232,2,0,0,115,78,0,0,0,0,7,10,1,4,1,2,
+    233,2,0,0,115,78,0,0,0,0,7,10,1,4,1,2,
     1,12,1,14,1,10,2,2,1,14,1,14,1,6,2,12,
     1,2,1,14,1,14,1,6,2,2,1,4,1,4,1,12,
     1,18,1,6,2,8,1,6,1,6,1,2,1,8,1,10,
@@ -1200,7 +1200,7 @@ const unsigned char _Py_M__importlib_external[] = {
     195,0,0,0,114,194,0,0,0,114,198,0,0,0,114,202,
     0,0,0,114,184,0,0,0,114,4,0,0,0,114,4,0,
     0,0,114,4,0,0,0,114,6,0,0,0,114,191,0,0,
-    0,174,2,0,0,115,14,0,0,0,8,2,8,8,8,13,
+    0,175,2,0,0,115,14,0,0,0,8,2,8,8,8,13,
     8,10,8,7,8,10,14,8,114,191,0,0,0,99,0,0,
     0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,
     0,0,115,80,0,0,0,101,0,90,1,100,0,90,2,100,
@@ -1226,7 +1226,7 @@ const unsigned char _Py_M__importlib_external[] = {
     102,105,110,100,101,114,46,78,41,2,114,102,0,0,0,114,
     37,0,0,0,41,3,114,104,0,0,0,114,123,0,0,0,
     114,37,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
-    6,0,0,0,114,182,0,0,0,33,3,0,0,115,4,0,
+    6,0,0,0,114,182,0,0,0,34,3,0,0,115,4,0,
     0,0,0,3,6,1,122,19,70,105,108,101,76,111,97,100,
     101,114,46,95,95,105,110,105,116,95,95,99,2,0,0,0,
     0,0,0,0,2,0,0,0,2,0,0,0,67,0,0,0,
@@ -1235,7 +1235,7 @@ const unsigned char _Py_M__importlib_external[] = {
     41,2,218,9,95,95,99,108,97,115,115,95,95,114,115,0,
     0,0,41,2,114,104,0,0,0,218,5,111,116,104,101,114,
     114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,
-    6,95,95,101,113,95,95,39,3,0,0,115,4,0,0,0,
+    6,95,95,101,113,95,95,40,3,0,0,115,4,0,0,0,
     0,1,12,1,122,17,70,105,108,101,76,111,97,100,101,114,
     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,20,0,0,
@@ -1243,7 +1243,7 @@ const unsigned char _Py_M__importlib_external[] = {
     1,65,0,83,0,41,1,78,41,3,218,4,104,97,115,104,
     114,102,0,0,0,114,37,0,0,0,41,1,114,104,0,0,
     0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,
-    218,8,95,95,104,97,115,104,95,95,43,3,0,0,115,2,
+    218,8,95,95,104,97,115,104,95,95,44,3,0,0,115,2,
     0,0,0,0,1,122,19,70,105,108,101,76,111,97,100,101,
     114,46,95,95,104,97,115,104,95,95,99,2,0,0,0,0,
     0,0,0,2,0,0,0,3,0,0,0,3,0,0,0,115,
@@ -1258,7 +1258,7 @@ const unsigned char _Py_M__importlib_external[] = {
     115,117,112,101,114,114,206,0,0,0,114,190,0,0,0,41,
     2,114,104,0,0,0,114,123,0,0,0,41,1,114,207,0,
     0,0,114,4,0,0,0,114,6,0,0,0,114,190,0,0,
-    0,46,3,0,0,115,2,0,0,0,0,10,122,22,70,105,
+    0,47,3,0,0,115,2,0,0,0,0,10,122,22,70,105,
     108,101,76,111,97,100,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,1,0,0,0,67,0,0,0,115,6,0,0,0,124,0,
@@ -1268,7 +1268,7 @@ const unsigned char _Py_M__importlib_external[] = {
     117,110,100,32,98,121,32,116,104,101,32,102,105,110,100,101,
     114,46,41,1,114,37,0,0,0,41,2,114,104,0,0,0,
     114,123,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
-    6,0,0,0,114,155,0,0,0,58,3,0,0,115,2,0,
+    6,0,0,0,114,155,0,0,0,59,3,0,0,115,2,0,
     0,0,0,3,122,23,70,105,108,101,76,111,97,100,101,114,
     46,103,101,116,95,102,105,108,101,110,97,109,101,99,2,0,
     0,0,0,0,0,0,3,0,0,0,9,0,0,0,67,0,
@@ -1280,7 +1280,7 @@ const unsigned char _Py_M__importlib_external[] = {
     115,46,218,1,114,78,41,3,114,52,0,0,0,114,53,0,
     0,0,90,4,114,101,97,100,41,3,114,104,0,0,0,114,
     37,0,0,0,114,57,0,0,0,114,4,0,0,0,114,4,
-    0,0,0,114,6,0,0,0,114,196,0,0,0,63,3,0,
+    0,0,0,114,6,0,0,0,114,196,0,0,0,64,3,0,
     0,115,4,0,0,0,0,2,14,1,122,19,70,105,108,101,
     76,111,97,100,101,114,46,103,101,116,95,100,97,116,97,41,
     12,114,109,0,0,0,114,108,0,0,0,114,110,0,0,0,
@@ -1289,7 +1289,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,0,114,196,0,0,0,90,13,95,95,99,108,97,115,
     115,99,101,108,108,95,95,114,4,0,0,0,114,4,0,0,
     0,41,1,114,207,0,0,0,114,6,0,0,0,114,206,0,
-    0,0,28,3,0,0,115,12,0,0,0,12,5,8,6,8,
+    0,0,29,3,0,0,115,12,0,0,0,12,5,8,6,8,
     4,8,3,16,12,12,5,114,206,0,0,0,99,0,0,0,
     0,0,0,0,0,0,0,0,0,3,0,0,0,64,0,0,
     0,115,46,0,0,0,101,0,90,1,100,0,90,2,100,1,
@@ -1310,7 +1310,7 @@ const unsigned char _Py_M__importlib_external[] = {
     218,8,115,116,95,109,116,105,109,101,90,7,115,116,95,115,
     105,122,101,41,3,114,104,0,0,0,114,37,0,0,0,114,
     204,0,0,0,114,4,0,0,0,114,4,0,0,0,114,6,
-    0,0,0,114,193,0,0,0,73,3,0,0,115,4,0,0,
+    0,0,0,114,193,0,0,0,74,3,0,0,115,4,0,0,
     0,0,2,8,1,122,27,83,111,117,114,99,101,70,105,108,
     101,76,111,97,100,101,114,46,112,97,116,104,95,115,116,97,
     116,115,99,4,0,0,0,0,0,0,0,5,0,0,0,5,
@@ -1320,7 +1320,7 @@ const unsigned char _Py_M__importlib_external[] = {
     41,2,114,101,0,0,0,114,194,0,0,0,41,5,114,104,
     0,0,0,114,94,0,0,0,114,93,0,0,0,114,56,0,
     0,0,114,44,0,0,0,114,4,0,0,0,114,4,0,0,
-    0,114,6,0,0,0,114,195,0,0,0,78,3,0,0,115,
+    0,114,6,0,0,0,114,195,0,0,0,79,3,0,0,115,
     4,0,0,0,0,2,8,1,122,32,83,111,117,114,99,101,
     70,105,108,101,76,111,97,100,101,114,46,95,99,97,99,104,
     101,95,98,121,116,101,99,111,100,101,105,182,1,0,0,41,
@@ -1355,7 +1355,7 @@ const unsigned char _Py_M__importlib_external[] = {
     114,216,0,0,0,218,6,112,97,114,101,110,116,114,98,0,
     0,0,114,29,0,0,0,114,25,0,0,0,114,197,0,0,
     0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,
-    114,194,0,0,0,83,3,0,0,115,42,0,0,0,0,2,
+    114,194,0,0,0,84,3,0,0,115,42,0,0,0,0,2,
     12,1,4,2,14,1,12,1,14,2,14,1,10,1,2,1,
     14,1,14,2,6,1,16,3,6,1,8,1,20,1,2,1,
     12,1,16,1,16,2,8,1,122,25,83,111,117,114,99,101,
@@ -1364,7 +1364,7 @@ const unsigned char _Py_M__importlib_external[] = {
     114,110,0,0,0,114,111,0,0,0,114,193,0,0,0,114,
     195,0,0,0,114,194,0,0,0,114,4,0,0,0,114,4,
     0,0,0,114,4,0,0,0,114,6,0,0,0,114,214,0,
-    0,0,69,3,0,0,115,6,0,0,0,12,4,8,5,8,
+    0,0,70,3,0,0,115,6,0,0,0,12,4,8,5,8,
     5,114,214,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,
@@ -1384,7 +1384,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,41,5,114,104,0,0,0,114,123,0,0,0,114,37,
     0,0,0,114,56,0,0,0,114,205,0,0,0,114,4,0,
     0,0,114,4,0,0,0,114,6,0,0,0,114,184,0,0,
-    0,118,3,0,0,115,8,0,0,0,0,1,10,1,10,1,
+    0,119,3,0,0,115,8,0,0,0,0,1,10,1,10,1,
     14,1,122,29,83,111,117,114,99,101,108,101,115,115,70,105,
     108,101,76,111,97,100,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,
@@ -1394,13 +1394,13 @@ const unsigned char _Py_M__importlib_external[] = {
     117,114,99,101,32,99,111,100,101,46,78,114,4,0,0,0,
     41,2,114,104,0,0,0,114,123,0,0,0,114,4,0,0,
     0,114,4,0,0,0,114,6,0,0,0,114,198,0,0,0,
-    124,3,0,0,115,2,0,0,0,0,2,122,31,83,111,117,
+    125,3,0,0,115,2,0,0,0,0,2,122,31,83,111,117,
     114,99,101,108,101,115,115,70,105,108,101,76,111,97,100,101,
     114,46,103,101,116,95,115,111,117,114,99,101,78,41,6,114,
     109,0,0,0,114,108,0,0,0,114,110,0,0,0,114,111,
     0,0,0,114,184,0,0,0,114,198,0,0,0,114,4,0,
     0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,
-    0,114,219,0,0,0,114,3,0,0,115,4,0,0,0,12,
+    0,114,219,0,0,0,115,3,0,0,115,4,0,0,0,12,
     4,8,6,114,219,0,0,0,99,0,0,0,0,0,0,0,
     0,0,0,0,0,3,0,0,0,64,0,0,0,115,92,0,
     0,0,101,0,90,1,100,0,90,2,100,1,90,3,100,2,
@@ -1422,7 +1422,7 @@ const unsigned char _Py_M__importlib_external[] = {
     78,41,2,114,102,0,0,0,114,37,0,0,0,41,3,114,
     104,0,0,0,114,102,0,0,0,114,37,0,0,0,114,4,
     0,0,0,114,4,0,0,0,114,6,0,0,0,114,182,0,
-    0,0,141,3,0,0,115,4,0,0,0,0,1,6,1,122,
+    0,0,142,3,0,0,115,4,0,0,0,0,1,6,1,122,
     28,69,120,116,101,110,115,105,111,110,70,105,108,101,76,111,
     97,100,101,114,46,95,95,105,110,105,116,95,95,99,2,0,
     0,0,0,0,0,0,2,0,0,0,2,0,0,0,67,0,
@@ -1430,7 +1430,7 @@ const unsigned char _Py_M__importlib_external[] = {
     2,111,22,124,0,106,1,124,1,106,1,107,2,83,0,41,
     1,78,41,2,114,207,0,0,0,114,115,0,0,0,41,2,
     114,104,0,0,0,114,208,0,0,0,114,4,0,0,0,114,
-    4,0,0,0,114,6,0,0,0,114,209,0,0,0,145,3,
+    4,0,0,0,114,6,0,0,0,114,209,0,0,0,146,3,
     0,0,115,4,0,0,0,0,1,12,1,122,26,69,120,116,
     101,110,115,105,111,110,70,105,108,101,76,111,97,100,101,114,
     46,95,95,101,113,95,95,99,1,0,0,0,0,0,0,0,
@@ -1439,7 +1439,7 @@ const unsigned char _Py_M__importlib_external[] = {
     1,65,0,83,0,41,1,78,41,3,114,210,0,0,0,114,
     102,0,0,0,114,37,0,0,0,41,1,114,104,0,0,0,
     114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,114,
-    211,0,0,0,149,3,0,0,115,2,0,0,0,0,1,122,
+    211,0,0,0,150,3,0,0,115,2,0,0,0,0,1,122,
     28,69,120,116,101,110,115,105,111,110,70,105,108,101,76,111,
     97,100,101,114,46,95,95,104,97,115,104,95,95,99,2,0,
     0,0,0,0,0,0,3,0,0,0,5,0,0,0,67,0,
@@ -1456,7 +1456,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,0,114,102,0,0,0,114,37,0,0,0,41,3,114,
     104,0,0,0,114,162,0,0,0,114,187,0,0,0,114,4,
     0,0,0,114,4,0,0,0,114,6,0,0,0,114,183,0,
-    0,0,152,3,0,0,115,10,0,0,0,0,2,4,1,10,
+    0,0,153,3,0,0,115,10,0,0,0,0,2,4,1,10,
     1,6,1,12,1,122,33,69,120,116,101,110,115,105,111,110,
     70,105,108,101,76,111,97,100,101,114,46,99,114,101,97,116,
     101,95,109,111,100,117,108,101,99,2,0,0,0,0,0,0,
@@ -1473,7 +1473,7 @@ const unsigned char _Py_M__importlib_external[] = {
     105,99,114,133,0,0,0,114,102,0,0,0,114,37,0,0,
     0,41,2,114,104,0,0,0,114,187,0,0,0,114,4,0,
     0,0,114,4,0,0,0,114,6,0,0,0,114,188,0,0,
-    0,160,3,0,0,115,6,0,0,0,0,2,14,1,6,1,
+    0,161,3,0,0,115,6,0,0,0,0,2,14,1,6,1,
     122,31,69,120,116,101,110,115,105,111,110,70,105,108,101,76,
     111,97,100,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,4,0,
@@ -1490,7 +1490,7 @@ const unsigned char _Py_M__importlib_external[] = {
     182,0,0,0,78,114,4,0,0,0,41,2,114,24,0,0,
     0,218,6,115,117,102,102,105,120,41,1,218,9,102,105,108,
     101,95,110,97,109,101,114,4,0,0,0,114,6,0,0,0,
-    250,9,60,103,101,110,101,120,112,114,62,169,3,0,0,115,
+    250,9,60,103,101,110,101,120,112,114,62,170,3,0,0,115,
     2,0,0,0,4,1,122,49,69,120,116,101,110,115,105,111,
     110,70,105,108,101,76,111,97,100,101,114,46,105,115,95,112,
     97,99,107,97,103,101,46,60,108,111,99,97,108,115,62,46,
@@ -1499,7 +1499,7 @@ const unsigned char _Py_M__importlib_external[] = {
     78,83,73,79,78,95,83,85,70,70,73,88,69,83,41,2,
     114,104,0,0,0,114,123,0,0,0,114,4,0,0,0,41,
     1,114,222,0,0,0,114,6,0,0,0,114,157,0,0,0,
-    166,3,0,0,115,6,0,0,0,0,2,14,1,12,1,122,
+    167,3,0,0,115,6,0,0,0,0,2,14,1,12,1,122,
     30,69,120,116,101,110,115,105,111,110,70,105,108,101,76,111,
     97,100,101,114,46,105,115,95,112,97,99,107,97,103,101,99,
     2,0,0,0,0,0,0,0,2,0,0,0,1,0,0,0,
@@ -1510,7 +1510,7 @@ const unsigned char _Py_M__importlib_external[] = {
     101,32,97,32,99,111,100,101,32,111,98,106,101,99,116,46,
     78,114,4,0,0,0,41,2,114,104,0,0,0,114,123,0,
     0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,
-    0,114,184,0,0,0,172,3,0,0,115,2,0,0,0,0,
+    0,114,184,0,0,0,173,3,0,0,115,2,0,0,0,0,
     2,122,28,69,120,116,101,110,115,105,111,110,70,105,108,101,
     76,111,97,100,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,
@@ -1520,7 +1520,7 @@ const unsigned char _Py_M__importlib_external[] = {
     115,32,104,97,118,101,32,110,111,32,115,111,117,114,99,101,
     32,99,111,100,101,46,78,114,4,0,0,0,41,2,114,104,
     0,0,0,114,123,0,0,0,114,4,0,0,0,114,4,0,
-    0,0,114,6,0,0,0,114,198,0,0,0,176,3,0,0,
+    0,0,114,6,0,0,0,114,198,0,0,0,177,3,0,0,
     115,2,0,0,0,0,2,122,30,69,120,116,101,110,115,105,
     111,110,70,105,108,101,76,111,97,100,101,114,46,103,101,116,
     95,115,111,117,114,99,101,99,2,0,0,0,0,0,0,0,
@@ -1531,7 +1531,7 @@ const unsigned char _Py_M__importlib_external[] = {
     32,102,111,117,110,100,32,98,121,32,116,104,101,32,102,105,
     110,100,101,114,46,41,1,114,37,0,0,0,41,2,114,104,
     0,0,0,114,123,0,0,0,114,4,0,0,0,114,4,0,
-    0,0,114,6,0,0,0,114,155,0,0,0,180,3,0,0,
+    0,0,114,6,0,0,0,114,155,0,0,0,181,3,0,0,
     115,2,0,0,0,0,3,122,32,69,120,116,101,110,115,105,
     111,110,70,105,108,101,76,111,97,100,101,114,46,103,101,116,
     95,102,105,108,101,110,97,109,101,78,41,14,114,109,0,0,
@@ -1540,7 +1540,7 @@ const unsigned char _Py_M__importlib_external[] = {
     183,0,0,0,114,188,0,0,0,114,157,0,0,0,114,184,
     0,0,0,114,198,0,0,0,114,120,0,0,0,114,155,0,
     0,0,114,4,0,0,0,114,4,0,0,0,114,4,0,0,
-    0,114,6,0,0,0,114,220,0,0,0,133,3,0,0,115,
+    0,114,6,0,0,0,114,220,0,0,0,134,3,0,0,115,
     18,0,0,0,12,8,8,4,8,4,8,3,8,8,8,6,
     8,6,8,4,8,4,114,220,0,0,0,99,0,0,0,0,
     0,0,0,0,0,0,0,0,2,0,0,0,64,0,0,0,
@@ -1581,7 +1581,7 @@ const unsigned char _Py_M__importlib_external[] = {
     112,97,116,104,95,102,105,110,100,101,114,41,4,114,104,0,
     0,0,114,102,0,0,0,114,37,0,0,0,218,11,112,97,
     116,104,95,102,105,110,100,101,114,114,4,0,0,0,114,4,
-    0,0,0,114,6,0,0,0,114,182,0,0,0,193,3,0,
+    0,0,0,114,6,0,0,0,114,182,0,0,0,194,3,0,
     0,115,8,0,0,0,0,1,6,1,6,1,14,1,122,23,
     95,78,97,109,101,115,112,97,99,101,80,97,116,104,46,95,
     95,105,110,105,116,95,95,99,1,0,0,0,0,0,0,0,
@@ -1599,7 +1599,7 @@ const unsigned char _Py_M__importlib_external[] = {
     4,114,104,0,0,0,114,218,0,0,0,218,3,100,111,116,
     90,2,109,101,114,4,0,0,0,114,4,0,0,0,114,6,
     0,0,0,218,23,95,102,105,110,100,95,112,97,114,101,110,
-    116,95,112,97,116,104,95,110,97,109,101,115,199,3,0,0,
+    116,95,112,97,116,104,95,110,97,109,101,115,200,3,0,0,
     115,8,0,0,0,0,2,18,1,8,2,4,3,122,38,95,
     78,97,109,101,115,112,97,99,101,80,97,116,104,46,95,102,
     105,110,100,95,112,97,114,101,110,116,95,112,97,116,104,95,
@@ -1612,7 +1612,7 @@ const unsigned char _Py_M__importlib_external[] = {
     18,112,97,114,101,110,116,95,109,111,100,117,108,101,95,110,
     97,109,101,90,14,112,97,116,104,95,97,116,116,114,95,110,
     97,109,101,114,4,0,0,0,114,4,0,0,0,114,6,0,
-    0,0,114,229,0,0,0,209,3,0,0,115,4,0,0,0,
+    0,0,114,229,0,0,0,210,3,0,0,115,4,0,0,0,
     0,1,12,1,122,31,95,78,97,109,101,115,112,97,99,101,
     80,97,116,104,46,95,103,101,116,95,112,97,114,101,110,116,
     95,112,97,116,104,99,1,0,0,0,0,0,0,0,3,0,
@@ -1628,7 +1628,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,0,90,11,112,97,114,101,110,116,95,112,97,116,104,
     114,162,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
     6,0,0,0,218,12,95,114,101,99,97,108,99,117,108,97,
-    116,101,213,3,0,0,115,16,0,0,0,0,2,12,1,10,
+    116,101,214,3,0,0,115,16,0,0,0,0,2,12,1,10,
     1,14,3,18,1,6,1,8,1,6,1,122,27,95,78,97,
     109,101,115,112,97,99,101,80,97,116,104,46,95,114,101,99,
     97,108,99,117,108,97,116,101,99,1,0,0,0,0,0,0,
@@ -1636,7 +1636,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,116,0,124,0,160,1,161,0,131,1,83,0,41,1,
     78,41,2,218,4,105,116,101,114,114,236,0,0,0,41,1,
     114,104,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
-    6,0,0,0,218,8,95,95,105,116,101,114,95,95,226,3,
+    6,0,0,0,218,8,95,95,105,116,101,114,95,95,227,3,
     0,0,115,2,0,0,0,0,1,122,23,95,78,97,109,101,
     115,112,97,99,101,80,97,116,104,46,95,95,105,116,101,114,
     95,95,99,3,0,0,0,0,0,0,0,3,0,0,0,3,
@@ -1645,14 +1645,14 @@ const unsigned char _Py_M__importlib_external[] = {
     228,0,0,0,41,3,114,104,0,0,0,218,5,105,110,100,
     101,120,114,37,0,0,0,114,4,0,0,0,114,4,0,0,
     0,114,6,0,0,0,218,11,95,95,115,101,116,105,116,101,
-    109,95,95,229,3,0,0,115,2,0,0,0,0,1,122,26,
+    109,95,95,230,3,0,0,115,2,0,0,0,0,1,122,26,
     95,78,97,109,101,115,112,97,99,101,80,97,116,104,46,95,
     95,115,101,116,105,116,101,109,95,95,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,116,0,124,0,160,1,161,0,131,1,83,0,
     41,1,78,41,2,114,33,0,0,0,114,236,0,0,0,41,
     1,114,104,0,0,0,114,4,0,0,0,114,4,0,0,0,
-    114,6,0,0,0,218,7,95,95,108,101,110,95,95,232,3,
+    114,6,0,0,0,218,7,95,95,108,101,110,95,95,233,3,
     0,0,115,2,0,0,0,0,1,122,22,95,78,97,109,101,
     115,112,97,99,101,80,97,116,104,46,95,95,108,101,110,95,
     95,99,1,0,0,0,0,0,0,0,1,0,0,0,3,0,
@@ -1661,7 +1661,7 @@ const unsigned char _Py_M__importlib_external[] = {
     101,115,112,97,99,101,80,97,116,104,40,123,33,114,125,41,
     41,2,114,50,0,0,0,114,228,0,0,0,41,1,114,104,
     0,0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,
-    0,0,218,8,95,95,114,101,112,114,95,95,235,3,0,0,
+    0,0,218,8,95,95,114,101,112,114,95,95,236,3,0,0,
     115,2,0,0,0,0,1,122,23,95,78,97,109,101,115,112,
     97,99,101,80,97,116,104,46,95,95,114,101,112,114,95,95,
     99,2,0,0,0,0,0,0,0,2,0,0,0,3,0,0,
@@ -1669,7 +1669,7 @@ const unsigned char _Py_M__importlib_external[] = {
     161,0,107,6,83,0,41,1,78,41,1,114,236,0,0,0,
     41,2,114,104,0,0,0,218,4,105,116,101,109,114,4,0,
     0,0,114,4,0,0,0,114,6,0,0,0,218,12,95,95,
-    99,111,110,116,97,105,110,115,95,95,238,3,0,0,115,2,
+    99,111,110,116,97,105,110,115,95,95,239,3,0,0,115,2,
     0,0,0,0,1,122,27,95,78,97,109,101,115,112,97,99,
     101,80,97,116,104,46,95,95,99,111,110,116,97,105,110,115,
     95,95,99,2,0,0,0,0,0,0,0,2,0,0,0,3,
@@ -1677,7 +1677,7 @@ const unsigned char _Py_M__importlib_external[] = {
     160,1,124,1,161,1,1,0,100,0,83,0,41,1,78,41,
     2,114,228,0,0,0,114,161,0,0,0,41,2,114,104,0,
     0,0,114,243,0,0,0,114,4,0,0,0,114,4,0,0,
-    0,114,6,0,0,0,114,161,0,0,0,241,3,0,0,115,
+    0,114,6,0,0,0,114,161,0,0,0,242,3,0,0,115,
     2,0,0,0,0,1,122,21,95,78,97,109,101,115,112,97,
     99,101,80,97,116,104,46,97,112,112,101,110,100,78,41,14,
     114,109,0,0,0,114,108,0,0,0,114,110,0,0,0,114,
@@ -1685,7 +1685,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,0,114,236,0,0,0,114,238,0,0,0,114,240,0,
     0,0,114,241,0,0,0,114,242,0,0,0,114,244,0,0,
     0,114,161,0,0,0,114,4,0,0,0,114,4,0,0,0,
-    114,4,0,0,0,114,6,0,0,0,114,226,0,0,0,186,
+    114,4,0,0,0,114,6,0,0,0,114,226,0,0,0,187,
     3,0,0,115,20,0,0,0,12,7,8,6,8,10,8,4,
     8,13,8,3,8,3,8,3,8,3,8,3,114,226,0,0,
     0,99,0,0,0,0,0,0,0,0,0,0,0,0,3,0,
@@ -1702,7 +1702,7 @@ const unsigned char _Py_M__importlib_external[] = {
     114,226,0,0,0,114,228,0,0,0,41,4,114,104,0,0,
     0,114,102,0,0,0,114,37,0,0,0,114,232,0,0,0,
     114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,114,
-    182,0,0,0,247,3,0,0,115,2,0,0,0,0,1,122,
+    182,0,0,0,248,3,0,0,115,2,0,0,0,0,1,122,
     25,95,78,97,109,101,115,112,97,99,101,76,111,97,100,101,
     114,46,95,95,105,110,105,116,95,95,99,2,0,0,0,0,
     0,0,0,2,0,0,0,3,0,0,0,67,0,0,0,115,
@@ -1719,21 +1719,21 @@ const unsigned char _Py_M__importlib_external[] = {
     41,62,41,2,114,50,0,0,0,114,109,0,0,0,41,2,
     114,168,0,0,0,114,187,0,0,0,114,4,0,0,0,114,
     4,0,0,0,114,6,0,0,0,218,11,109,111,100,117,108,
-    101,95,114,101,112,114,250,3,0,0,115,2,0,0,0,0,
+    101,95,114,101,112,114,251,3,0,0,115,2,0,0,0,0,
     7,122,28,95,78,97,109,101,115,112,97,99,101,76,111,97,
     100,101,114,46,109,111,100,117,108,101,95,114,101,112,114,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,78,
     84,114,4,0,0,0,41,2,114,104,0,0,0,114,123,0,
     0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,
-    0,114,157,0,0,0,3,4,0,0,115,2,0,0,0,0,
+    0,114,157,0,0,0,4,4,0,0,115,2,0,0,0,0,
     1,122,27,95,78,97,109,101,115,112,97,99,101,76,111,97,
     100,101,114,46,105,115,95,112,97,99,107,97,103,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,78,114,
     32,0,0,0,114,4,0,0,0,41,2,114,104,0,0,0,
     114,123,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
-    6,0,0,0,114,198,0,0,0,6,4,0,0,115,2,0,
+    6,0,0,0,114,198,0,0,0,7,4,0,0,115,2,0,
     0,0,0,1,122,27,95,78,97,109,101,115,112,97,99,101,
     76,111,97,100,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,6,0,
@@ -1743,7 +1743,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,84,41,1,114,200,0,0,0,41,1,114,201,0,0,
     0,41,2,114,104,0,0,0,114,123,0,0,0,114,4,0,
     0,0,114,4,0,0,0,114,6,0,0,0,114,184,0,0,
-    0,9,4,0,0,115,2,0,0,0,0,1,122,25,95,78,
+    0,10,4,0,0,115,2,0,0,0,0,1,122,25,95,78,
     97,109,101,115,112,97,99,101,76,111,97,100,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,
@@ -1752,14 +1752,14 @@ const unsigned char _Py_M__importlib_external[] = {
     111,114,32,109,111,100,117,108,101,32,99,114,101,97,116,105,
     111,110,46,78,114,4,0,0,0,41,2,114,104,0,0,0,
     114,162,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
-    6,0,0,0,114,183,0,0,0,12,4,0,0,115,0,0,
+    6,0,0,0,114,183,0,0,0,13,4,0,0,115,0,0,
     0,0,122,30,95,78,97,109,101,115,112,97,99,101,76,111,
     97,100,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,1,
     0,0,0,67,0,0,0,115,4,0,0,0,100,0,83,0,
     41,1,78,114,4,0,0,0,41,2,114,104,0,0,0,114,
     187,0,0,0,114,4,0,0,0,114,4,0,0,0,114,6,
-    0,0,0,114,188,0,0,0,15,4,0,0,115,2,0,0,
+    0,0,0,114,188,0,0,0,16,4,0,0,115,2,0,0,
     0,0,1,122,28,95,78,97,109,101,115,112,97,99,101,76,
     111,97,100,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,4,0,
@@ -1777,7 +1777,7 @@ const unsigned char _Py_M__importlib_external[] = {
     33,114,125,41,4,114,118,0,0,0,114,133,0,0,0,114,
     228,0,0,0,114,189,0,0,0,41,2,114,104,0,0,0,
     114,123,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
-    6,0,0,0,114,190,0,0,0,18,4,0,0,115,6,0,
+    6,0,0,0,114,190,0,0,0,19,4,0,0,115,6,0,
     0,0,0,7,6,1,8,1,122,28,95,78,97,109,101,115,
     112,97,99,101,76,111,97,100,101,114,46,108,111,97,100,95,
     109,111,100,117,108,101,78,41,12,114,109,0,0,0,114,108,
@@ -1785,7 +1785,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,114,246,0,0,0,114,157,0,0,0,114,198,0,0,
     0,114,184,0,0,0,114,183,0,0,0,114,188,0,0,0,
     114,190,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
-    4,0,0,0,114,6,0,0,0,114,245,0,0,0,246,3,
+    4,0,0,0,114,6,0,0,0,114,245,0,0,0,247,3,
     0,0,115,16,0,0,0,8,1,8,3,12,9,8,3,8,
     3,8,3,8,3,8,3,114,245,0,0,0,99,0,0,0,
     0,0,0,0,0,0,0,0,0,4,0,0,0,64,0,0,
@@ -1819,7 +1819,7 @@ const unsigned char _Py_M__importlib_external[] = {
     99,104,101,218,6,118,97,108,117,101,115,114,112,0,0,0,
     114,248,0,0,0,41,2,114,168,0,0,0,218,6,102,105,
     110,100,101,114,114,4,0,0,0,114,4,0,0,0,114,6,
-    0,0,0,114,248,0,0,0,36,4,0,0,115,6,0,0,
+    0,0,0,114,248,0,0,0,37,4,0,0,115,6,0,0,
     0,0,4,16,1,10,1,122,28,80,97,116,104,70,105,110,
     100,101,114,46,105,110,118,97,108,105,100,97,116,101,95,99,
     97,99,104,101,115,99,2,0,0,0,0,0,0,0,3,0,
@@ -1839,7 +1839,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,114,103,0,0,0,41,3,114,168,0,0,0,114,37,0,
     0,0,90,4,104,111,111,107,114,4,0,0,0,114,4,0,
     0,0,114,6,0,0,0,218,11,95,112,97,116,104,95,104,
-    111,111,107,115,44,4,0,0,115,16,0,0,0,0,3,16,
+    111,111,107,115,45,4,0,0,115,16,0,0,0,0,3,16,
     1,12,1,12,1,2,1,8,1,14,1,12,2,122,22,80,
     97,116,104,70,105,110,100,101,114,46,95,112,97,116,104,95,
     104,111,111,107,115,99,2,0,0,0,0,0,0,0,3,0,
@@ -1870,7 +1870,7 @@ const unsigned char _Py_M__importlib_external[] = {
     253,0,0,0,41,3,114,168,0,0,0,114,37,0,0,0,
     114,251,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
     6,0,0,0,218,20,95,112,97,116,104,95,105,109,112,111,
-    114,116,101,114,95,99,97,99,104,101,57,4,0,0,115,22,
+    114,116,101,114,95,99,97,99,104,101,58,4,0,0,115,22,
     0,0,0,0,8,8,1,2,1,12,1,14,3,6,1,2,
     1,14,1,14,1,10,1,16,1,122,31,80,97,116,104,70,
     105,110,100,101,114,46,95,112,97,116,104,95,105,109,112,111,
@@ -1888,7 +1888,7 @@ const unsigned char _Py_M__importlib_external[] = {
     251,0,0,0,114,124,0,0,0,114,125,0,0,0,114,162,
     0,0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,
     0,0,218,16,95,108,101,103,97,99,121,95,103,101,116,95,
-    115,112,101,99,79,4,0,0,115,18,0,0,0,0,4,10,
+    115,112,101,99,80,4,0,0,115,18,0,0,0,0,4,10,
     1,16,2,10,1,4,1,8,1,12,1,12,1,6,1,122,
     27,80,97,116,104,70,105,110,100,101,114,46,95,108,101,103,
     97,99,121,95,103,101,116,95,115,112,101,99,78,99,4,0,
@@ -1919,7 +1919,7 @@ const unsigned char _Py_M__importlib_external[] = {
     115,112,97,99,101,95,112,97,116,104,90,5,101,110,116,114,
     121,114,251,0,0,0,114,162,0,0,0,114,125,0,0,0,
     114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,
-    9,95,103,101,116,95,115,112,101,99,94,4,0,0,115,40,
+    9,95,103,101,116,95,115,112,101,99,95,4,0,0,115,40,
     0,0,0,0,5,4,1,10,1,14,1,2,1,10,1,8,
     1,10,1,14,2,12,1,8,1,2,1,10,1,4,1,6,
     1,8,1,8,5,14,2,12,1,6,1,122,20,80,97,116,
@@ -1947,7 +1947,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,41,6,114,168,0,0,0,114,123,0,0,0,114,37,0,
     0,0,114,177,0,0,0,114,162,0,0,0,114,2,1,0,
     0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,
-    114,178,0,0,0,126,4,0,0,115,26,0,0,0,0,6,
+    114,178,0,0,0,127,4,0,0,115,26,0,0,0,0,6,
     8,1,6,1,14,1,8,1,4,1,10,1,6,1,4,3,
     6,1,16,1,4,2,6,2,122,20,80,97,116,104,70,105,
     110,100,101,114,46,102,105,110,100,95,115,112,101,99,99,3,
@@ -1968,7 +1968,7 @@ const unsigned char _Py_M__importlib_external[] = {
     32,32,32,32,78,41,2,114,178,0,0,0,114,124,0,0,
     0,41,4,114,168,0,0,0,114,123,0,0,0,114,37,0,
     0,0,114,162,0,0,0,114,4,0,0,0,114,4,0,0,
-    0,114,6,0,0,0,114,179,0,0,0,150,4,0,0,115,
+    0,114,6,0,0,0,114,179,0,0,0,151,4,0,0,115,
     8,0,0,0,0,8,12,1,8,1,4,1,122,22,80,97,
     116,104,70,105,110,100,101,114,46,102,105,110,100,95,109,111,
     100,117,108,101,41,1,78,41,2,78,78,41,1,78,41,12,
@@ -1977,7 +1977,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,0,114,255,0,0,0,114,0,1,0,0,114,3,1,
     0,0,114,178,0,0,0,114,179,0,0,0,114,4,0,0,
     0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,
-    114,247,0,0,0,32,4,0,0,115,20,0,0,0,12,4,
+    114,247,0,0,0,33,4,0,0,115,20,0,0,0,12,4,
     12,8,12,13,12,22,12,15,2,1,12,31,2,1,12,23,
     2,1,114,247,0,0,0,99,0,0,0,0,0,0,0,0,
     0,0,0,0,3,0,0,0,64,0,0,0,115,90,0,0,
@@ -2021,7 +2021,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,113,2,100,0,83,0,41,1,78,114,4,0,0,0,41,
     2,114,24,0,0,0,114,221,0,0,0,41,1,114,124,0,
     0,0,114,4,0,0,0,114,6,0,0,0,114,223,0,0,
-    0,179,4,0,0,115,2,0,0,0,4,0,122,38,70,105,
+    0,180,4,0,0,115,2,0,0,0,4,0,122,38,70,105,
     108,101,70,105,110,100,101,114,46,95,95,105,110,105,116,95,
     95,46,60,108,111,99,97,108,115,62,46,60,103,101,110,101,
     120,112,114,62,114,61,0,0,0,114,31,0,0,0,78,114,
@@ -2033,7 +2033,7 @@ const unsigned char _Py_M__importlib_external[] = {
     114,104,0,0,0,114,37,0,0,0,218,14,108,111,97,100,
     101,114,95,100,101,116,97,105,108,115,90,7,108,111,97,100,
     101,114,115,114,164,0,0,0,114,4,0,0,0,41,1,114,
-    124,0,0,0,114,6,0,0,0,114,182,0,0,0,173,4,
+    124,0,0,0,114,6,0,0,0,114,182,0,0,0,174,4,
     0,0,115,16,0,0,0,0,4,4,1,14,1,28,1,6,
     2,10,1,6,1,8,1,122,19,70,105,108,101,70,105,110,
     100,101,114,46,95,95,105,110,105,116,95,95,99,1,0,0,
@@ -2044,7 +2044,7 @@ const unsigned char _Py_M__importlib_external[] = {
     109,101,46,114,31,0,0,0,78,114,91,0,0,0,41,1,
     114,6,1,0,0,41,1,114,104,0,0,0,114,4,0,0,
     0,114,4,0,0,0,114,6,0,0,0,114,248,0,0,0,
-    187,4,0,0,115,2,0,0,0,0,2,122,28,70,105,108,
+    188,4,0,0,115,2,0,0,0,0,2,122,28,70,105,108,
     101,70,105,110,100,101,114,46,105,110,118,97,108,105,100,97,
     116,101,95,99,97,99,104,101,115,99,2,0,0,0,0,0,
     0,0,3,0,0,0,3,0,0,0,67,0,0,0,115,42,
@@ -2066,7 +2066,7 @@ const unsigned char _Py_M__importlib_external[] = {
     32,32,32,32,32,32,78,41,3,114,178,0,0,0,114,124,
     0,0,0,114,154,0,0,0,41,3,114,104,0,0,0,114,
     123,0,0,0,114,162,0,0,0,114,4,0,0,0,114,4,
-    0,0,0,114,6,0,0,0,114,121,0,0,0,193,4,0,
+    0,0,0,114,6,0,0,0,114,121,0,0,0,194,4,0,
     0,115,8,0,0,0,0,7,10,1,8,1,8,1,122,22,
     70,105,108,101,70,105,110,100,101,114,46,102,105,110,100,95,
     108,111,97,100,101,114,99,6,0,0,0,0,0,0,0,7,
@@ -2077,7 +2077,7 @@ const unsigned char _Py_M__importlib_external[] = {
     41,7,114,104,0,0,0,114,163,0,0,0,114,123,0,0,
     0,114,37,0,0,0,90,4,115,109,115,108,114,177,0,0,
     0,114,124,0,0,0,114,4,0,0,0,114,4,0,0,0,
-    114,6,0,0,0,114,3,1,0,0,205,4,0,0,115,6,
+    114,6,0,0,0,114,3,1,0,0,206,4,0,0,115,6,
     0,0,0,0,1,10,1,8,1,122,20,70,105,108,101,70,
     105,110,100,101,114,46,95,103,101,116,95,115,112,101,99,78,
     99,3,0,0,0,0,0,0,0,14,0,0,0,16,0,0,
@@ -2132,7 +2132,7 @@ const unsigned char _Py_M__importlib_external[] = {
     90,13,105,110,105,116,95,102,105,108,101,110,97,109,101,90,
     9,102,117,108,108,95,112,97,116,104,114,162,0,0,0,114,
     4,0,0,0,114,4,0,0,0,114,6,0,0,0,114,178,
-    0,0,0,210,4,0,0,115,70,0,0,0,0,5,4,1,
+    0,0,0,211,4,0,0,115,70,0,0,0,0,5,4,1,
     14,1,2,1,24,1,14,1,10,1,10,1,8,1,6,2,
     6,1,6,1,10,2,6,1,4,2,8,1,12,1,16,1,
     8,1,10,1,8,1,24,4,8,2,16,1,16,1,16,1,
@@ -2163,7 +2163,7 @@ const unsigned char _Py_M__importlib_external[] = {
     1,160,0,161,0,146,2,113,4,83,0,114,4,0,0,0,
     41,1,114,92,0,0,0,41,2,114,24,0,0,0,90,2,
     102,110,114,4,0,0,0,114,4,0,0,0,114,6,0,0,
-    0,250,9,60,115,101,116,99,111,109,112,62,31,5,0,0,
+    0,250,9,60,115,101,116,99,111,109,112,62,32,5,0,0,
     115,2,0,0,0,6,0,122,41,70,105,108,101,70,105,110,
     100,101,114,46,95,102,105,108,108,95,99,97,99,104,101,46,
     60,108,111,99,97,108,115,62,46,60,115,101,116,99,111,109,
@@ -2180,7 +2180,7 @@ const unsigned char _Py_M__importlib_external[] = {
     105,120,95,99,111,110,116,101,110,116,115,114,243,0,0,0,
     114,102,0,0,0,114,233,0,0,0,114,221,0,0,0,90,
     8,110,101,119,95,110,97,109,101,114,4,0,0,0,114,4,
-    0,0,0,114,6,0,0,0,114,11,1,0,0,2,5,0,
+    0,0,0,114,6,0,0,0,114,11,1,0,0,3,5,0,
     0,115,34,0,0,0,0,2,6,1,2,1,22,1,20,3,
     10,3,12,1,12,7,6,1,10,1,16,1,4,1,18,2,
     4,1,14,1,6,1,12,1,122,22,70,105,108,101,70,105,
@@ -2218,7 +2218,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,114,103,0,0,0,41,1,114,37,0,0,0,41,2,
     114,168,0,0,0,114,10,1,0,0,114,4,0,0,0,114,
     6,0,0,0,218,24,112,97,116,104,95,104,111,111,107,95,
-    102,111,114,95,70,105,108,101,70,105,110,100,101,114,43,5,
+    102,111,114,95,70,105,108,101,70,105,110,100,101,114,44,5,
     0,0,115,6,0,0,0,0,2,8,1,12,1,122,54,70,
     105,108,101,70,105,110,100,101,114,46,112,97,116,104,95,104,
     111,111,107,46,60,108,111,99,97,108,115,62,46,112,97,116,
@@ -2226,7 +2226,7 @@ const unsigned char _Py_M__importlib_external[] = {
     105,110,100,101,114,114,4,0,0,0,41,3,114,168,0,0,
     0,114,10,1,0,0,114,16,1,0,0,114,4,0,0,0,
     41,2,114,168,0,0,0,114,10,1,0,0,114,6,0,0,
-    0,218,9,112,97,116,104,95,104,111,111,107,33,5,0,0,
+    0,218,9,112,97,116,104,95,104,111,111,107,34,5,0,0,
     115,4,0,0,0,0,10,14,6,122,20,70,105,108,101,70,
     105,110,100,101,114,46,112,97,116,104,95,104,111,111,107,99,
     1,0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,
@@ -2235,7 +2235,7 @@ const unsigned char _Py_M__importlib_external[] = {
     110,100,101,114,40,123,33,114,125,41,41,2,114,50,0,0,
     0,114,37,0,0,0,41,1,114,104,0,0,0,114,4,0,
     0,0,114,4,0,0,0,114,6,0,0,0,114,242,0,0,
-    0,51,5,0,0,115,2,0,0,0,0,1,122,19,70,105,
+    0,52,5,0,0,115,2,0,0,0,0,1,122,19,70,105,
     108,101,70,105,110,100,101,114,46,95,95,114,101,112,114,95,
     95,41,1,78,41,15,114,109,0,0,0,114,108,0,0,0,
     114,110,0,0,0,114,111,0,0,0,114,182,0,0,0,114,
@@ -2243,7 +2243,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,0,114,3,1,0,0,114,178,0,0,0,114,11,1,
     0,0,114,180,0,0,0,114,17,1,0,0,114,242,0,0,
     0,114,4,0,0,0,114,4,0,0,0,114,4,0,0,0,
-    114,6,0,0,0,114,4,1,0,0,164,4,0,0,115,18,
+    114,6,0,0,0,114,4,1,0,0,165,4,0,0,115,18,
     0,0,0,12,9,8,14,8,4,4,2,8,12,8,5,10,
     48,8,31,12,18,114,4,1,0,0,99,4,0,0,0,0,
     0,0,0,6,0,0,0,11,0,0,0,67,0,0,0,115,
@@ -2266,7 +2266,7 @@ const unsigned char _Py_M__importlib_external[] = {
     97,116,104,110,97,109,101,90,9,99,112,97,116,104,110,97,
     109,101,114,124,0,0,0,114,162,0,0,0,114,4,0,0,
     0,114,4,0,0,0,114,6,0,0,0,218,14,95,102,105,
-    120,95,117,112,95,109,111,100,117,108,101,57,5,0,0,115,
+    120,95,117,112,95,109,111,100,117,108,101,58,5,0,0,115,
     34,0,0,0,0,2,10,1,10,1,4,1,4,1,8,1,
     8,1,12,2,10,1,4,1,14,1,2,1,8,1,8,1,
     8,1,12,1,14,2,114,22,1,0,0,99,0,0,0,0,
@@ -2286,7 +2286,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,41,3,90,10,101,120,116,101,110,115,105,111,110,115,
     90,6,115,111,117,114,99,101,90,8,98,121,116,101,99,111,
     100,101,114,4,0,0,0,114,4,0,0,0,114,6,0,0,
-    0,114,159,0,0,0,80,5,0,0,115,8,0,0,0,0,
+    0,114,159,0,0,0,81,5,0,0,115,8,0,0,0,0,
     5,12,1,8,1,8,1,114,159,0,0,0,99,1,0,0,
     0,0,0,0,0,12,0,0,0,12,0,0,0,67,0,0,
     0,115,156,1,0,0,124,0,97,0,116,0,106,1,97,1,
@@ -2337,7 +2337,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,41,2,114,31,0,0,0,78,41,1,114,33,0,0,0,
     41,2,114,24,0,0,0,114,81,0,0,0,114,4,0,0,
     0,114,4,0,0,0,114,6,0,0,0,114,223,0,0,0,
-    116,5,0,0,115,2,0,0,0,4,0,122,25,95,115,101,
+    117,5,0,0,115,2,0,0,0,4,0,122,25,95,115,101,
     116,117,112,46,60,108,111,99,97,108,115,62,46,60,103,101,
     110,101,120,112,114,62,114,62,0,0,0,122,30,105,109,112,
     111,114,116,108,105,98,32,114,101,113,117,105,114,101,115,32,
@@ -2366,7 +2366,7 @@ const unsigned char _Py_M__importlib_external[] = {
     101,90,14,119,101,97,107,114,101,102,95,109,111,100,117,108,
     101,90,13,119,105,110,114,101,103,95,109,111,100,117,108,101,
     114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,
-    6,95,115,101,116,117,112,91,5,0,0,115,76,0,0,0,
+    6,95,115,101,116,117,112,92,5,0,0,115,76,0,0,0,
     0,8,4,1,6,1,6,3,10,1,10,1,10,1,12,2,
     10,1,16,3,22,1,14,2,22,1,8,1,10,1,10,1,
     4,2,2,1,10,1,6,1,14,1,12,2,8,1,12,1,
@@ -2386,7 +2386,7 @@ const unsigned char _Py_M__importlib_external[] = {
     114,247,0,0,0,41,2,114,29,1,0,0,90,17,115,117,
     112,112,111,114,116,101,100,95,108,111,97,100,101,114,115,114,
     4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,8,
-    95,105,110,115,116,97,108,108,155,5,0,0,115,8,0,0,
+    95,105,110,115,116,97,108,108,156,5,0,0,115,8,0,0,
     0,0,2,8,1,6,1,20,1,114,32,1,0,0,41,1,
     114,0,0,0,0,41,2,114,1,0,0,0,114,2,0,0,
     0,41,1,114,49,0,0,0,41,1,78,41,3,78,78,78,
@@ -2420,7 +2420,7 @@ const unsigned char _Py_M__importlib_external[] = {
     6,0,0,0,218,8,60,109,111,100,117,108,101,62,24,0,
     0,0,115,108,0,0,0,4,0,4,1,4,1,2,1,6,
     3,8,17,8,5,8,5,8,6,8,12,8,10,8,9,8,
-    5,8,7,10,22,10,124,16,1,12,2,4,1,4,2,6,
+    5,8,7,10,22,10,125,16,1,12,2,4,1,4,2,6,
     2,6,2,8,2,16,45,8,34,8,19,8,12,8,12,8,
     28,8,17,10,55,10,12,10,10,8,14,6,3,4,1,14,
     67,14,64,14,29,16,110,14,41,18,45,18,16,4,3,18,


From lp_benchmark_robot at intel.com  Fri Oct  6 13:05:56 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Fri, 6 Oct 2017 10:05:56 -0700
Subject: [Python-checkins] [6 up,
 59 flat] Results for Python (master branch) 2017-10-06
Message-ID: <ac5ca2c8-d2d2-4347-9336-17b81782f66a@orsmsx155.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-06 03:02:52-07:00.
  - commit:		b8ab9d3
  - previous commit:	c1c47c1
  - revision date:	2017-10-06 02:58:28-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.070% |  -0.052%   |  +4.100%   |  +9.410%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |             call_method| 0.539% |  +3.797%   |  +19.675%  |  +12.525%  |
+-----+------------------------+--------+------------+------------+------------+
| :-) |       call_method_slots| 0.396% |  +3.016%   |  +20.655%  |  +12.388%  |
+-----+------------------------+--------+------------+------------+------------+
| :-) |     call_method_unknown| 0.661% |  +3.743%   |  +19.983%  |  +11.322%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.944% |  +2.624%   |  +6.249%   |  +10.349%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.695% |  +0.407%   |  +10.765%  |  +10.875%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.561% |  -1.263%   |  +5.829%   |  +12.846%  |
+-----+------------------------+--------+------------+------------+------------+
| :-) |            crypto_pyaes| 0.636% |  +3.160%   |  +3.888%   |  +4.756%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.270% |  -0.814%   |  +7.244%   |  +19.716%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 3.210% |  +1.167%   |  +9.216%   |  +14.773%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.209% |  -0.439%   |  +4.355%   |  +5.910%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.252% |  -0.267%   |  +5.604%   |  +4.467%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.882% |  -1.879%   |  +0.786%   |  +9.095%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.171% |  -0.803%   |  +7.908%   |  +12.504%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.507% |  -1.695%   |  +6.762%   |  +10.870%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.795% |  -0.615%   |  +5.474%   |  +13.396%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.819% |  -0.854%   |  +8.327%   |  +13.025%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 2.689% |  -1.016%   |  +8.288%   |  +10.808%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.362% |  -1.178%   |  +3.619%   |  +8.942%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 0.913% |  +4.282%   |  +1.109%   |  +11.593%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.512% |  -1.558%   |  +7.205%   |  +12.903%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.380% |  -0.853%   |  +46.281%  |  +12.489%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.586% |  -0.286%   |  +8.407%   |  +13.714%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.528% |  +1.359%   |  +18.539%  |  +10.844%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 1.978% |  +0.789%   |  +8.572%   |  +8.994%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.924% |  -1.189%   |  +2.988%   |  +5.578%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.320% |  -1.601%   |  -2.347%   |  +2.351%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.910% |  -0.299%   |  +2.002%   |  +8.420%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.001% |  -2.555%   |  +4.915%   |  +9.296%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.463% |  +2.116%   |  +1.505%   |  +18.668%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.317% |  +0.888%   |  +3.156%   |  +20.557%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.872% |  +1.058%   |  +6.508%   |  +15.761%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 4.333% |  -0.568%   |  +11.191%  |  +11.041%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.076% |  +0.073%   |  +0.448%   |  +9.285%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.130% |  -0.202%   |  +10.725%  |  +5.401%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.088% |  +0.184%   |  +2.244%   |  +5.321%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.180% |  -0.697%   |  +8.383%   |  +14.752%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.317% |  -2.767%   |  +1.136%   |  +14.241%  |
+-----+------------------------+--------+------------+------------+------------+
| :-) |               regex_dna| 1.114% |  +3.562%   |  +1.933%   |  +6.852%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.161% |  +2.231%   |  -0.031%   |  -2.621%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 2.823% |  -0.010%   |  +9.782%   |  +3.445%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.453% |  -0.479%   |  +6.794%   |  +15.949%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.501% |  +1.279%   |  +1.402%   |  +2.874%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.124% |  -0.459%   |  +26.561%  |  +9.024%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.745% |  -2.285%   |  +2.238%   |  +9.671%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.412% |  -0.538%   |  +14.019%  |  +10.414%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 1.024% |  -1.857%   |  +0.374%   |  +1.221%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |           spectral_norm| 0.374% |  +3.114%   |  +6.620%   |  +1.087%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.131% |  +0.300%   |  +6.769%   |  +7.670%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.914% |  +0.932%   |  +6.818%   |  +4.035%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 5.549% |  +0.325%   |  +20.393%  |  +6.295%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.525% |  +0.531%   |  +11.678%  |  +9.709%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 2.363% |  -0.543%   |  +9.171%   |  +7.929%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.542% |  +0.075%   |  +10.710%  |  +10.745%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.347% |  -0.409%   |  +11.393%  |  +12.279%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 5.649% |  +1.203%   |  +23.199%  |  +8.933%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.017% |  -1.338%   |  +5.065%   |  +7.415%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.065% |  +0.122%   |  +2.236%   |  +2.985%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 6.288% |  -0.572%   |  +8.203%   |  +20.544%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.570% |  +2.974%   |  +0.218%   |  +16.969%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 1.224% |  -0.585%   |  +7.315%   |  +7.303%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.174% |  +0.134%   |  +6.495%   |  +7.024%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.846% |  -0.818%   |  +1.106%   |  +7.157%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 3.794% |  -0.848%   |  -7.439%   |  +10.921%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.569% |  -1.480%   |  +5.689%   |  +8.213%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

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

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  Sat Oct  7 01:27:42 2017
From: webhook-mailer at python.org (Mariatta)
Date: Sat, 07 Oct 2017 05:27:42 -0000
Subject: [Python-checkins] bpo-31507 Add docstring to parseaddr function in
 email.utils.parseaddr (GH-3647) (GH-3733)
Message-ID: <mailman.60.1507354063.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/93c0885dc84381cbbb970402b1a21bf690ee312c
commit: 93c0885dc84381cbbb970402b1a21bf690ee312c
branch: 3.6
author: Rohit Balasubramanian <brohit23 at outlook.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-10-06T22:27:36-07:00
summary:

bpo-31507 Add docstring to parseaddr function in email.utils.parseaddr (GH-3647) (GH-3733)

(cherry picked from commit 9e7b9b21fe45f7d93eaf9382fedfa18247d0d2b2)

files:
M Lib/email/utils.py

diff --git a/Lib/email/utils.py b/Lib/email/utils.py
index a759d23308d..e2bfb362c6e 100644
--- a/Lib/email/utils.py
+++ b/Lib/email/utils.py
@@ -215,6 +215,12 @@ def parsedate_to_datetime(data):
 
 
 def parseaddr(addr):
+    """
+    Parse addr into its constituent realname and email address parts.
+    
+    Return a tuple of realname and email address, unless the parse fails, in
+    which case return a 2-tuple of ('', '').
+    """
     addrs = _AddressList(addr).addresslist
     if not addrs:
         return '', ''


From webhook-mailer at python.org  Sat Oct  7 01:29:56 2017
From: webhook-mailer at python.org (Mariatta)
Date: Sat, 07 Oct 2017 05:29:56 -0000
Subject: [Python-checkins] bpo-31507: Add docstring to parseaddr function in
 email.utils.parseaddr (GH-3647) (GH-3735)
Message-ID: <mailman.61.1507354197.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/c829bbf68fc4a845b96d3bf30d868f62a5d3332a
commit: c829bbf68fc4a845b96d3bf30d868f62a5d3332a
branch: 2.7
author: Rohit Balasubramanian <brohit23 at outlook.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-10-06T22:29:54-07:00
summary:

bpo-31507: Add docstring to parseaddr function in email.utils.parseaddr (GH-3647) (GH-3735)

(cherry picked from commit 9e7b9b21fe45f7d93eaf9382fedfa18247d0d2b2)

files:
M Lib/email/utils.py

diff --git a/Lib/email/utils.py b/Lib/email/utils.py
index ac13f49d599..a74db42286e 100644
--- a/Lib/email/utils.py
+++ b/Lib/email/utils.py
@@ -211,6 +211,12 @@ def parsedate_tz(data):
 
 
 def parseaddr(addr):
+    """
+    Parse addr into its constituent realname and email address parts.
+    
+    Return a tuple of realname and email address, unless the parse fails, in
+    which case return a 2-tuple of ('', '').
+    """
     addrs = _AddressList(addr).addresslist
     if not addrs:
         return '', ''


From solipsis at pitrou.net  Sat Oct  7 05:06:47 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 07 Oct 2017 09:06:47 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=-2
Message-ID: <20171007090647.90593.3BC30DBF6F71FD8F@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/reflog5APlpX', '--timeout', '7200']

From webhook-mailer at python.org  Sat Oct  7 10:55:03 2017
From: webhook-mailer at python.org (Mariatta)
Date: Sat, 07 Oct 2017 14:55:03 -0000
Subject: [Python-checkins] bpo-31720: msilib documentation,
 change MsiError into MSIError (GH-3914)
Message-ID: <mailman.62.1507388103.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/28f713601d3ec80820e842dcb25a234093f1ff18
commit: 28f713601d3ec80820e842dcb25a234093f1ff18
branch: master
author: Tzu-ping Chung <uranusjr at gmail.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-10-07T07:55:00-07:00
summary:

bpo-31720: msilib documentation, change MsiError into MSIError (GH-3914)

files:
M Doc/library/msilib.rst

diff --git a/Doc/library/msilib.rst b/Doc/library/msilib.rst
index 0a420329748..09d00a6edee 100644
--- a/Doc/library/msilib.rst
+++ b/Doc/library/msilib.rst
@@ -312,7 +312,7 @@ Record Objects
 Errors
 ------
 
-All wrappers around MSI functions raise :exc:`MsiError`; the string inside the
+All wrappers around MSI functions raise :exc:`MSIError`; the string inside the
 exception will contain more detail.
 
 


From webhook-mailer at python.org  Sat Oct  7 12:00:30 2017
From: webhook-mailer at python.org (Mariatta)
Date: Sat, 07 Oct 2017 16:00:30 -0000
Subject: [Python-checkins] bpo-31720: msilib documentation,
 change MsiError into MSIError (GH-3914) (GH-3917)
Message-ID: <mailman.63.1507392032.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/5f396dba1d11356ab18e3bec130596197e741a64
commit: 5f396dba1d11356ab18e3bec130596197e741a64
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-10-07T09:00:27-07:00
summary:

bpo-31720: msilib documentation, change MsiError into MSIError (GH-3914) (GH-3917)

(cherry picked from commit 28f713601d3ec80820e842dcb25a234093f1ff18)

files:
M Doc/library/msilib.rst

diff --git a/Doc/library/msilib.rst b/Doc/library/msilib.rst
index 0a420329748..09d00a6edee 100644
--- a/Doc/library/msilib.rst
+++ b/Doc/library/msilib.rst
@@ -312,7 +312,7 @@ Record Objects
 Errors
 ------
 
-All wrappers around MSI functions raise :exc:`MsiError`; the string inside the
+All wrappers around MSI functions raise :exc:`MSIError`; the string inside the
 exception will contain more detail.
 
 


From webhook-mailer at python.org  Sat Oct  7 12:00:45 2017
From: webhook-mailer at python.org (Mariatta)
Date: Sat, 07 Oct 2017 16:00:45 -0000
Subject: [Python-checkins] bpo-31720: msilib documentation,
 change MsiError into MSIError (GH-3914) (GH-3916)
Message-ID: <mailman.64.1507392046.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/7440655bc5526a1920eeb43b41b3b2173d76065e
commit: 7440655bc5526a1920eeb43b41b3b2173d76065e
branch: 2.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-10-07T09:00:42-07:00
summary:

bpo-31720: msilib documentation, change MsiError into MSIError (GH-3914) (GH-3916)

(cherry picked from commit 28f713601d3ec80820e842dcb25a234093f1ff18)

files:
M Doc/library/msilib.rst

diff --git a/Doc/library/msilib.rst b/Doc/library/msilib.rst
index a4d382c15a9..55785bd3e49 100644
--- a/Doc/library/msilib.rst
+++ b/Doc/library/msilib.rst
@@ -311,7 +311,7 @@ Record Objects
 Errors
 ------
 
-All wrappers around MSI functions raise :exc:`MsiError`; the string inside the
+All wrappers around MSI functions raise :exc:`MSIError`; the string inside the
 exception will contain more detail.
 
 


From webhook-mailer at python.org  Sat Oct  7 15:59:40 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sat, 07 Oct 2017 19:59:40 -0000
Subject: [Python-checkins] bpo-31655: Validate keyword names in
 SimpleNamespace constructor. (#3909)
Message-ID: <mailman.65.1507406382.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/79ba471488b936abda5ba5234b1ea90cbc94cae6
commit: 79ba471488b936abda5ba5234b1ea90cbc94cae6
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-07T22:59:35+03:00
summary:

bpo-31655: Validate keyword names in SimpleNamespace constructor. (#3909)

files:
M Lib/test/test_types.py
M Objects/namespaceobject.c

diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index 966ef6d8782..28133a3560f 100644
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -1069,6 +1069,8 @@ def test_constructor(self):
 
         with self.assertRaises(TypeError):
             types.SimpleNamespace(1, 2, 3)
+        with self.assertRaises(TypeError):
+            types.SimpleNamespace(**{1: 2})
 
         self.assertEqual(len(ns1.__dict__), 0)
         self.assertEqual(vars(ns1), {})
diff --git a/Objects/namespaceobject.c b/Objects/namespaceobject.c
index 6deca961a4f..e5698e6378d 100644
--- a/Objects/namespaceobject.c
+++ b/Objects/namespaceobject.c
@@ -44,8 +44,12 @@ namespace_init(_PyNamespaceObject *ns, PyObject *args, PyObject *kwds)
         PyErr_Format(PyExc_TypeError, "no positional arguments expected");
         return -1;
     }
-    if (kwds == NULL)
+    if (kwds == NULL) {
         return 0;
+    }
+    if (!PyArg_ValidateKeywordArguments(kwds)) {
+        return -1;
+    }
     return PyDict_Update(ns->ns_dict, kwds);
 }
 


From webhook-mailer at python.org  Sat Oct  7 16:53:01 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sat, 07 Oct 2017 20:53:01 -0000
Subject: [Python-checkins] [3.6] bpo-31655: Validate keyword names in
 SimpleNamespace constructor. (GH-3909) (#3920)
Message-ID: <mailman.66.1507409583.2815.python-checkins@python.org>

https://github.com/python/cpython/commit/cae6e4775b37c412609d3a0d303c0831ff0012ff
commit: cae6e4775b37c412609d3a0d303c0831ff0012ff
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-07T23:52:57+03:00
summary:

[3.6] bpo-31655: Validate keyword names in SimpleNamespace constructor. (GH-3909) (#3920)

(cherry picked from commit 79ba471488b936abda5ba5234b1ea90cbc94cae6)

files:
M Lib/test/test_types.py
M Objects/namespaceobject.c

diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index d79429faf11..73fbdbf9b90 100644
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -1051,6 +1051,8 @@ def test_constructor(self):
 
         with self.assertRaises(TypeError):
             types.SimpleNamespace(1, 2, 3)
+        with self.assertRaises(TypeError):
+            types.SimpleNamespace(**{1: 2})
 
         self.assertEqual(len(ns1.__dict__), 0)
         self.assertEqual(vars(ns1), {})
diff --git a/Objects/namespaceobject.c b/Objects/namespaceobject.c
index 0bb30638445..d28c9133b4b 100644
--- a/Objects/namespaceobject.c
+++ b/Objects/namespaceobject.c
@@ -50,8 +50,12 @@ namespace_init(_PyNamespaceObject *ns, PyObject *args, PyObject *kwds)
             return -1;
         }
     }
-    if (kwds == NULL)
+    if (kwds == NULL) {
         return 0;
+    }
+    if (!PyArg_ValidateKeywordArguments(kwds)) {
+        return -1;
+    }
     return PyDict_Update(ns->ns_dict, kwds);
 }
 


From webhook-mailer at python.org  Sun Oct  8 02:31:27 2017
From: webhook-mailer at python.org (Zachary Ware)
Date: Sun, 08 Oct 2017 06:31:27 -0000
Subject: [Python-checkins] bpo-31724: Skip test_xmlrpc_net (GH-3921)
Message-ID: <mailman.0.1507444288.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/73ffd3f2036179ed54591ef0455e5ba5694ae5bd
commit: 73ffd3f2036179ed54591ef0455e5ba5694ae5bd
branch: master
author: Zachary Ware <zachary.ware at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-08T01:31:23-05:00
summary:

bpo-31724: Skip test_xmlrpc_net (GH-3921)

With the upgrade of buildbot.python.org from Buildbot 0.8.x to 0.9.x,
the xmlrpc interface has been removed.  This test is now skipped until
it can be rewritten to query a suitable substitute.

files:
M Lib/test/test_xmlrpc_net.py

diff --git a/Lib/test/test_xmlrpc_net.py b/Lib/test/test_xmlrpc_net.py
index ae0a28e7215..f3652b86f75 100644
--- a/Lib/test/test_xmlrpc_net.py
+++ b/Lib/test/test_xmlrpc_net.py
@@ -4,6 +4,8 @@
 
 import xmlrpc.client as xmlrpclib
 
+
+ at unittest.skip('XXX: buildbot.python.org/all/xmlrpc/ is gone')
 class PythonBuildersTest(unittest.TestCase):
 
     def test_python_builders(self):


From webhook-mailer at python.org  Sun Oct  8 02:52:10 2017
From: webhook-mailer at python.org (Zachary Ware)
Date: Sun, 08 Oct 2017 06:52:10 -0000
Subject: [Python-checkins] [3.6] bpo-31724: Skip test_xmlrpc_net (GH-3922)
Message-ID: <mailman.1.1507445532.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/d13a4e50679c0861971cfae2bb226f35b8bf5142
commit: d13a4e50679c0861971cfae2bb226f35b8bf5142
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Zachary Ware <zachary.ware at gmail.com>
date: 2017-10-08T01:52:07-05:00
summary:

[3.6] bpo-31724: Skip test_xmlrpc_net (GH-3922)

With the upgrade of buildbot.python.org from Buildbot 0.8.x to 0.9.x,
the xmlrpc interface has been removed.  This test is now skipped until
it can be rewritten to query a suitable substitute.

(cherry picked from commit 73ffd3f2036179ed54591ef0455e5ba5694ae5bd)

files:
M Lib/test/test_xmlrpc_net.py

diff --git a/Lib/test/test_xmlrpc_net.py b/Lib/test/test_xmlrpc_net.py
index ae0a28e7215..f3652b86f75 100644
--- a/Lib/test/test_xmlrpc_net.py
+++ b/Lib/test/test_xmlrpc_net.py
@@ -4,6 +4,8 @@
 
 import xmlrpc.client as xmlrpclib
 
+
+ at unittest.skip('XXX: buildbot.python.org/all/xmlrpc/ is gone')
 class PythonBuildersTest(unittest.TestCase):
 
     def test_python_builders(self):


From webhook-mailer at python.org  Sun Oct  8 03:44:13 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sun, 08 Oct 2017 07:44:13 -0000
Subject: [Python-checkins] bpo-31642: Restore blocking "from" import by
 setting None in sys.modules. (#3834)
Message-ID: <mailman.2.1507448654.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/f07e2b64df6304a36fb5e29397d3c77a7ba17704
commit: f07e2b64df6304a36fb5e29397d3c77a7ba17704
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-08T10:44:10+03:00
summary:

bpo-31642: Restore blocking "from" import by setting None in sys.modules. (#3834)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-08-10-00-55.bpo-31642.1IKqgs.rst
M Lib/importlib/_bootstrap.py
M Lib/test/test_importlib/import_/test_api.py
M Python/importlib.h

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 755a6344654..76e1be59686 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -1019,7 +1019,8 @@ def _handle_fromlist(module, fromlist, import_):
                     # Backwards-compatibility dictates we ignore failed
                     # imports triggered by fromlist for modules that don't
                     # exist.
-                    if exc.name == from_name:
+                    if (exc.name == from_name and
+                        sys.modules.get(from_name, _NEEDS_LOADING) is not None):
                         continue
                     raise
     return module
diff --git a/Lib/test/test_importlib/import_/test_api.py b/Lib/test/test_importlib/import_/test_api.py
index a7bf2749cf5..0cd9de4daff 100644
--- a/Lib/test/test_importlib/import_/test_api.py
+++ b/Lib/test/test_importlib/import_/test_api.py
@@ -82,6 +82,20 @@ def test_fromlist_load_error_propagates(self):
                     self.__import__(PKG_NAME,
                                     fromlist=[SUBMOD_NAME.rpartition('.')[-1]])
 
+    def test_blocked_fromlist(self):
+        # If fromlist entry is None, let a ModuleNotFoundError propagate.
+        # issue31642
+        mod = types.ModuleType(PKG_NAME)
+        mod.__path__ = []
+        with util.import_state(meta_path=[self.bad_finder_loader]):
+            with util.uncache(PKG_NAME, SUBMOD_NAME):
+                sys.modules[PKG_NAME] = mod
+                sys.modules[SUBMOD_NAME] = None
+                with self.assertRaises(ModuleNotFoundError) as cm:
+                    self.__import__(PKG_NAME,
+                                    fromlist=[SUBMOD_NAME.rpartition('.')[-1]])
+                self.assertEqual(cm.exception.name, SUBMOD_NAME)
+
 
 class OldAPITests(APITest):
     bad_finder_loader = BadLoaderFinder
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-08-10-00-55.bpo-31642.1IKqgs.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-08-10-00-55.bpo-31642.1IKqgs.rst
new file mode 100644
index 00000000000..0cb540fa50a
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-08-10-00-55.bpo-31642.1IKqgs.rst	
@@ -0,0 +1,2 @@
+Restored blocking "from package import module" by setting
+sys.modules["package.module"] to None.
diff --git a/Python/importlib.h b/Python/importlib.h
index b962a38a0ba..e844b5ccedc 100644
--- a/Python/importlib.h
+++ b/Python/importlib.h
@@ -1562,251 +1562,253 @@ const unsigned char _Py_M__importlib[] = {
     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,
+    0,0,17,0,0,0,67,0,0,0,115,182,0,0,0,116,
+    0,124,0,100,1,131,2,114,178,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,
+    3,124,0,106,4,161,1,1,0,120,118,124,1,68,0,93,
+    110,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,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,10,0,0,0,5,
-    0,0,0,67,0,0,0,115,174,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,100,4,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,20,0,0,0,114,167,0,
-    0,0,114,56,0,0,0,78,41,3,114,20,0,0,0,114,
-    167,0,0,0,114,56,0,0,0,41,15,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,41,10,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,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,36,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,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,108,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,
+    10,114,172,1,0,125,5,1,0,122,38,124,5,106,9,124,
+    4,107,2,114,154,116,10,106,11,160,12,124,4,116,13,161,
+    2,100,5,107,9,114,154,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,14,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,114,14,0,0,0,114,
+    80,0,0,0,114,30,0,0,0,114,180,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,34,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,18,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,5,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,32,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,67,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,10,0,0,0,5,0,0,0,67,0,0,0,115,
+    174,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,100,4,
+    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,20,0,0,0,114,167,0,0,0,114,56,0,0,0,78,
+    41,3,114,20,0,0,0,114,167,0,0,0,114,56,0,0,
+    0,41,15,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,
+    41,10,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,114,10,0,0,0,114,10,0,0,
+    0,114,11,0,0,0,218,6,95,115,101,116,117,112,74,4,
+    0,0,115,36,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,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,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,116,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,35,8,8,
+    218,8,95,105,110,115,116,97,108,108,109,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,117,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,32,8,27,18,35,8,7,8,35,8,8,
 };


From webhook-mailer at python.org  Sun Oct  8 04:17:49 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sun, 08 Oct 2017 08:17:49 -0000
Subject: [Python-checkins] bpo-28280: Make PyMapping_Keys(),
 PyMapping_Values() and PyMapping_Items() always return a list
 (#3840)
Message-ID: <mailman.3.1507450670.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/0ccc0f6c7495be9043300e22d8f38e6d65e8884f
commit: 0ccc0f6c7495be9043300e22d8f38e6d65e8884f
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-08T11:17:46+03:00
summary:

bpo-28280: Make PyMapping_Keys(), PyMapping_Values() and PyMapping_Items() always return a list (#3840)

files:
A Misc/NEWS.d/next/C API/2017-09-30-19-41-44.bpo-28280.K_EjpO.rst
M Doc/c-api/mapping.rst
M Doc/whatsnew/3.7.rst
M Lib/test/test_capi.py
M Modules/_testcapimodule.c
M Objects/abstract.c

diff --git a/Doc/c-api/mapping.rst b/Doc/c-api/mapping.rst
index a71e9428377..308a9761f87 100644
--- a/Doc/c-api/mapping.rst
+++ b/Doc/c-api/mapping.rst
@@ -50,20 +50,29 @@ Mapping Protocol
 
 .. c:function:: PyObject* PyMapping_Keys(PyObject *o)
 
-   On success, return a list or tuple of the keys in object *o*.  On failure,
-   return *NULL*.
+   On success, return a list of the keys in object *o*.  On failure, return
+   *NULL*.
+
+   .. versionchanged:: 3.7
+      Previously, the function returned a list or a tuple.
 
 
 .. c:function:: PyObject* PyMapping_Values(PyObject *o)
 
-   On success, return a list or tuple of the values in object *o*.  On failure,
-   return *NULL*.
+   On success, return a list of the values in object *o*.  On failure, return
+   *NULL*.
+
+   .. versionchanged:: 3.7
+      Previously, the function returned a list or a tuple.
 
 
 .. c:function:: PyObject* PyMapping_Items(PyObject *o)
 
-   On success, return a list or tuple of the items in object *o*, where each item
-   is a tuple containing a key-value pair.  On failure, return *NULL*.
+   On success, return a list of the items in object *o*, where each item is a
+   tuple containing a key-value pair.  On failure, return *NULL*.
+
+   .. versionchanged:: 3.7
+      Previously, the function returned a list or a tuple.
 
 
 .. c:function:: PyObject* PyMapping_GetItemString(PyObject *o, const char *key)
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index ecdd2fe2713..24a1dc4d13b 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -404,6 +404,10 @@ Build and C API Changes
   is now of type ``const char *`` rather of ``char *``. (Contributed by Serhiy
   Storchaka in :issue:`28769`.)
 
+* The result of :c:func:`PyMapping_Keys`, :c:func:`PyMapping_Values` and
+  :c:func:`PyMapping_Items` is now always a list, rather than a list or a
+  tuple. (Contributed by Oren Milman in :issue:`28280`.)
+
 * Added functions :c:func:`PySlice_Unpack` and :c:func:`PySlice_AdjustIndices`.
   (Contributed by Serhiy Storchaka in :issue:`27867`.)
 
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
index 1b826ee8d9a..921735ef5d0 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -1,7 +1,7 @@
 # Run the _testcapi module tests (tests for the Python/C API):  by defn,
 # these are all functions _testcapi exports whose name begins with 'test_'.
 
-from collections import namedtuple
+from collections import namedtuple, OrderedDict
 import os
 import pickle
 import platform
@@ -272,6 +272,50 @@ class C(): pass
         self.assertIn(b'MemoryError 2 20', out)
         self.assertIn(b'MemoryError 3 30', out)
 
+    def test_mapping_keys_values_items(self):
+        class Mapping1(dict):
+            def keys(self):
+                return list(super().keys())
+            def values(self):
+                return list(super().values())
+            def items(self):
+                return list(super().items())
+        class Mapping2(dict):
+            def keys(self):
+                return tuple(super().keys())
+            def values(self):
+                return tuple(super().values())
+            def items(self):
+                return tuple(super().items())
+        dict_obj = {'foo': 1, 'bar': 2, 'spam': 3}
+
+        for mapping in [{}, OrderedDict(), Mapping1(), Mapping2(),
+                        dict_obj, OrderedDict(dict_obj),
+                        Mapping1(dict_obj), Mapping2(dict_obj)]:
+            self.assertListEqual(_testcapi.get_mapping_keys(mapping),
+                                 list(mapping.keys()))
+            self.assertListEqual(_testcapi.get_mapping_values(mapping),
+                                 list(mapping.values()))
+            self.assertListEqual(_testcapi.get_mapping_items(mapping),
+                                 list(mapping.items()))
+
+    def test_mapping_keys_values_items_bad_arg(self):
+        self.assertRaises(AttributeError, _testcapi.get_mapping_keys, None)
+        self.assertRaises(AttributeError, _testcapi.get_mapping_values, None)
+        self.assertRaises(AttributeError, _testcapi.get_mapping_items, None)
+
+        class BadMapping:
+            def keys(self):
+                return None
+            def values(self):
+                return None
+            def items(self):
+                return None
+        bad_mapping = BadMapping()
+        self.assertRaises(TypeError, _testcapi.get_mapping_keys, bad_mapping)
+        self.assertRaises(TypeError, _testcapi.get_mapping_values, bad_mapping)
+        self.assertRaises(TypeError, _testcapi.get_mapping_items, bad_mapping)
+
 
 class TestPendingCalls(unittest.TestCase):
 
diff --git a/Misc/NEWS.d/next/C API/2017-09-30-19-41-44.bpo-28280.K_EjpO.rst b/Misc/NEWS.d/next/C API/2017-09-30-19-41-44.bpo-28280.K_EjpO.rst
new file mode 100644
index 00000000000..76990f79cb0
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2017-09-30-19-41-44.bpo-28280.K_EjpO.rst	
@@ -0,0 +1,2 @@
+Make `PyMapping_Keys()`, `PyMapping_Values()` and `PyMapping_Items()` always
+return a `list` (rather than a `list` or a `tuple`). Patch by Oren Milman.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index b512c05a3fe..6e31105712f 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -4307,6 +4307,25 @@ py_w_stopcode(PyObject *self, PyObject *args)
 
 
 static PyObject *
+get_mapping_keys(PyObject* self, PyObject *obj)
+{
+    return PyMapping_Keys(obj);
+}
+
+static PyObject *
+get_mapping_values(PyObject* self, PyObject *obj)
+{
+    return PyMapping_Values(obj);
+}
+
+static PyObject *
+get_mapping_items(PyObject* self, PyObject *obj)
+{
+    return PyMapping_Items(obj);
+}
+
+
+static PyObject *
 test_pythread_tss_key_state(PyObject *self, PyObject *args)
 {
     Py_tss_t tss_key = Py_tss_NEEDS_INIT;
@@ -4573,6 +4592,9 @@ static PyMethodDef TestMethods[] = {
 #ifdef W_STOPCODE
     {"W_STOPCODE", py_w_stopcode, METH_VARARGS},
 #endif
+    {"get_mapping_keys", get_mapping_keys, METH_O},
+    {"get_mapping_values", get_mapping_values, METH_O},
+    {"get_mapping_items", get_mapping_items, METH_O},
     {"test_pythread_tss_key_state", test_pythread_tss_key_state, METH_VARARGS},
     {NULL, NULL} /* sentinel */
 };
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 38484b79a1b..3cb7a32b01e 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -2147,55 +2147,77 @@ PyMapping_HasKey(PyObject *o, PyObject *key)
     return 0;
 }
 
+/* This function is quite similar to PySequence_Fast(), but specialized to be
+   a helper for PyMapping_Keys(), PyMapping_Items() and PyMapping_Values().
+ */
+static PyObject *
+method_output_as_list(PyObject *o, _Py_Identifier *meth_id)
+{
+    PyObject *it, *result, *meth_output;
+
+    assert(o != NULL);
+    meth_output = _PyObject_CallMethodId(o, meth_id, NULL);
+    if (meth_output == NULL || PyList_CheckExact(meth_output)) {
+        return meth_output;
+    }
+    it = PyObject_GetIter(meth_output);
+    if (it == NULL) {
+        if (PyErr_ExceptionMatches(PyExc_TypeError)) {
+            PyErr_Format(PyExc_TypeError,
+                         "%.200s.%U() returned a non-iterable (type %.200s)",
+                         Py_TYPE(o)->tp_name,
+                         meth_id->object,
+                         Py_TYPE(meth_output)->tp_name);
+        }
+        Py_DECREF(meth_output);
+        return NULL;
+    }
+    Py_DECREF(meth_output);
+    result = PySequence_List(it);
+    Py_DECREF(it);
+    return result;
+}
+
 PyObject *
 PyMapping_Keys(PyObject *o)
 {
-    PyObject *keys;
-    PyObject *fast;
     _Py_IDENTIFIER(keys);
 
-    if (PyDict_CheckExact(o))
+    if (o == NULL) {
+        return null_error();
+    }
+    if (PyDict_CheckExact(o)) {
         return PyDict_Keys(o);
-    keys = _PyObject_CallMethodId(o, &PyId_keys, NULL);
-    if (keys == NULL)
-        return NULL;
-    fast = PySequence_Fast(keys, "o.keys() are not iterable");
-    Py_DECREF(keys);
-    return fast;
+    }
+    return method_output_as_list(o, &PyId_keys);
 }
 
 PyObject *
 PyMapping_Items(PyObject *o)
 {
-    PyObject *items;
-    PyObject *fast;
     _Py_IDENTIFIER(items);
 
-    if (PyDict_CheckExact(o))
+    if (o == NULL) {
+        return null_error();
+    }
+    if (PyDict_CheckExact(o)) {
         return PyDict_Items(o);
-    items = _PyObject_CallMethodId(o, &PyId_items, NULL);
-    if (items == NULL)
-        return NULL;
-    fast = PySequence_Fast(items, "o.items() are not iterable");
-    Py_DECREF(items);
-    return fast;
+    }
+    return method_output_as_list(o, &PyId_items);
 }
 
 PyObject *
 PyMapping_Values(PyObject *o)
 {
-    PyObject *values;
-    PyObject *fast;
     _Py_IDENTIFIER(values);
 
-    if (PyDict_CheckExact(o))
+    if (o == NULL) {
+        return null_error();
+    }
+    if (PyDict_CheckExact(o)) {
         return PyDict_Values(o);
-    values = _PyObject_CallMethodId(o, &PyId_values, NULL);
-    if (values == NULL)
-        return NULL;
-    fast = PySequence_Fast(values, "o.values() are not iterable");
-    Py_DECREF(values);
-    return fast;
+    }
+    return method_output_as_list(o, &PyId_values);
 }
 
 /* isinstance(), issubclass() */


From solipsis at pitrou.net  Sun Oct  8 05:07:05 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 08 Oct 2017 09:07:05 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=-2
Message-ID: <20171008090705.91244.2F3BF83E81A74BCC@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_fork leaked [2, -1, 1] memory blocks, sum=2
test_multiprocessing_forkserver leaked [1, 0, -2] memory blocks, sum=-1
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/reflog2dEqN9', '--timeout', '7200']

From webhook-mailer at python.org  Sun Oct  8 05:52:01 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sun, 08 Oct 2017 09:52:01 -0000
Subject: [Python-checkins] [3.6] bpo-31642: Restore blocking "from" import
 by setting None in sys.modules. (GH-3834). (#3923)
Message-ID: <mailman.4.1507456322.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/6f059ab80a351a7dd85cc57c5ca240f817a79c5d
commit: 6f059ab80a351a7dd85cc57c5ca240f817a79c5d
branch: 3.6
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-08T12:51:55+03:00
summary:

[3.6] bpo-31642: Restore blocking "from" import by setting None in sys.modules. (GH-3834). (#3923)

(cherry picked from commit f07e2b64df6304a36fb5e29397d3c77a7ba17704)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-08-10-00-55.bpo-31642.1IKqgs.rst
M Lib/importlib/_bootstrap.py
M Lib/test/test_importlib/import_/test_api.py
M Python/importlib.h

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 4cf8aec1b2a..4fc5f02f182 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -1019,7 +1019,8 @@ def _handle_fromlist(module, fromlist, import_):
                     # Backwards-compatibility dictates we ignore failed
                     # imports triggered by fromlist for modules that don't
                     # exist.
-                    if exc.name == from_name:
+                    if (exc.name == from_name and
+                        sys.modules.get(from_name, _NEEDS_LOADING) is not None):
                         continue
                     raise
     return module
diff --git a/Lib/test/test_importlib/import_/test_api.py b/Lib/test/test_importlib/import_/test_api.py
index a7bf2749cf5..0cd9de4daff 100644
--- a/Lib/test/test_importlib/import_/test_api.py
+++ b/Lib/test/test_importlib/import_/test_api.py
@@ -82,6 +82,20 @@ def test_fromlist_load_error_propagates(self):
                     self.__import__(PKG_NAME,
                                     fromlist=[SUBMOD_NAME.rpartition('.')[-1]])
 
+    def test_blocked_fromlist(self):
+        # If fromlist entry is None, let a ModuleNotFoundError propagate.
+        # issue31642
+        mod = types.ModuleType(PKG_NAME)
+        mod.__path__ = []
+        with util.import_state(meta_path=[self.bad_finder_loader]):
+            with util.uncache(PKG_NAME, SUBMOD_NAME):
+                sys.modules[PKG_NAME] = mod
+                sys.modules[SUBMOD_NAME] = None
+                with self.assertRaises(ModuleNotFoundError) as cm:
+                    self.__import__(PKG_NAME,
+                                    fromlist=[SUBMOD_NAME.rpartition('.')[-1]])
+                self.assertEqual(cm.exception.name, SUBMOD_NAME)
+
 
 class OldAPITests(APITest):
     bad_finder_loader = BadLoaderFinder
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-08-10-00-55.bpo-31642.1IKqgs.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-08-10-00-55.bpo-31642.1IKqgs.rst
new file mode 100644
index 00000000000..0cb540fa50a
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-08-10-00-55.bpo-31642.1IKqgs.rst	
@@ -0,0 +1,2 @@
+Restored blocking "from package import module" by setting
+sys.modules["package.module"] to None.
diff --git a/Python/importlib.h b/Python/importlib.h
index 18eb1e1225d..81ae613567a 100644
--- a/Python/importlib.h
+++ b/Python/importlib.h
@@ -1563,247 +1563,250 @@ const unsigned char _Py_M__importlib[] = {
     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,
+    0,0,115,182,0,0,0,116,0,124,0,100,1,131,2,114,
+    178,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,
+    0,120,118,124,1,68,0,93,110,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,113,64,4,0,116,8,107,10,114,172,1,0,125,5,1,
+    0,122,38,124,5,106,9,124,4,107,2,114,154,116,10,106,
+    11,106,12,124,4,116,13,131,2,100,5,107,9,114,154,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,14,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,114,14,0,0,0,114,80,0,0,0,114,30,0,0,
+    0,114,180,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,34,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,18,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,5,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,32,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,67,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,74,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,121,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,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,
+    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,32,8,27,18,35,8,7,8,
+    47,
 };


From webhook-mailer at python.org  Sun Oct  8 05:53:36 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sun, 08 Oct 2017 09:53:36 -0000
Subject: [Python-checkins] bpo-27867: Add a porting guide for
 PySlice_GetIndicesEx(). (#1973)
Message-ID: <mailman.5.1507456419.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/4d3f084c035ad3dfd9f8479886c41b1b1823ace2
commit: 4d3f084c035ad3dfd9f8479886c41b1b1823ace2
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-08T12:53:34+03:00
summary:

bpo-27867: Add a porting guide for PySlice_GetIndicesEx(). (#1973)

files:
M Doc/c-api/slice.rst
M Doc/whatsnew/3.7.rst

diff --git a/Doc/c-api/slice.rst b/Doc/c-api/slice.rst
index f8395ec8d77..8ad9a29b256 100644
--- a/Doc/c-api/slice.rst
+++ b/Doc/c-api/slice.rst
@@ -53,6 +53,22 @@ Slice Objects
 
    Returns ``0`` on success and ``-1`` on error with exception set.
 
+   .. note::
+      This function is considered not safe for resizable sequences.
+      Its invocation should be replaced by a combination of
+      :c:func:`PySlice_Unpack` and :c:func:`PySlice_AdjustIndices` where ::
+
+         if (PySlice_GetIndicesEx(slice, length, &start, &stop, &step, &slicelength) < 0) {
+             // return error
+         }
+
+      is replaced by ::
+
+         if (PySlice_Unpack(slice, &start, &stop, &step) < 0) {
+             // return error
+         }
+         slicelength = PySlice_AdjustIndices(length, &start, &stop, step);
+
    .. versionchanged:: 3.2
       The parameter type for the *slice* parameter was ``PySliceObject*``
       before.
@@ -61,7 +77,7 @@ Slice Objects
       If ``Py_LIMITED_API`` is not set or set to the value between ``0x03050400``
       and ``0x03060000`` (not including) or ``0x03060100`` or higher
       :c:func:`!PySlice_GetIndicesEx` is implemented as a macro using
-      :c:func:`PySlice_Unpack` and :c:func:`PySlice_AdjustIndices`.
+      :c:func:`!PySlice_Unpack` and :c:func:`!PySlice_AdjustIndices`.
       Arguments *start*, *stop* and *step* are evaluated more than once.
 
    .. deprecated:: 3.6.1
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index 24a1dc4d13b..a0c20a0ad88 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -581,6 +581,19 @@ Changes in the Python API
   in the output. (Contributed by Utkarsh Upadhyay in :issue:`30302`.)
 
 
+Changes in the C API
+--------------------
+
+* The function :c:func:`PySlice_GetIndicesEx` is considered not safe for
+  resizable sequences.  If the slice indices are not instances of :class:`int`,
+  but objects that implement the :meth:`!__index__` method, the sequence can be
+  resized after passing its length to :c:func:`!PySlice_GetIndicesEx`.  This
+  can lead to returning indices out of the length of the sequence.  For
+  avoiding possible problems use new functions :c:func:`PySlice_Unpack` and
+  :c:func:`PySlice_AdjustIndices`.
+  (Contributed by Serhiy Storchaka in :issue:`27867`.)
+
+
 CPython bytecode changes
 ------------------------
 


From webhook-mailer at python.org  Mon Oct  9 03:52:13 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 09 Oct 2017 07:52:13 -0000
Subject: [Python-checkins] bpo-31719: Fix test_regrtest.test_crashed() on
 s390x (#3912)
Message-ID: <mailman.6.1507535535.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/cc4b6f1c6210460c0645b1df508e114e16805784
commit: cc4b6f1c6210460c0645b1df508e114e16805784
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-09T00:52:06-07:00
summary:

bpo-31719: Fix test_regrtest.test_crashed() on s390x (#3912)

Add a new _testcapi._read_null() function to crash Python in a
reliable way on s390x.

On s390x, ctypes.string_at(0) returns an empty string rather than
crashing.

files:
A Misc/NEWS.d/next/Tests/2017-10-06-22-37-38.bpo-31719.gHyrV3.rst
M Lib/test/support/__init__.py
M Lib/test/test_regrtest.py
M Modules/_testcapimodule.c

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index ef474e00b68..25df3ed0c41 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -1960,6 +1960,6 @@ def _crash_python():
     Use SuppressCrashReport() to prevent a crash report from popping up.
     """
 
-    import ctypes
+    import _testcapi
     with SuppressCrashReport():
-        ctypes.string_at(0)
+        _testcapi._read_null()
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
index 264c74d22ba..aae274384c7 100644
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -543,6 +543,8 @@ def test_method2(self):
                                 testname)
         self.assertEqual(output.splitlines(), all_methods)
 
+    @unittest.skipIf(sys.platform.startswith('aix'),
+                     "support._crash_python() doesn't work on AIX")
     def test_crashed(self):
         # Any code which causes a crash
         code = 'import test.support; test.support._crash_python()'
diff --git a/Misc/NEWS.d/next/Tests/2017-10-06-22-37-38.bpo-31719.gHyrV3.rst b/Misc/NEWS.d/next/Tests/2017-10-06-22-37-38.bpo-31719.gHyrV3.rst
new file mode 100644
index 00000000000..a06c5267251
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2017-10-06-22-37-38.bpo-31719.gHyrV3.rst
@@ -0,0 +1,3 @@
+Fix test_regrtest.test_crashed() on s390x. Add a new _testcapi._read_null()
+function to crash Python in a reliable way on s390x. On s390x,
+ctypes.string_at(0) returns an empty string rather than crashing.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 7691b5188ff..5902de07823 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -2566,6 +2566,22 @@ py_w_stopcode(PyObject *self, PyObject *args)
 #endif
 
 
+/* Read memory from NULL (address 0) to raise a SIGSEGV or SIGBUS signal
+   depending on the platform. This function is used by
+   test.support._crash_python() to "crash" Python. */
+static PyObject *
+read_null(PyObject *self, PyObject *args)
+{
+    volatile int *x;
+    volatile int y;
+
+    x = NULL;
+    y = *x;
+    return PyLong_FromLong(y);
+
+}
+
+
 static PyMethodDef TestMethods[] = {
     {"raise_exception",         raise_exception,                 METH_VARARGS},
     {"set_errno",               set_errno,                       METH_VARARGS},
@@ -2685,6 +2701,7 @@ static PyMethodDef TestMethods[] = {
 #ifdef W_STOPCODE
     {"W_STOPCODE", py_w_stopcode, METH_VARARGS},
 #endif
+    {"_read_null", (PyCFunction)read_null, METH_NOARGS},
     {NULL, NULL} /* sentinel */
 };
 


From solipsis at pitrou.net  Mon Oct  9 05:09:18 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 09 Oct 2017 09:09:18 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=-2
Message-ID: <20171009090918.91575.7FBA3BAD0C056956@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/reflogIDbAun', '--timeout', '7200']

From webhook-mailer at python.org  Mon Oct  9 10:55:57 2017
From: webhook-mailer at python.org (=?utf-8?q?=C3=89ric?= Araujo)
Date: Mon, 09 Oct 2017 14:55:57 -0000
Subject: [Python-checkins] bpo-31681: Make sure pkgutil.get_data closes
 files properly (#3875)
Message-ID: <mailman.7.1507560958.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/cfe1aefcbd2534ddc1059a7332842644e6c8d1e4
commit: cfe1aefcbd2534ddc1059a7332842644e6c8d1e4
branch: 2.7
author: Elvis Pranskevichus <elvis at magic.io>
committer: ?ric Araujo <merwok at users.noreply.github.com>
date: 2017-10-09T10:55:54-04:00
summary:

bpo-31681: Make sure pkgutil.get_data closes files properly (#3875)

Also remove an obsolete note about
backward compat with old Pythons.

files:
A Misc/NEWS.d/next/Library/2017-10-03-15-41-08.bpo-31681.sOJMKV.rst
M Lib/pkgutil.py

diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py
index ce072ec9ef7..68ca72b0e40 100644
--- a/Lib/pkgutil.py
+++ b/Lib/pkgutil.py
@@ -1,8 +1,5 @@
 """Utilities to support packages."""
 
-# NOTE: This module must remain compatible with Python 2.3, as it is shared
-# by setuptools for distribution with Python 2.3 and up.
-
 import os
 import sys
 import imp
@@ -252,7 +249,8 @@ def load_module(self, fullname):
         return mod
 
     def get_data(self, pathname):
-        return open(pathname, "rb").read()
+        with open(pathname, "rb") as file:
+            return file.read()
 
     def _reopen(self):
         if self.file and self.file.closed:
diff --git a/Misc/NEWS.d/next/Library/2017-10-03-15-41-08.bpo-31681.sOJMKV.rst b/Misc/NEWS.d/next/Library/2017-10-03-15-41-08.bpo-31681.sOJMKV.rst
new file mode 100644
index 00000000000..b6fc781dcfa
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-03-15-41-08.bpo-31681.sOJMKV.rst
@@ -0,0 +1 @@
+Fix pkgutil.get_data to avoid leaking open files.


From webhook-mailer at python.org  Mon Oct  9 11:06:21 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 09 Oct 2017 15:06:21 -0000
Subject: [Python-checkins] bpo-31723: Fix refleaks when
 zipimporter.__init__() is called more than once (GH-3919)
Message-ID: <mailman.8.1507561583.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/c0cabc23bbe474d542ff8a4f1243f4ec3cce5549
commit: c0cabc23bbe474d542ff8a4f1243f4ec3cce5549
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-10-09T08:06:19-07:00
summary:

bpo-31723: Fix refleaks when zipimporter.__init__() is called more than once (GH-3919)

files:
M Modules/zipimport.c

diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index 493e6db394a..895cd800fc4 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -164,10 +164,10 @@ zipimport_zipimporter___init___impl(ZipImporter *self, PyObject *path)
     }
     else
         Py_INCREF(files);
-    self->files = files;
+    Py_XSETREF(self->files, files);
 
     /* Transfer reference */
-    self->archive = filename;
+    Py_XSETREF(self->archive, filename);
     filename = NULL;
 
     /* Check if there is a prefix directory following the filename. */
@@ -176,7 +176,7 @@ zipimport_zipimporter___init___impl(ZipImporter *self, PyObject *path)
                                   PyUnicode_GET_LENGTH(path));
         if (tmp == NULL)
             goto error;
-        self->prefix = tmp;
+        Py_XSETREF(self->prefix, tmp);
         if (PyUnicode_READ_CHAR(path, len-1) != SEP) {
             /* add trailing SEP */
             tmp = PyUnicode_FromFormat("%U%c", self->prefix, SEP);
@@ -185,8 +185,9 @@ zipimport_zipimporter___init___impl(ZipImporter *self, PyObject *path)
             Py_SETREF(self->prefix, tmp);
         }
     }
-    else
-        self->prefix = PyUnicode_New(0, 0);
+    else {
+        Py_XSETREF(self->prefix, PyUnicode_New(0, 0));
+    }
     Py_DECREF(path);
     return 0;
 


From webhook-mailer at python.org  Mon Oct  9 12:52:35 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 09 Oct 2017 16:52:35 -0000
Subject: [Python-checkins] bpo-31701: faulthandler: ignore MSC and COM
 Windows exception (#3929)
Message-ID: <mailman.9.1507567957.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/6e3d6b5dc22cd06d8c4d44a38a8a3415e4bebb16
commit: 6e3d6b5dc22cd06d8c4d44a38a8a3415e4bebb16
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-09T09:52:32-07:00
summary:

bpo-31701: faulthandler: ignore MSC and COM Windows exception (#3929)

bpo-31701: On Windows, faulthandler.enable() now ignores MSC and COM
exceptions.

files:
A Misc/NEWS.d/next/Library/2017-10-09-17-42-30.bpo-31701.NRrVel.rst
M Lib/test/test_faulthandler.py
M Modules/faulthandler.c

diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py
index 889e6414e39..e0e53c2f829 100644
--- a/Lib/test/test_faulthandler.py
+++ b/Lib/test/test_faulthandler.py
@@ -749,6 +749,22 @@ def test_raise_exception(self):
                 name)
 
     @unittest.skipUnless(MS_WINDOWS, 'specific to Windows')
+    def test_ignore_exception(self):
+        for exc_code in (
+            0xE06D7363,   # MSC exception ("Emsc")
+            0xE0434352,   # COM Callable Runtime exception ("ECCR")
+        ):
+            code = f"""
+                    import faulthandler
+                    faulthandler.enable()
+                    faulthandler._raise_exception({exc_code})
+                    """
+            code = dedent(code)
+            output, exitcode = self.get_output(code)
+            self.assertEqual(output, [])
+            self.assertEqual(exitcode, exc_code)
+
+    @unittest.skipUnless(MS_WINDOWS, 'specific to Windows')
     def test_raise_nonfatal_exception(self):
         # These exceptions are not strictly errors. Letting
         # faulthandler display the traceback when they are
diff --git a/Misc/NEWS.d/next/Library/2017-10-09-17-42-30.bpo-31701.NRrVel.rst b/Misc/NEWS.d/next/Library/2017-10-09-17-42-30.bpo-31701.NRrVel.rst
new file mode 100644
index 00000000000..129b74e5ce2
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-09-17-42-30.bpo-31701.NRrVel.rst
@@ -0,0 +1 @@
+On Windows, faulthandler.enable() now ignores MSC and COM exceptions.
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
index c2c2c537b12..dba646b1287 100644
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -360,6 +360,23 @@ faulthandler_fatal_error(int signum)
 }
 
 #ifdef MS_WINDOWS
+static int
+faulthandler_ignore_exception(DWORD code)
+{
+    /* bpo-30557: ignore exceptions which are not errors */
+    if (!(code & 0x80000000)) {
+        return 1;
+    }
+    /* bpo-31701: ignore MSC and COM exceptions
+       E0000000 + code */
+    if (code == 0xE06D7363 /* MSC exception ("Emsc") */
+        || code == 0xE0434352 /* COM Callable Runtime exception ("ECCR") */) {
+        return 1;
+    }
+    /* Interesting exception: log it with the Python traceback */
+    return 0;
+}
+
 static LONG WINAPI
 faulthandler_exc_handler(struct _EXCEPTION_POINTERS *exc_info)
 {
@@ -367,9 +384,8 @@ faulthandler_exc_handler(struct _EXCEPTION_POINTERS *exc_info)
     DWORD code = exc_info->ExceptionRecord->ExceptionCode;
     DWORD flags = exc_info->ExceptionRecord->ExceptionFlags;
 
-    /* bpo-30557: only log fatal exceptions */
-    if (!(code & 0x80000000)) {
-        /* call the next exception handler */
+    if (faulthandler_ignore_exception(code)) {
+        /* ignore the exception: call the next exception handler */
         return EXCEPTION_CONTINUE_SEARCH;
     }
 


From webhook-mailer at python.org  Mon Oct  9 13:53:33 2017
From: webhook-mailer at python.org (Ned Deily)
Date: Mon, 09 Oct 2017 17:53:33 -0000
Subject: [Python-checkins] Allow configure to handle PATH elements with
 spaces (#3935)
Message-ID: <mailman.10.1507571614.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/14aa00b519c827578648f2c006ad0ac8058cf6a1
commit: 14aa00b519c827578648f2c006ad0ac8058cf6a1
branch: master
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-09T13:53:27-04:00
summary:

Allow configure to handle PATH elements with spaces (#3935)

files:
M configure
M configure.ac

diff --git a/configure b/configure
index 741a834ab38..324c0347060 100755
--- a/configure
+++ b/configure
@@ -3524,14 +3524,14 @@ then
 		for as_dir in $PATH
 		do
 			IFS=$as_save_IFS
-			if test -x $as_dir/gcc; then
+			if test -x "${as_dir}/gcc"; then
 				if test -z "${found_gcc}"; then
-					found_gcc=$as_dir/gcc
+					found_gcc="${as_dir}/gcc"
 				fi
 			fi
-			if test -x $as_dir/clang; then
+			if test -x "${as_dir}/clang"; then
 				if test -z "${found_clang}"; then
-					found_clang=$as_dir/clang
+					found_clang="${as_dir}/clang"
 				fi
 			fi
 		done
diff --git a/configure.ac b/configure.ac
index a3114be7387..bf2b7c07534 100644
--- a/configure.ac
+++ b/configure.ac
@@ -621,14 +621,14 @@ then
 		for as_dir in $PATH
 		do
 			IFS=$as_save_IFS
-			if test -x $as_dir/gcc; then
+			if test -x "${as_dir}/gcc"; then
 				if test -z "${found_gcc}"; then
-					found_gcc=$as_dir/gcc
+					found_gcc="${as_dir}/gcc"
 				fi
 			fi
-			if test -x $as_dir/clang; then
+			if test -x "${as_dir}/clang"; then
 				if test -z "${found_clang}"; then
-					found_clang=$as_dir/clang
+					found_clang="${as_dir}/clang"
 				fi
 			fi
 		done


From webhook-mailer at python.org  Mon Oct  9 14:31:02 2017
From: webhook-mailer at python.org (Ned Deily)
Date: Mon, 09 Oct 2017 18:31:02 -0000
Subject: [Python-checkins] Allow configure to handle PATH elements with
 spaces (#3935) (#3937)
Message-ID: <mailman.11.1507573863.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/ac360fc56c111ec19895ba445e0ec6863f825625
commit: ac360fc56c111ec19895ba445e0ec6863f825625
branch: 3.6
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-09T14:30:59-04:00
summary:

Allow configure to handle PATH elements with spaces (#3935) (#3937)

Fix some tests in ./configure for determining macOS compiler choices that could fail if a $PATH element contained spaces.

files:
M configure
M configure.ac

diff --git a/configure b/configure
index ed305a89b4b..0b950502d2b 100755
--- a/configure
+++ b/configure
@@ -3536,14 +3536,14 @@ then
 		for as_dir in $PATH
 		do
 			IFS=$as_save_IFS
-			if test -x $as_dir/gcc; then
+			if test -x "${as_dir}/gcc"; then
 				if test -z "${found_gcc}"; then
-					found_gcc=$as_dir/gcc
+					found_gcc="${as_dir}/gcc"
 				fi
 			fi
-			if test -x $as_dir/clang; then
+			if test -x "${as_dir}/clang"; then
 				if test -z "${found_clang}"; then
-					found_clang=$as_dir/clang
+					found_clang="${as_dir}/clang"
 				fi
 			fi
 		done
diff --git a/configure.ac b/configure.ac
index e400fa187de..056c5db4a68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -642,14 +642,14 @@ then
 		for as_dir in $PATH
 		do
 			IFS=$as_save_IFS
-			if test -x $as_dir/gcc; then
+			if test -x "${as_dir}/gcc"; then
 				if test -z "${found_gcc}"; then
-					found_gcc=$as_dir/gcc
+					found_gcc="${as_dir}/gcc"
 				fi
 			fi
-			if test -x $as_dir/clang; then
+			if test -x "${as_dir}/clang"; then
 				if test -z "${found_clang}"; then
-					found_clang=$as_dir/clang
+					found_clang="${as_dir}/clang"
 				fi
 			fi
 		done


From lp_benchmark_robot at intel.com  Mon Oct  9 16:20:11 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Mon, 9 Oct 2017 13:20:11 -0700
Subject: [Python-checkins] [1 down,
 64 flat] Results for Python (master branch) 2017-10-09
Message-ID: <a630c1ff-c4d0-4ef3-8dd0-f04d1206a893@orsmsx108.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-09 03:02:58-07:00.
  - commit:		4d3f084
  - previous commit:	b8ab9d3
  - revision date:	2017-10-08 12:53:34+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.103% |  -0.274%   |  +3.838%   |  +9.160%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 0.580% |  +0.476%   |  +20.058%  |  +11.775%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 0.694% |  +0.379%   |  +20.956%  |  +12.143%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.697% |  -0.409%   |  +19.656%  |  +12.879%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 1.512% |  -2.557%   |  +3.852%   |  +13.250%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.452% |  +0.588%   |  +11.290%  |  +8.312%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.647% |  +0.890%   |  +6.667%   |  +11.087%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.460% |  -0.528%   |  +3.381%   |  +5.955%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.292% |  -1.181%   |  +6.148%   |  +19.672%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.735% |  +0.962%   |  +10.089%  |  +14.558%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 0.982% |  -0.058%   |  +4.299%   |  +6.511%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.894% |  -0.335%   |  +5.287%   |  +5.004%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.606% |  +1.678%   |  +2.450%   |  +6.904%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.183% |  +1.206%   |  +9.019%   |  +10.600%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.638% |  +0.316%   |  +7.057%   |  +8.466%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 1.041% |  -0.396%   |  +5.100%   |  +11.350%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.951% |  +0.318%   |  +8.619%   |  +12.082%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 2.875% |  +0.412%   |  +8.666%   |  +10.036%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 0.834% |  +0.478%   |  +4.079%   |  +7.797%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 1.544% |  +0.905%   |  +2.004%   |  +11.617%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.470% |  +2.250%   |  +9.292%   |  +11.108%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.811% |  +0.001%   |  +46.282%  |  +13.435%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.465% |  +1.934%   |  +10.179%  |  +12.569%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.424% |  +0.095%   |  +18.616%  |  +10.827%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 2.670% |  -2.377%   |  +6.399%   |  +12.465%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.821% |  +0.155%   |  +3.138%   |  +4.632%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.601% |  -0.343%   |  -2.698%   |  +2.331%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 1.268% |  -2.071%   |  -0.027%   |  +10.294%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.454% |  -0.227%   |  +4.700%   |  +10.682%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.256% |  -0.095%   |  +1.412%   |  +19.818%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.329% |  -1.593%   |  +1.613%   |  +18.042%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 1.257% |  -0.355%   |  +6.176%   |  +13.754%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 5.353% |  -0.341%   |  +10.888%  |  +9.611%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.123% |  -0.050%   |  +0.398%   |  +9.907%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.122% |  +0.225%   |  +10.926%  |  +4.991%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.087% |  +0.169%   |  +2.409%   |  +4.819%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 0.990% |  +0.795%   |  +9.111%   |  +13.335%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.597% |  -0.025%   |  +1.111%   |  +12.668%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( |               regex_dna| 0.368% |  -4.022%   |  -2.011%   |  +12.952%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.562% |  -3.710%   |  -3.742%   |  +5.028%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.300% |  -4.117%   |  +6.068%   |  +4.381%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.366% |  -0.400%   |  +6.422%   |  +15.336%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 3.332% |  -1.487%   |  -0.065%   |  +2.380%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 2.114% |  +0.232%   |  +26.732%  |  +6.895%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.498% |  +1.848%   |  +4.044%   |  +6.437%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.458% |  +0.788%   |  +14.697%  |  +8.292%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 0.827% |  -1.059%   |  -0.681%   |  -2.505%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.507% |  -1.157%   |  +5.539%   |  +2.155%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.102% |  -0.668%   |  +6.146%   |  +8.566%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.773% |  -0.298%   |  +6.540%   |  +4.136%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.591% |  -1.427%   |  +19.257%  |  +8.215%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.907% |  -1.171%   |  +10.644%  |  +10.163%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.912% |  +0.583%   |  +9.701%   |  +7.057%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.348% |  +0.040%   |  +10.746%  |  +10.138%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.179% |  -0.001%   |  +11.392%  |  +12.126%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 2.230% |  +0.102%   |  +23.278%  |  +10.586%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.239% |  +0.503%   |  +5.542%   |  +7.407%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 2.144% |  -0.320%   |  +1.923%   |  +3.418%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 5.281% |  +3.274%   |  +11.208%  |  +15.681%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 1.078% |  +0.735%   |  +0.952%   |  +15.282%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 3.509% |  -0.805%   |  +6.569%   |  +7.199%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.108% |  -0.387%   |  +6.133%   |  +7.972%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.874% |  +0.309%   |  +1.412%   |  +8.443%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 4.210% |  -0.397%   |  -7.866%   |  +12.372%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.890% |  -0.359%   |  +5.350%   |  +9.157%   |
+-----+------------------------+--------+------------+------------+------------+

* 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-10-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 solipsis at pitrou.net  Tue Oct 10 05:06:33 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 10 Oct 2017 09:06:33 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=7
Message-ID: <20171010090632.32649.835562DC967D7FD5@psf.io>

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

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


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

From webhook-mailer at python.org  Tue Oct 10 05:51:56 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 10 Oct 2017 09:51:56 -0000
Subject: [Python-checkins] bpo-31415: Add _PyTime_GetPerfCounter() and use
 it for -X importtime (#3936)
Message-ID: <mailman.12.1507629117.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/a997c7b434631f51e00191acea2ba6097691e859
commit: a997c7b434631f51e00191acea2ba6097691e859
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-10T02:51:50-07:00
summary:

bpo-31415: Add _PyTime_GetPerfCounter() and use it for -X importtime (#3936)

* Add _PyTime_GetPerfCounter()
* Use _PyTime_GetPerfCounter() for -X importtime

files:
M Include/pytime.h
M Modules/timemodule.c
M Python/import.c
M Python/pytime.c

diff --git a/Include/pytime.h b/Include/pytime.h
index 87ac7fcbbad..95d482fee3b 100644
--- a/Include/pytime.h
+++ b/Include/pytime.h
@@ -192,6 +192,22 @@ PyAPI_FUNC(int) _PyTime_localtime(time_t t, struct tm *tm);
    Return 0 on success, raise an exception and return -1 on error. */
 PyAPI_FUNC(int) _PyTime_gmtime(time_t t, struct tm *tm);
 
+#ifdef MS_WINDOWS
+PyAPI_FUNC(int) _PyTime_GetWinPerfCounterWithInfo(
+    _PyTime_t *t,
+    _Py_clock_info_t *info);
+#endif
+
+/* Get the performance counter: clock with the highest available resolution to
+   measure a short duration. */
+PyAPI_FUNC(_PyTime_t) _PyTime_GetPerfCounter(void);
+
+/* Similar to _PyTime_GetPerfCounter(),
+   but get also clock info if info is non-NULL. */
+PyAPI_FUNC(int) _PyTime_GetPerfCounterWithInfo(
+    _PyTime_t *t,
+    _Py_clock_info_t *info);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 34e057d9d74..31050fb554b 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -60,6 +60,13 @@ Fractions of a second may be present if the system clock provides them.");
 #endif
 #endif
 
+static PyObject*
+_PyFloat_FromPyTime(_PyTime_t t)
+{
+    double d = _PyTime_AsSecondsDouble(t);
+    return PyFloat_FromDouble(d);
+}
+
 static PyObject *
 floatclock(_Py_clock_info_t *info)
 {
@@ -81,47 +88,19 @@ floatclock(_Py_clock_info_t *info)
 }
 #endif /* HAVE_CLOCK */
 
-#ifdef MS_WINDOWS
-#define WIN32_PERF_COUNTER
-/* Win32 has better clock replacement; we have our own version, due to Mark
-   Hammond and Tim Peters */
-static PyObject*
-win_perf_counter(_Py_clock_info_t *info)
-{
-    static LONGLONG cpu_frequency = 0;
-    static LONGLONG ctrStart;
-    LARGE_INTEGER now;
-    double diff;
-
-    if (cpu_frequency == 0) {
-        LARGE_INTEGER freq;
-        QueryPerformanceCounter(&now);
-        ctrStart = now.QuadPart;
-        if (!QueryPerformanceFrequency(&freq) || freq.QuadPart == 0) {
-            PyErr_SetFromWindowsErr(0);
-            return NULL;
-        }
-        cpu_frequency = freq.QuadPart;
-    }
-    QueryPerformanceCounter(&now);
-    diff = (double)(now.QuadPart - ctrStart);
-    if (info) {
-        info->implementation = "QueryPerformanceCounter()";
-        info->resolution = 1.0 / (double)cpu_frequency;
-        info->monotonic = 1;
-        info->adjustable = 0;
-    }
-    return PyFloat_FromDouble(diff / (double)cpu_frequency);
-}
-#endif   /* MS_WINDOWS */
-
-#if defined(WIN32_PERF_COUNTER) || defined(HAVE_CLOCK)
+#if defined(MS_WINDOWS) || defined(HAVE_CLOCK)
 #define PYCLOCK
 static PyObject*
 pyclock(_Py_clock_info_t *info)
 {
-#ifdef WIN32_PERF_COUNTER
-    return win_perf_counter(info);
+#ifdef MS_WINDOWS
+    /* Win32 has better clock replacement; we have our own version, due to Mark
+       Hammond and Tim Peters */
+    _PyTime_t t;
+    if (_PyTime_GetWinPerfCounterWithInfo(&t, info) < 0) {
+        return NULL;
+    }
+    return _PyFloat_FromPyTime(t);
 #else
     return floatclock(info);
 #endif
@@ -939,13 +918,11 @@ static PyObject *
 pymonotonic(_Py_clock_info_t *info)
 {
     _PyTime_t t;
-    double d;
     if (_PyTime_GetMonotonicClockWithInfo(&t, info) < 0) {
         assert(info != NULL);
         return NULL;
     }
-    d = _PyTime_AsSecondsDouble(t);
-    return PyFloat_FromDouble(d);
+    return _PyFloat_FromPyTime(t);
 }
 
 static PyObject *
@@ -962,11 +939,11 @@ Monotonic clock, cannot go backward.");
 static PyObject*
 perf_counter(_Py_clock_info_t *info)
 {
-#ifdef WIN32_PERF_COUNTER
-    return win_perf_counter(info);
-#else
-    return pymonotonic(info);
-#endif
+    _PyTime_t t;
+    if (_PyTime_GetPerfCounterWithInfo(&t, info) < 0) {
+        return NULL;
+    }
+    return _PyFloat_FromPyTime(t);
 }
 
 static PyObject *
@@ -1448,13 +1425,11 @@ static PyObject*
 floattime(_Py_clock_info_t *info)
 {
     _PyTime_t t;
-    double d;
     if (_PyTime_GetSystemClockWithInfo(&t, info) < 0) {
         assert(info != NULL);
         return NULL;
     }
-    d = _PyTime_AsSecondsDouble(t);
-    return PyFloat_FromDouble(d);
+    return _PyFloat_FromPyTime(t);
 }
 
 
diff --git a/Python/import.c b/Python/import.c
index 7554bf86272..d396b4de793 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1695,7 +1695,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals,
 
         if (ximporttime) {
             import_level++;
-            t1 = _PyTime_GetMonotonicClock();
+            t1 = _PyTime_GetPerfCounter();
             accumulated = 0;
         }
 
@@ -1711,7 +1711,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals,
                                            mod != NULL);
 
         if (ximporttime) {
-            _PyTime_t cum = _PyTime_GetMonotonicClock() - t1;
+            _PyTime_t cum = _PyTime_GetPerfCounter() - t1;
 
             import_level--;
             fprintf(stderr, "import time: %9ld | %10ld | %*s%s\n",
diff --git a/Python/pytime.c b/Python/pytime.c
index 8f275d29839..bda6d8bb912 100644
--- a/Python/pytime.c
+++ b/Python/pytime.c
@@ -285,8 +285,8 @@ _PyTime_FromTimeval(_PyTime_t *tp, struct timeval *tv, int raise)
 #endif
 
 static int
-_PyTime_FromFloatObject(_PyTime_t *t, double value, _PyTime_round_t round,
-                        long unit_to_ns)
+_PyTime_FromDouble(_PyTime_t *t, double value, _PyTime_round_t round,
+                   long unit_to_ns)
 {
     /* volatile avoids optimization changing how numbers are rounded */
     volatile double d;
@@ -315,7 +315,7 @@ _PyTime_FromObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round,
             PyErr_SetString(PyExc_ValueError, "Invalid value NaN (not a number)");
             return -1;
         }
-        return _PyTime_FromFloatObject(t, d, round, unit_to_ns);
+        return _PyTime_FromDouble(t, d, round, unit_to_ns);
     }
     else {
         long long sec;
@@ -779,19 +779,80 @@ _PyTime_GetMonotonicClockWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
     return pymonotonic(tp, info, 1);
 }
 
+
+#ifdef MS_WINDOWS
 int
-_PyTime_Init(void)
+_PyTime_GetWinPerfCounterWithInfo(_PyTime_t *t, _Py_clock_info_t *info)
+{
+    static LONGLONG cpu_frequency = 0;
+    static LONGLONG ctrStart;
+    LARGE_INTEGER now;
+    double diff;
+
+    if (cpu_frequency == 0) {
+        LARGE_INTEGER freq;
+        QueryPerformanceCounter(&now);
+        ctrStart = now.QuadPart;
+        if (!QueryPerformanceFrequency(&freq) || freq.QuadPart == 0) {
+            PyErr_SetFromWindowsErr(0);
+            return -1;
+        }
+        cpu_frequency = freq.QuadPart;
+    }
+    QueryPerformanceCounter(&now);
+    diff = (double)(now.QuadPart - ctrStart);
+    if (info) {
+        info->implementation = "QueryPerformanceCounter()";
+        info->resolution = 1.0 / (double)cpu_frequency;
+        info->monotonic = 1;
+        info->adjustable = 0;
+    }
+
+    diff = diff / (double)cpu_frequency;
+    return _PyTime_FromDouble(t, diff, _PyTime_ROUND_FLOOR, SEC_TO_NS);
+}
+#endif
+
+
+int
+_PyTime_GetPerfCounterWithInfo(_PyTime_t *t, _Py_clock_info_t *info)
+{
+#ifdef MS_WINDOWS
+    return _PyTime_GetWinPerfCounterWithInfo(t, info);
+#else
+    return _PyTime_GetMonotonicClockWithInfo(t, info);
+#endif
+}
+
+
+_PyTime_t
+_PyTime_GetPerfCounter(void)
 {
     _PyTime_t t;
+    if (_PyTime_GetPerfCounterWithInfo(&t, NULL) < 0) {
+        /* should not happen, _PyTime_Init() checked the clock at startup */
+        Py_UNREACHABLE();
+    }
+    return t;
+}
 
-    /* ensure that the system clock works */
-    if (_PyTime_GetSystemClockWithInfo(&t, NULL) < 0)
-        return -1;
 
-    /* ensure that the operating system provides a monotonic clock */
-    if (_PyTime_GetMonotonicClockWithInfo(&t, NULL) < 0)
+int
+_PyTime_Init(void)
+{
+    /* check that the 3 most important clocks are working properly
+       to not have to check for exceptions at runtime. If a clock works once,
+       it cannot fail in next calls. */
+    _PyTime_t t;
+    if (_PyTime_GetSystemClockWithInfo(&t, NULL) < 0) {
         return -1;
-
+    }
+    if (_PyTime_GetMonotonicClockWithInfo(&t, NULL) < 0) {
+        return -1;
+    }
+    if (_PyTime_GetPerfCounterWithInfo(&t, NULL) < 0) {
+        return -1;
+    }
     return 0;
 }
 


From webhook-mailer at python.org  Tue Oct 10 15:27:49 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 10 Oct 2017 19:27:49 -0000
Subject: [Python-checkins] bpo-31740: Prevent refleaks when
 sqlite3.Connection.__init__() is called more than once (GH-3944)
Message-ID: <mailman.13.1507663671.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/93c5a5df8ea118f6e4a153a7c8cccd65a5ff8bff
commit: 93c5a5df8ea118f6e4a153a7c8cccd65a5ff8bff
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-10-10T12:27:46-07:00
summary:

bpo-31740: Prevent refleaks when sqlite3.Connection.__init__() is called more than once (GH-3944)

files:
M Modules/_sqlite/connection.c

diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 27591164b82..70e56aad520 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -97,15 +97,15 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
 
     self->begin_statement = NULL;
 
-    self->statement_cache = NULL;
-    self->statements = NULL;
-    self->cursors = NULL;
+    Py_CLEAR(self->statement_cache);
+    Py_CLEAR(self->statements);
+    Py_CLEAR(self->cursors);
 
     Py_INCREF(Py_None);
-    self->row_factory = Py_None;
+    Py_XSETREF(self->row_factory, Py_None);
 
     Py_INCREF(&PyUnicode_Type);
-    self->text_factory = (PyObject*)&PyUnicode_Type;
+    Py_XSETREF(self->text_factory, (PyObject*)&PyUnicode_Type);
 
 #ifdef SQLITE_OPEN_URI
     Py_BEGIN_ALLOW_THREADS
@@ -137,7 +137,7 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
     } else {
         Py_INCREF(isolation_level);
     }
-    self->isolation_level = NULL;
+    Py_CLEAR(self->isolation_level);
     if (pysqlite_connection_set_isolation_level(self, isolation_level) < 0) {
         Py_DECREF(isolation_level);
         return -1;
@@ -177,12 +177,12 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
     }
     self->check_same_thread = check_same_thread;
 
-    self->function_pinboard = PyDict_New();
+    Py_XSETREF(self->function_pinboard, PyDict_New());
     if (!self->function_pinboard) {
         return -1;
     }
 
-    self->collations = PyDict_New();
+    Py_XSETREF(self->collations, PyDict_New());
     if (!self->collations) {
         return -1;
     }


From lp_benchmark_robot at intel.com  Tue Oct 10 15:45:10 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Tue, 10 Oct 2017 12:45:10 -0700
Subject: [Python-checkins] [3 down, 1 up,
 61 flat] Results for Python (master branch) 2017-10-10
Message-ID: <77765a4c-3d50-432b-a514-e87dd93fcfed@orsmsx153.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-10 03:02:59-07:00.
  - commit:		a997c7b
  - previous commit:	4d3f084
  - revision date:	2017-10-10 02:51:50-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.310% |  +1.868%   |  +5.634%   |  +7.046%   |
+-----+------------------------+--------+------------+------------+------------+
| :-( |             call_method| 0.573% |  -4.092%   |  +16.787%  |  +17.931%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( |       call_method_slots| 0.638% |  -3.952%   |  +17.832%  |  +17.709%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( |     call_method_unknown| 0.431% |  -2.843%   |  +17.372%  |  +15.859%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.697% |  -3.234%   |  +0.743%   |  +14.063%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 2.085% |  -0.320%   |  +11.006%  |  +10.048%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.947% |  +1.343%   |  +7.920%   |  +10.108%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.858% |  -1.557%   |  +1.876%   |  +8.313%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.074% |  -0.879%   |  +5.323%   |  +20.625%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 3.535% |  -0.242%   |  +9.872%   |  +11.183%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.100% |  +0.139%   |  +4.432%   |  +7.020%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.589% |  +1.441%   |  +6.652%   |  +3.379%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.603% |  +1.502%   |  +3.915%   |  +6.235%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.322% |  -0.042%   |  +8.981%   |  +11.203%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.238% |  -0.325%   |  +6.754%   |  +10.509%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.821% |  +1.361%   |  +6.391%   |  +11.589%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.665% |  +0.518%   |  +9.093%   |  +11.370%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.074% |  +0.912%   |  +9.499%   |  +8.556%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.458% |  -0.133%   |  +3.951%   |  +8.502%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 5.728% |  -1.154%   |  +0.873%   |  +11.725%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.729% |  -0.304%   |  +9.016%   |  +10.377%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.285% |  +0.343%   |  +46.466%  |  +13.480%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.861% |  -0.673%   |  +9.574%   |  +12.501%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.391% |  -1.224%   |  +17.620%  |  +13.667%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 1.831% |  +0.902%   |  +7.243%   |  +10.475%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.094% |  -0.613%   |  +2.544%   |  +6.248%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.895% |  +1.012%   |  -1.659%   |  +3.218%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 1.497% |  +2.356%   |  +2.329%   |  +9.266%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.543% |  +1.179%   |  +5.823%   |  +10.215%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 0.923% |  -1.198%   |  +0.231%   |  +21.237%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 2.334% |  +1.709%   |  +3.295%   |  +18.482%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.627% |  -0.616%   |  +5.598%   |  +16.418%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.382% |  +2.076%   |  +12.738%  |  +9.202%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.438% |  -0.023%   |  +0.376%   |  +9.852%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.123% |  +0.250%   |  +11.149%  |  +4.522%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.093% |  +0.085%   |  +2.492%   |  +4.654%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.107% |  +1.155%   |  +10.161%  |  +13.021%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 6.082% |  +1.690%   |  +2.783%   |  +11.833%  |
+-----+------------------------+--------+------------+------------+------------+
| :-) |               regex_dna| 1.043% |  +3.567%   |  +1.629%   |  +9.384%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.356% |  +3.592%   |  -0.016%   |  +2.972%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.796% |  +3.779%   |  +9.617%   |  +0.952%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.831% |  +1.453%   |  +7.782%   |  +15.330%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.980% |  +2.851%   |  +2.788%   |  -0.899%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.584% |  -0.569%   |  +26.315%  |  +8.668%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.011% |  +0.190%   |  +4.226%   |  +6.921%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 1.979% |  +0.349%   |  +14.995%  |  +9.313%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 3.428% |  +3.365%   |  +2.707%   |  +0.598%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 2.003% |  +0.256%   |  +5.780%   |  +1.587%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.400% |  +1.094%   |  +7.173%   |  +6.803%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.042% |  -0.799%   |  +5.793%   |  +6.456%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 5.053% |  +1.527%   |  +20.490%  |  +6.268%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.592% |  +1.483%   |  +11.969%  |  +8.230%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.757% |  +0.465%   |  +10.120%  |  +6.818%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.914% |  +0.691%   |  +11.363%  |  +9.518%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.395% |  +0.362%   |  +11.712%  |  +11.763%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 2.761% |  +0.629%   |  +23.761%  |  +10.103%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.119% |  +0.942%   |  +6.432%   |  +6.622%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 0.824% |  +0.663%   |  +2.573%   |  +2.484%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 5.236% |  -1.669%   |  +9.726%   |  +18.898%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 1.405% |  -0.065%   |  +0.887%   |  +16.092%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 3.253% |  +0.209%   |  +6.764%   |  +7.667%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.061% |  +0.238%   |  +6.356%   |  +7.051%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.925% |  +0.539%   |  +1.943%   |  +5.630%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 4.555% |  -0.796%   |  -8.724%   |  +11.655%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 2.382% |  +0.247%   |  +5.584%   |  +9.029%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/3-down-1-up-61-flat-results-for-python-master-branch-2017-10-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  Tue Oct 10 16:26:28 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 10 Oct 2017 20:26:28 -0000
Subject: [Python-checkins] bpo-31728: Prevent crashes in _elementtree due to
 unsafe cleanup of Element.text and Element.tail (#3924)
Message-ID: <mailman.14.1507667190.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/39ecb9c71b6e55d8a61a710d0144231bd88f9ada
commit: 39ecb9c71b6e55d8a61a710d0144231bd88f9ada
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-10T23:26:24+03:00
summary:

bpo-31728: Prevent crashes in _elementtree due to unsafe cleanup of Element.text and Element.tail (#3924)

files:
A Misc/NEWS.d/next/Library/2017-10-08-23-28-30.bpo-31728.XrVMME.rst
M Lib/test/test_xml_etree_c.py
M Modules/_elementtree.c

diff --git a/Lib/test/test_xml_etree_c.py b/Lib/test/test_xml_etree_c.py
index 25517a7269c..765652ff752 100644
--- a/Lib/test/test_xml_etree_c.py
+++ b/Lib/test/test_xml_etree_c.py
@@ -85,6 +85,38 @@ def parser_ref_cycle():
         # and so destroy the parser
         support.gc_collect()
 
+    def test_bpo_31728(self):
+        # A crash or an assertion failure shouldn't happen, in case garbage
+        # collection triggers a call to clear() or a reading of text or tail,
+        # while a setter or clear() or __setstate__() is already running.
+        elem = cET.Element('elem')
+        class X:
+            def __del__(self):
+                elem.text
+                elem.tail
+                elem.clear()
+
+        elem.text = X()
+        elem.clear()  # shouldn't crash
+
+        elem.tail = X()
+        elem.clear()  # shouldn't crash
+
+        elem.text = X()
+        elem.text = X()  # shouldn't crash
+        elem.clear()
+
+        elem.tail = X()
+        elem.tail = X()  # shouldn't crash
+        elem.clear()
+
+        elem.text = X()
+        elem.__setstate__({'tag': 42})  # shouldn't cause an assertion failure
+        elem.clear()
+
+        elem.tail = X()
+        elem.__setstate__({'tag': 42})  # shouldn't cause an assertion failure
+
 
 @unittest.skipUnless(cET, 'requires _elementtree')
 class TestAliasWorking(unittest.TestCase):
diff --git a/Misc/NEWS.d/next/Library/2017-10-08-23-28-30.bpo-31728.XrVMME.rst b/Misc/NEWS.d/next/Library/2017-10-08-23-28-30.bpo-31728.XrVMME.rst
new file mode 100644
index 00000000000..b317d9f210b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-08-23-28-30.bpo-31728.XrVMME.rst
@@ -0,0 +1,2 @@
+Prevent crashes in `_elementtree` due to unsafe cleanup of `Element.text`
+and `Element.tail`. Patch by Oren Milman.
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index bddac851d9c..b4c0f4c87a8 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -61,15 +61,22 @@ do { memory -= size; printf("%8d - %s\n", memory, comment); } while (0)
 #define JOIN_SET(p, flag) ((void*) ((uintptr_t) (JOIN_OBJ(p)) | (flag)))
 #define JOIN_OBJ(p) ((PyObject*) ((uintptr_t) (p) & ~(uintptr_t)1))
 
+/* Py_SETREF for a PyObject* that uses a join flag. */
+Py_LOCAL_INLINE(void)
+_set_joined_ptr(PyObject **p, PyObject *new_joined_ptr)
+{
+    PyObject *tmp = JOIN_OBJ(*p);
+    *p = new_joined_ptr;
+    Py_DECREF(tmp);
+}
+
 /* Py_CLEAR for a PyObject* that uses a join flag. Pass the pointer by
  * reference since this function sets it to NULL.
 */
 static void _clear_joined_ptr(PyObject **p)
 {
     if (*p) {
-        PyObject *tmp = JOIN_OBJ(*p);
-        *p = NULL;
-        Py_DECREF(tmp);
+        _set_joined_ptr(p, NULL);
     }
 }
 
@@ -356,7 +363,6 @@ static int
 element_init(PyObject *self, PyObject *args, PyObject *kwds)
 {
     PyObject *tag;
-    PyObject *tmp;
     PyObject *attrib = NULL;
     ElementObject *self_elem;
 
@@ -397,15 +403,11 @@ element_init(PyObject *self, PyObject *args, PyObject *kwds)
     Py_INCREF(tag);
     Py_XSETREF(self_elem->tag, tag);
 
-    tmp = self_elem->text;
     Py_INCREF(Py_None);
-    self_elem->text = Py_None;
-    Py_DECREF(JOIN_OBJ(tmp));
+    _set_joined_ptr(&self_elem->text, Py_None);
 
-    tmp = self_elem->tail;
     Py_INCREF(Py_None);
-    self_elem->tail = Py_None;
-    Py_DECREF(JOIN_OBJ(tmp));
+    _set_joined_ptr(&self_elem->tail, Py_None);
 
     return 0;
 }
@@ -675,12 +677,10 @@ _elementtree_Element_clear_impl(ElementObject *self)
     dealloc_extra(self);
 
     Py_INCREF(Py_None);
-    Py_DECREF(JOIN_OBJ(self->text));
-    self->text = Py_None;
+    _set_joined_ptr(&self->text, Py_None);
 
     Py_INCREF(Py_None);
-    Py_DECREF(JOIN_OBJ(self->tail));
-    self->tail = Py_None;
+    _set_joined_ptr(&self->tail, Py_None);
 
     Py_RETURN_NONE;
 }
@@ -702,13 +702,11 @@ _elementtree_Element___copy___impl(ElementObject *self)
     if (!element)
         return NULL;
 
-    Py_DECREF(JOIN_OBJ(element->text));
-    element->text = self->text;
-    Py_INCREF(JOIN_OBJ(element->text));
+    Py_INCREF(JOIN_OBJ(self->text));
+    _set_joined_ptr(&element->text, self->text);
 
-    Py_DECREF(JOIN_OBJ(element->tail));
-    element->tail = self->tail;
-    Py_INCREF(JOIN_OBJ(element->tail));
+    Py_INCREF(JOIN_OBJ(self->tail));
+    _set_joined_ptr(&element->tail, self->tail);
 
     if (self->extra) {
         if (element_resize(element, self->extra->length) < 0) {
@@ -776,14 +774,12 @@ _elementtree_Element___deepcopy___impl(ElementObject *self, PyObject *memo)
     text = deepcopy(JOIN_OBJ(self->text), memo);
     if (!text)
         goto error;
-    Py_DECREF(element->text);
-    element->text = JOIN_SET(text, JOIN_GET(self->text));
+    _set_joined_ptr(&element->text, JOIN_SET(text, JOIN_GET(self->text)));
 
     tail = deepcopy(JOIN_OBJ(self->tail), memo);
     if (!tail)
         goto error;
-    Py_DECREF(element->tail);
-    element->tail = JOIN_SET(tail, JOIN_GET(self->tail));
+    _set_joined_ptr(&element->tail, JOIN_SET(tail, JOIN_GET(self->tail)));
 
     if (self->extra) {
         if (element_resize(element, self->extra->length) < 0)
@@ -968,13 +964,13 @@ element_setstate_from_attributes(ElementObject *self,
     Py_INCREF(tag);
     Py_XSETREF(self->tag, tag);
 
-    _clear_joined_ptr(&self->text);
-    self->text = text ? JOIN_SET(text, PyList_CheckExact(text)) : Py_None;
-    Py_INCREF(JOIN_OBJ(self->text));
+    text = text ? JOIN_SET(text, PyList_CheckExact(text)) : Py_None;
+    Py_INCREF(JOIN_OBJ(text));
+    _set_joined_ptr(&self->text, text);
 
-    _clear_joined_ptr(&self->tail);
-    self->tail = tail ? JOIN_SET(tail, PyList_CheckExact(tail)) : Py_None;
-    Py_INCREF(JOIN_OBJ(self->tail));
+    tail = tail ? JOIN_SET(tail, PyList_CheckExact(tail)) : Py_None;
+    Py_INCREF(JOIN_OBJ(tail));
+    _set_joined_ptr(&self->tail, tail);
 
     /* Handle ATTRIB and CHILDREN. */
     if (!children && !attrib)
@@ -2009,8 +2005,7 @@ element_text_setter(ElementObject *self, PyObject *value, void *closure)
 {
     _VALIDATE_ATTR_VALUE(value);
     Py_INCREF(value);
-    Py_DECREF(JOIN_OBJ(self->text));
-    self->text = value;
+    _set_joined_ptr(&self->text, value);
     return 0;
 }
 
@@ -2019,8 +2014,7 @@ element_tail_setter(ElementObject *self, PyObject *value, void *closure)
 {
     _VALIDATE_ATTR_VALUE(value);
     Py_INCREF(value);
-    Py_DECREF(JOIN_OBJ(self->tail));
-    self->tail = value;
+    _set_joined_ptr(&self->tail, value);
     return 0;
 }
 


From webhook-mailer at python.org  Tue Oct 10 17:51:31 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 10 Oct 2017 21:51:31 -0000
Subject: [Python-checkins] [3.6] bpo-31728: Prevent crashes in _elementtree
 due to unsafe cleanup of Element.text and Element.tail (GH-3924) (#3945)
Message-ID: <mailman.15.1507672293.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/a8ac71d15f2a4aef83a8954a678cc12545ce517c
commit: a8ac71d15f2a4aef83a8954a678cc12545ce517c
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-11T00:51:28+03:00
summary:

[3.6] bpo-31728: Prevent crashes in _elementtree due to unsafe cleanup of Element.text and Element.tail (GH-3924) (#3945)

(cherry picked from commit 39ecb9c71b6e55d8a61a710d0144231bd88f9ada)

files:
A Misc/NEWS.d/next/Library/2017-10-08-23-28-30.bpo-31728.XrVMME.rst
M Lib/test/test_xml_etree_c.py
M Modules/_elementtree.c

diff --git a/Lib/test/test_xml_etree_c.py b/Lib/test/test_xml_etree_c.py
index b2200d31f59..d99b4e7527f 100644
--- a/Lib/test/test_xml_etree_c.py
+++ b/Lib/test/test_xml_etree_c.py
@@ -84,6 +84,38 @@ def parser_ref_cycle():
         # and so destroy the parser
         support.gc_collect()
 
+    def test_bpo_31728(self):
+        # A crash or an assertion failure shouldn't happen, in case garbage
+        # collection triggers a call to clear() or a reading of text or tail,
+        # while a setter or clear() or __setstate__() is already running.
+        elem = cET.Element('elem')
+        class X:
+            def __del__(self):
+                elem.text
+                elem.tail
+                elem.clear()
+
+        elem.text = X()
+        elem.clear()  # shouldn't crash
+
+        elem.tail = X()
+        elem.clear()  # shouldn't crash
+
+        elem.text = X()
+        elem.text = X()  # shouldn't crash
+        elem.clear()
+
+        elem.tail = X()
+        elem.tail = X()  # shouldn't crash
+        elem.clear()
+
+        elem.text = X()
+        elem.__setstate__({'tag': 42})  # shouldn't cause an assertion failure
+        elem.clear()
+
+        elem.tail = X()
+        elem.__setstate__({'tag': 42})  # shouldn't cause an assertion failure
+
 
 @unittest.skipUnless(cET, 'requires _elementtree')
 class TestAliasWorking(unittest.TestCase):
diff --git a/Misc/NEWS.d/next/Library/2017-10-08-23-28-30.bpo-31728.XrVMME.rst b/Misc/NEWS.d/next/Library/2017-10-08-23-28-30.bpo-31728.XrVMME.rst
new file mode 100644
index 00000000000..b317d9f210b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-08-23-28-30.bpo-31728.XrVMME.rst
@@ -0,0 +1,2 @@
+Prevent crashes in `_elementtree` due to unsafe cleanup of `Element.text`
+and `Element.tail`. Patch by Oren Milman.
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index a6d6c61dd24..707ab2912b3 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -61,15 +61,22 @@ do { memory -= size; printf("%8d - %s\n", memory, comment); } while (0)
 #define JOIN_SET(p, flag) ((void*) ((uintptr_t) (JOIN_OBJ(p)) | (flag)))
 #define JOIN_OBJ(p) ((PyObject*) ((uintptr_t) (p) & ~(uintptr_t)1))
 
+/* Py_SETREF for a PyObject* that uses a join flag. */
+Py_LOCAL_INLINE(void)
+_set_joined_ptr(PyObject **p, PyObject *new_joined_ptr)
+{
+    PyObject *tmp = JOIN_OBJ(*p);
+    *p = new_joined_ptr;
+    Py_DECREF(tmp);
+}
+
 /* Py_CLEAR for a PyObject* that uses a join flag. Pass the pointer by
  * reference since this function sets it to NULL.
 */
 static void _clear_joined_ptr(PyObject **p)
 {
     if (*p) {
-        PyObject *tmp = JOIN_OBJ(*p);
-        *p = NULL;
-        Py_DECREF(tmp);
+        _set_joined_ptr(p, NULL);
     }
 }
 
@@ -356,7 +363,6 @@ static int
 element_init(PyObject *self, PyObject *args, PyObject *kwds)
 {
     PyObject *tag;
-    PyObject *tmp;
     PyObject *attrib = NULL;
     ElementObject *self_elem;
 
@@ -397,15 +403,11 @@ element_init(PyObject *self, PyObject *args, PyObject *kwds)
     Py_INCREF(tag);
     Py_XSETREF(self_elem->tag, tag);
 
-    tmp = self_elem->text;
     Py_INCREF(Py_None);
-    self_elem->text = Py_None;
-    Py_DECREF(JOIN_OBJ(tmp));
+    _set_joined_ptr(&self_elem->text, Py_None);
 
-    tmp = self_elem->tail;
     Py_INCREF(Py_None);
-    self_elem->tail = Py_None;
-    Py_DECREF(JOIN_OBJ(tmp));
+    _set_joined_ptr(&self_elem->tail, Py_None);
 
     return 0;
 }
@@ -675,12 +677,10 @@ _elementtree_Element_clear_impl(ElementObject *self)
     dealloc_extra(self);
 
     Py_INCREF(Py_None);
-    Py_DECREF(JOIN_OBJ(self->text));
-    self->text = Py_None;
+    _set_joined_ptr(&self->text, Py_None);
 
     Py_INCREF(Py_None);
-    Py_DECREF(JOIN_OBJ(self->tail));
-    self->tail = Py_None;
+    _set_joined_ptr(&self->tail, Py_None);
 
     Py_RETURN_NONE;
 }
@@ -702,13 +702,11 @@ _elementtree_Element___copy___impl(ElementObject *self)
     if (!element)
         return NULL;
 
-    Py_DECREF(JOIN_OBJ(element->text));
-    element->text = self->text;
-    Py_INCREF(JOIN_OBJ(element->text));
+    Py_INCREF(JOIN_OBJ(self->text));
+    _set_joined_ptr(&element->text, self->text);
 
-    Py_DECREF(JOIN_OBJ(element->tail));
-    element->tail = self->tail;
-    Py_INCREF(JOIN_OBJ(element->tail));
+    Py_INCREF(JOIN_OBJ(self->tail));
+    _set_joined_ptr(&element->tail, self->tail);
 
     if (self->extra) {
         if (element_resize(element, self->extra->length) < 0) {
@@ -776,14 +774,12 @@ _elementtree_Element___deepcopy__(ElementObject *self, PyObject *memo)
     text = deepcopy(JOIN_OBJ(self->text), memo);
     if (!text)
         goto error;
-    Py_DECREF(element->text);
-    element->text = JOIN_SET(text, JOIN_GET(self->text));
+    _set_joined_ptr(&element->text, JOIN_SET(text, JOIN_GET(self->text)));
 
     tail = deepcopy(JOIN_OBJ(self->tail), memo);
     if (!tail)
         goto error;
-    Py_DECREF(element->tail);
-    element->tail = JOIN_SET(tail, JOIN_GET(self->tail));
+    _set_joined_ptr(&element->tail, JOIN_SET(tail, JOIN_GET(self->tail)));
 
     if (self->extra) {
         if (element_resize(element, self->extra->length) < 0)
@@ -967,13 +963,13 @@ element_setstate_from_attributes(ElementObject *self,
     Py_INCREF(tag);
     Py_XSETREF(self->tag, tag);
 
-    _clear_joined_ptr(&self->text);
-    self->text = text ? JOIN_SET(text, PyList_CheckExact(text)) : Py_None;
-    Py_INCREF(JOIN_OBJ(self->text));
+    text = text ? JOIN_SET(text, PyList_CheckExact(text)) : Py_None;
+    Py_INCREF(JOIN_OBJ(text));
+    _set_joined_ptr(&self->text, text);
 
-    _clear_joined_ptr(&self->tail);
-    self->tail = tail ? JOIN_SET(tail, PyList_CheckExact(tail)) : Py_None;
-    Py_INCREF(JOIN_OBJ(self->tail));
+    tail = tail ? JOIN_SET(tail, PyList_CheckExact(tail)) : Py_None;
+    Py_INCREF(JOIN_OBJ(tail));
+    _set_joined_ptr(&self->tail, tail);
 
     /* Handle ATTRIB and CHILDREN. */
     if (!children && !attrib)
@@ -1980,8 +1976,7 @@ element_text_setter(ElementObject *self, PyObject *value, void *closure)
 {
     _VALIDATE_ATTR_VALUE(value);
     Py_INCREF(value);
-    Py_DECREF(JOIN_OBJ(self->text));
-    self->text = value;
+    _set_joined_ptr(&self->text, value);
     return 0;
 }
 
@@ -1990,8 +1985,7 @@ element_tail_setter(ElementObject *self, PyObject *value, void *closure)
 {
     _VALIDATE_ATTR_VALUE(value);
     Py_INCREF(value);
-    Py_DECREF(JOIN_OBJ(self->tail));
-    self->tail = value;
+    _set_joined_ptr(&self->tail, value);
     return 0;
 }
 


From webhook-mailer at python.org  Tue Oct 10 17:53:02 2017
From: webhook-mailer at python.org (Mariatta)
Date: Tue, 10 Oct 2017 21:53:02 -0000
Subject: [Python-checkins] bpo-31537: Update readline documentation example.
 (GH-3925)
Message-ID: <mailman.16.1507672383.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/eeb5ffd54e56dd89a99c74eb512c36d62649cfec
commit: eeb5ffd54e56dd89a99c74eb512c36d62649cfec
branch: master
author: Brad Smith <infinitewarp at users.noreply.github.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-10-10T14:52:58-07:00
summary:

bpo-31537: Update readline documentation example. (GH-3925)

Change the code example from using `get_history_length` to `get_current_history_length`.

files:
A Misc/NEWS.d/next/Documentation/2017-10-08-23-02-14.bpo-31537.SiFNM8.rst
M Doc/library/readline.rst

diff --git a/Doc/library/readline.rst b/Doc/library/readline.rst
index 54c54b461ce..837816e952a 100644
--- a/Doc/library/readline.rst
+++ b/Doc/library/readline.rst
@@ -312,13 +312,13 @@ sessions, by only appending the new history. ::
 
    try:
        readline.read_history_file(histfile)
-       h_len = readline.get_history_length()
+       h_len = readline.get_current_history_length()
    except FileNotFoundError:
        open(histfile, 'wb').close()
        h_len = 0
 
    def save(prev_h_len, histfile):
-       new_h_len = readline.get_history_length()
+       new_h_len = readline.get_current_history_length()
        readline.set_history_length(1000)
        readline.append_history_file(new_h_len - prev_h_len, histfile)
    atexit.register(save, h_len, histfile)
diff --git a/Misc/NEWS.d/next/Documentation/2017-10-08-23-02-14.bpo-31537.SiFNM8.rst b/Misc/NEWS.d/next/Documentation/2017-10-08-23-02-14.bpo-31537.SiFNM8.rst
new file mode 100644
index 00000000000..9244d7ee627
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2017-10-08-23-02-14.bpo-31537.SiFNM8.rst
@@ -0,0 +1,2 @@
+Fix incorrect usage of ``get_history_length`` in readline documentation
+example code. Patch by Brad Smith.


From webhook-mailer at python.org  Tue Oct 10 18:03:17 2017
From: webhook-mailer at python.org (Mariatta)
Date: Tue, 10 Oct 2017 22:03:17 -0000
Subject: [Python-checkins] bpo-31537: Update readline documentation example.
 (GH-3925) (GH-3948)
Message-ID: <mailman.17.1507672999.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/10eb14e2c5fe08c4193668530eaef156e07c3674
commit: 10eb14e2c5fe08c4193668530eaef156e07c3674
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-10-10T15:03:14-07:00
summary:

bpo-31537: Update readline documentation example. (GH-3925) (GH-3948)

Change the code example from using `get_history_length` to `get_current_history_length`.
(cherry picked from commit eeb5ffd54e56dd89a99c74eb512c36d62649cfec)

files:
A Misc/NEWS.d/next/Documentation/2017-10-08-23-02-14.bpo-31537.SiFNM8.rst
M Doc/library/readline.rst

diff --git a/Doc/library/readline.rst b/Doc/library/readline.rst
index 54c54b461ce..837816e952a 100644
--- a/Doc/library/readline.rst
+++ b/Doc/library/readline.rst
@@ -312,13 +312,13 @@ sessions, by only appending the new history. ::
 
    try:
        readline.read_history_file(histfile)
-       h_len = readline.get_history_length()
+       h_len = readline.get_current_history_length()
    except FileNotFoundError:
        open(histfile, 'wb').close()
        h_len = 0
 
    def save(prev_h_len, histfile):
-       new_h_len = readline.get_history_length()
+       new_h_len = readline.get_current_history_length()
        readline.set_history_length(1000)
        readline.append_history_file(new_h_len - prev_h_len, histfile)
    atexit.register(save, h_len, histfile)
diff --git a/Misc/NEWS.d/next/Documentation/2017-10-08-23-02-14.bpo-31537.SiFNM8.rst b/Misc/NEWS.d/next/Documentation/2017-10-08-23-02-14.bpo-31537.SiFNM8.rst
new file mode 100644
index 00000000000..9244d7ee627
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2017-10-08-23-02-14.bpo-31537.SiFNM8.rst
@@ -0,0 +1,2 @@
+Fix incorrect usage of ``get_history_length`` in readline documentation
+example code. Patch by Brad Smith.


From solipsis at pitrou.net  Wed Oct 11 05:06:19 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 11 Oct 2017 09:06:19 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=14
Message-ID: <20171011090618.33039.6CD59BBE7D6A89C5@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 [1, 0, -2] memory blocks, sum=-1
test_multiprocessing_forkserver leaked [1, -1, 2] memory blocks, sum=2
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/reflogb9nxTi', '--timeout', '7200']

From webhook-mailer at python.org  Wed Oct 11 09:29:16 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 11 Oct 2017 13:29:16 -0000
Subject: [Python-checkins] [2.7] bpo-31728: Prevent crashes in _elementtree
 due to unsafe cleanup of Element.text and Element.tail (GH-3924) (#3950)
Message-ID: <mailman.18.1507728558.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/f15058a697de12b0efe6c7ebc38fe61a993bb5d5
commit: f15058a697de12b0efe6c7ebc38fe61a993bb5d5
branch: 2.7
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-11T16:29:12+03:00
summary:

[2.7] bpo-31728: Prevent crashes in _elementtree due to unsafe cleanup of Element.text and Element.tail (GH-3924) (#3950)

files:
A Misc/NEWS.d/next/Library/2017-10-11-13-05-19.bpo-31728.XrVMME.rst
M Lib/test/test_xml_etree_c.py
M Modules/_elementtree.c

diff --git a/Lib/test/test_xml_etree_c.py b/Lib/test/test_xml_etree_c.py
index e122b3db243..71a755c0a64 100644
--- a/Lib/test/test_xml_etree_c.py
+++ b/Lib/test/test_xml_etree_c.py
@@ -53,6 +53,31 @@ def test_del_attribute(self):
             del element.attrib
         self.assertEqual(element.attrib, {'A': 'B', 'C': 'D'})
 
+    def test_bpo_31728(self):
+        # A crash shouldn't happen in case garbage collection triggers a call
+        # to clear() or a reading of text or tail, while a setter or clear()
+        # is already running.
+        elem = cET.Element('elem')
+        class X:
+            def __del__(self):
+                elem.text
+                elem.tail
+                elem.clear()
+
+        elem.text = X()
+        elem.clear()  # shouldn't crash
+
+        elem.tail = X()
+        elem.clear()  # shouldn't crash
+
+        elem.text = X()
+        elem.text = X()  # shouldn't crash
+        elem.clear()
+
+        elem.tail = X()
+        elem.tail = X()  # shouldn't crash
+        elem.clear()
+
 
 def test_main():
     from test import test_xml_etree, test_xml_etree_c
diff --git a/Misc/NEWS.d/next/Library/2017-10-11-13-05-19.bpo-31728.XrVMME.rst b/Misc/NEWS.d/next/Library/2017-10-11-13-05-19.bpo-31728.XrVMME.rst
new file mode 100644
index 00000000000..b317d9f210b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-11-13-05-19.bpo-31728.XrVMME.rst
@@ -0,0 +1,2 @@
+Prevent crashes in `_elementtree` due to unsafe cleanup of `Element.text`
+and `Element.tail`. Patch by Oren Milman.
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index b52402f3811..574559c6313 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -131,6 +131,15 @@ static PyObject* elementpath_obj;
 
 /* helpers */
 
+/* Py_SETREF for a PyObject* that uses a join flag. */
+Py_LOCAL_INLINE(void)
+_set_joined_ptr(PyObject **p, PyObject *new_joined_ptr)
+{
+    PyObject *tmp = JOIN_OBJ(*p);
+    *p = new_joined_ptr;
+    Py_DECREF(tmp);
+}
+
 LOCAL(PyObject*)
 deepcopy(PyObject* object, PyObject* memo)
 {
@@ -585,12 +594,10 @@ element_clear(ElementObject* self, PyObject* args)
     }
 
     Py_INCREF(Py_None);
-    Py_DECREF(JOIN_OBJ(self->text));
-    self->text = Py_None;
+    _set_joined_ptr(&self->text, Py_None);
 
     Py_INCREF(Py_None);
-    Py_DECREF(JOIN_OBJ(self->tail));
-    self->tail = Py_None;
+    _set_joined_ptr(&self->tail, Py_None);
 
     Py_RETURN_NONE;
 }
@@ -610,13 +617,11 @@ element_copy(ElementObject* self, PyObject* args)
     if (!element)
         return NULL;
 
-    Py_DECREF(JOIN_OBJ(element->text));
-    element->text = self->text;
-    Py_INCREF(JOIN_OBJ(element->text));
+    Py_INCREF(JOIN_OBJ(self->text));
+    _set_joined_ptr(&element->text, self->text);
 
-    Py_DECREF(JOIN_OBJ(element->tail));
-    element->tail = self->tail;
-    Py_INCREF(JOIN_OBJ(element->tail));
+    Py_INCREF(JOIN_OBJ(self->tail));
+    _set_joined_ptr(&element->tail, self->tail);
 
     if (self->extra) {
         
@@ -678,14 +683,12 @@ element_deepcopy(ElementObject* self, PyObject* args)
     text = deepcopy(JOIN_OBJ(self->text), memo);
     if (!text)
         goto error;
-    Py_DECREF(element->text);
-    element->text = JOIN_SET(text, JOIN_GET(self->text));
+    _set_joined_ptr(&element->text, JOIN_SET(text, JOIN_GET(self->text)));
 
     tail = deepcopy(JOIN_OBJ(self->tail), memo);
     if (!tail)
         goto error;
-    Py_DECREF(element->tail);
-    element->tail = JOIN_SET(tail, JOIN_GET(self->tail));
+    _set_joined_ptr(&element->tail, JOIN_SET(tail, JOIN_GET(self->tail)));
 
     if (self->extra) {
         
@@ -1624,13 +1627,11 @@ element_setattr(ElementObject* self, const char* name, PyObject* value)
         Py_INCREF(value);
         Py_SETREF(self->tag, value);
     } else if (strcmp(name, "text") == 0) {
-        Py_DECREF(JOIN_OBJ(self->text));
-        self->text = value;
-        Py_INCREF(self->text);
+        Py_INCREF(value);
+        _set_joined_ptr(&self->text, value);
     } else if (strcmp(name, "tail") == 0) {
-        Py_DECREF(JOIN_OBJ(self->tail));
-        self->tail = value;
-        Py_INCREF(self->tail);
+        Py_INCREF(value);
+        _set_joined_ptr(&self->tail, value);
     } else if (strcmp(name, "attrib") == 0) {
         if (!self->extra)
             element_new_extra(self, NULL);


From webhook-mailer at python.org  Wed Oct 11 09:29:17 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Wed, 11 Oct 2017 13:29:17 -0000
Subject: [Python-checkins] bpo-28157: Improvements for the time module
 documentation (GH-928)
Message-ID: <mailman.19.1507728560.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/703ff381ffa946c23e7e25b0ae93a636a2607a40
commit: 703ff381ffa946c23e7e25b0ae93a636a2607a40
branch: master
author: Cheryl Sabella <cheryl.sabella at gmail.com>
committer: Berker Peksag <berker.peksag at gmail.com>
date: 2017-10-11T16:29:14+03:00
summary:

bpo-28157: Improvements for the time module documentation (GH-928)

* Separated functions and constants descriptions in sections.
* Added a note about the limitations of timezone constants.
* Removed redundant lists from the module docstring.

files:
M Doc/library/time.rst
M Modules/timemodule.c

diff --git a/Doc/library/time.rst b/Doc/library/time.rst
index 179762ed1c8..25a4ab50826 100644
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -118,14 +118,10 @@ An explanation of some terminology and conventions is in order.
   +-------------------------+-------------------------+-------------------------+
 
 
-The module defines the following functions and data items:
-
-.. data:: altzone
-
-   The offset of the local DST timezone, in seconds west of UTC, if one is defined.
-   This is negative if the local DST timezone is east of UTC (as in Western Europe,
-   including the UK).  Only use this if ``daylight`` is nonzero.
+.. _time-functions:
 
+Functions
+---------
 
 .. function:: asctime([t])
 
@@ -181,7 +177,8 @@ The module defines the following functions and data items:
 
 .. function:: clock_getres(clk_id)
 
-   Return the resolution (precision) of the specified clock *clk_id*.
+   Return the resolution (precision) of the specified clock *clk_id*.  Refer to
+   :ref:`time-clock-id-constants` for a list of accepted values for *clk_id*.
 
    Availability: Unix.
 
@@ -190,7 +187,8 @@ The module defines the following functions and data items:
 
 .. function:: clock_gettime(clk_id)
 
-   Return the time of the specified clock *clk_id*.
+   Return the time of the specified clock *clk_id*.  Refer to
+   :ref:`time-clock-id-constants` for a list of accepted values for *clk_id*.
 
    Availability: Unix.
 
@@ -199,66 +197,8 @@ The module defines the following functions and data items:
 
 .. function:: clock_settime(clk_id, time)
 
-   Set the time of the specified clock *clk_id*.
-
-   Availability: Unix.
-
-   .. versionadded:: 3.3
-
-
-.. data:: CLOCK_HIGHRES
-
-   The Solaris OS has a CLOCK_HIGHRES timer that attempts to use an optimal
-   hardware source, and may give close to nanosecond resolution.  CLOCK_HIGHRES
-   is the nonadjustable, high-resolution clock.
-
-   Availability: Solaris.
-
-   .. versionadded:: 3.3
-
-
-.. data:: CLOCK_MONOTONIC
-
-   Clock that cannot be set and represents monotonic time since some unspecified
-   starting point.
-
-   Availability: Unix.
-
-   .. versionadded:: 3.3
-
-
-.. data:: CLOCK_MONOTONIC_RAW
-
-   Similar to :data:`CLOCK_MONOTONIC`, but provides access to a raw
-   hardware-based time that is not subject to NTP adjustments.
-
-   Availability: Linux 2.6.28 or later.
-
-   .. versionadded:: 3.3
-
-
-.. data:: CLOCK_PROCESS_CPUTIME_ID
-
-   High-resolution per-process timer from the CPU.
-
-   Availability: Unix.
-
-   .. versionadded:: 3.3
-
-
-.. data:: CLOCK_REALTIME
-
-   System-wide real-time clock.  Setting this clock requires appropriate
-   privileges.
-
-   Availability: Unix.
-
-   .. versionadded:: 3.3
-
-
-.. data:: CLOCK_THREAD_CPUTIME_ID
-
-   Thread-specific CPU-time clock.
+   Set the time of the specified clock *clk_id*.  Currently,
+   :data:`CLOCK_REALTIME` is the only accepted value for *clk_id*.
 
    Availability: Unix.
 
@@ -273,11 +213,6 @@ The module defines the following functions and data items:
    ``asctime(localtime(secs))``. Locale information is not used by :func:`ctime`.
 
 
-.. data:: daylight
-
-   Nonzero if a DST timezone is defined.
-
-
 .. function:: get_clock_info(name)
 
    Get information on the specified clock as a namespace object.
@@ -295,7 +230,7 @@ The module defines the following functions and data items:
    - *adjustable*: ``True`` if the clock can be changed automatically (e.g. by
      a NTP daemon) or manually by the system administrator, ``False`` otherwise
    - *implementation*: The name of the underlying C function used to get
-     the clock value
+     the clock value.  Refer to :ref:`time-clock-id-constants` for possible values.
    - *monotonic*: ``True`` if the clock cannot go backward,
      ``False`` otherwise
    - *resolution*: The resolution of the clock in seconds (:class:`float`)
@@ -623,18 +558,6 @@ The module defines the following functions and data items:
    :class:`struct_time` object is returned, from which the components
    of the calendar date may be accessed as attributes.
 
-.. data:: timezone
-
-   The offset of the local (non-DST) timezone, in seconds west of UTC (negative in
-   most of Western Europe, positive in the US, zero in the UK).
-
-
-.. data:: tzname
-
-   A tuple of two strings: the first is the name of the local non-DST timezone, the
-   second is the name of the local DST timezone.  If no DST timezone is defined,
-   the second string should not be used.
-
 
 .. function:: tzset()
 
@@ -724,6 +647,111 @@ The module defines the following functions and data items:
       ('EET', 'EEST')
 
 
+.. _time-clock-id-constants:
+
+Clock ID Constants
+------------------
+
+These constants are used as parameters for :func:`clock_getres` and
+:func:`clock_gettime`.
+
+.. data:: CLOCK_HIGHRES
+
+   The Solaris OS has a ``CLOCK_HIGHRES`` timer that attempts to use an optimal
+   hardware source, and may give close to nanosecond resolution.
+   ``CLOCK_HIGHRES`` is the nonadjustable, high-resolution clock.
+
+   Availability: Solaris.
+
+   .. versionadded:: 3.3
+
+
+.. data:: CLOCK_MONOTONIC
+
+   Clock that cannot be set and represents monotonic time since some unspecified
+   starting point.
+
+   Availability: Unix.
+
+   .. versionadded:: 3.3
+
+
+.. data:: CLOCK_MONOTONIC_RAW
+
+   Similar to :data:`CLOCK_MONOTONIC`, but provides access to a raw
+   hardware-based time that is not subject to NTP adjustments.
+
+   Availability: Linux 2.6.28 or later.
+
+   .. versionadded:: 3.3
+
+
+.. data:: CLOCK_PROCESS_CPUTIME_ID
+
+   High-resolution per-process timer from the CPU.
+
+   Availability: Unix.
+
+   .. versionadded:: 3.3
+
+
+.. data:: CLOCK_THREAD_CPUTIME_ID
+
+   Thread-specific CPU-time clock.
+
+   Availability: Unix.
+
+   .. versionadded:: 3.3
+
+
+The following constant is the only parameter that can be sent to
+:func:`clock_settime`.
+
+.. data:: CLOCK_REALTIME
+
+   System-wide real-time clock.  Setting this clock requires appropriate
+   privileges.
+
+   Availability: Unix.
+
+   .. versionadded:: 3.3
+
+
+.. _time-timezone-constants:
+
+Timezone Constants
+-------------------
+
+.. data:: altzone
+
+   The offset of the local DST timezone, in seconds west of UTC, if one is defined.
+   This is negative if the local DST timezone is east of UTC (as in Western Europe,
+   including the UK).  Only use this if ``daylight`` is nonzero.  See note below.
+
+.. data:: daylight
+
+   Nonzero if a DST timezone is defined.  See note below.
+
+.. data:: timezone
+
+   The offset of the local (non-DST) timezone, in seconds west of UTC (negative in
+   most of Western Europe, positive in the US, zero in the UK).  See note below.
+
+.. data:: tzname
+
+   A tuple of two strings: the first is the name of the local non-DST timezone, the
+   second is the name of the local DST timezone.  If no DST timezone is defined,
+   the second string should not be used.  See note below.
+
+.. note::
+
+   For the above Timezone constants (:data:`altzone`, :data:`daylight`, :data:`timezone`,
+   and :data:`tzname`), the value is determined by the timezone rules in effect
+   at module load time or the last time :func:`tzset` is called and may be incorrect
+   for times in the past.  It is recommended to use the :attr:`tm_gmtoff` and
+   :attr:`tm_zone` results from :func:`localtime` to obtain timezone information.
+
+
 .. seealso::
 
    Module :mod:`datetime`
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 31050fb554b..2c0a8d61eda 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -1342,28 +1342,7 @@ The tuple items are:\n\
   DST (Daylight Savings Time) flag (-1, 0 or 1)\n\
 If the DST flag is 0, the time is given in the regular time zone;\n\
 if it is 1, the time is given in the DST time zone;\n\
-if it is -1, mktime() should guess based on the date and time.\n\
-\n\
-Variables:\n\
-\n\
-timezone -- difference in seconds between UTC and local standard time\n\
-altzone -- difference in  seconds between UTC and local DST time\n\
-daylight -- whether local time should reflect DST\n\
-tzname -- tuple of (standard time zone name, DST time zone name)\n\
-\n\
-Functions:\n\
-\n\
-time() -- return current time in seconds since the Epoch as a float\n\
-clock() -- return CPU time since process start as a float\n\
-sleep() -- delay for a number of seconds given as a float\n\
-gmtime() -- convert seconds since Epoch to UTC tuple\n\
-localtime() -- convert seconds since Epoch to local time tuple\n\
-asctime() -- convert time tuple to string\n\
-ctime() -- convert time in seconds to string\n\
-mktime() -- convert local time tuple to seconds since Epoch\n\
-strftime() -- convert time tuple to string according to format specification\n\
-strptime() -- parse string to time tuple according to format specification\n\
-tzset() -- change the local timezone");
+if it is -1, mktime() should guess based on the date and time.\n");
 
 
 


From webhook-mailer at python.org  Wed Oct 11 09:50:23 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Wed, 11 Oct 2017 13:50:23 -0000
Subject: [Python-checkins] [3.6] bpo-28157: Improvements for the time module
 documentation (GH-928)
Message-ID: <mailman.20.1507729824.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/764969a4b9ed7c6d2adbc04269f9b4fa392a1eed
commit: 764969a4b9ed7c6d2adbc04269f9b4fa392a1eed
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Berker Peksag <berker.peksag at gmail.com>
date: 2017-10-11T16:50:21+03:00
summary:

[3.6] bpo-28157: Improvements for the time module documentation (GH-928)

* Separated functions and constants descriptions in sections.
* Added a note about the limitations of timezone constants.
* Removed redundant lists from the module docstring.

(cherry picked from commit 703ff381ffa946c23e7e25b0ae93a636a2607a40)

files:
M Doc/library/time.rst
M Modules/timemodule.c

diff --git a/Doc/library/time.rst b/Doc/library/time.rst
index d2e2ac4410a..0624099f675 100644
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -118,14 +118,10 @@ An explanation of some terminology and conventions is in order.
   +-------------------------+-------------------------+-------------------------+
 
 
-The module defines the following functions and data items:
-
-.. data:: altzone
-
-   The offset of the local DST timezone, in seconds west of UTC, if one is defined.
-   This is negative if the local DST timezone is east of UTC (as in Western Europe,
-   including the UK).  Only use this if ``daylight`` is nonzero.
+.. _time-functions:
 
+Functions
+---------
 
 .. function:: asctime([t])
 
@@ -165,7 +161,8 @@ The module defines the following functions and data items:
 
 .. function:: clock_getres(clk_id)
 
-   Return the resolution (precision) of the specified clock *clk_id*.
+   Return the resolution (precision) of the specified clock *clk_id*.  Refer to
+   :ref:`time-clock-id-constants` for a list of accepted values for *clk_id*.
 
    Availability: Unix.
 
@@ -174,7 +171,8 @@ The module defines the following functions and data items:
 
 .. function:: clock_gettime(clk_id)
 
-   Return the time of the specified clock *clk_id*.
+   Return the time of the specified clock *clk_id*.  Refer to
+   :ref:`time-clock-id-constants` for a list of accepted values for *clk_id*.
 
    Availability: Unix.
 
@@ -183,66 +181,8 @@ The module defines the following functions and data items:
 
 .. function:: clock_settime(clk_id, time)
 
-   Set the time of the specified clock *clk_id*.
-
-   Availability: Unix.
-
-   .. versionadded:: 3.3
-
-
-.. data:: CLOCK_HIGHRES
-
-   The Solaris OS has a CLOCK_HIGHRES timer that attempts to use an optimal
-   hardware source, and may give close to nanosecond resolution.  CLOCK_HIGHRES
-   is the nonadjustable, high-resolution clock.
-
-   Availability: Solaris.
-
-   .. versionadded:: 3.3
-
-
-.. data:: CLOCK_MONOTONIC
-
-   Clock that cannot be set and represents monotonic time since some unspecified
-   starting point.
-
-   Availability: Unix.
-
-   .. versionadded:: 3.3
-
-
-.. data:: CLOCK_MONOTONIC_RAW
-
-   Similar to :data:`CLOCK_MONOTONIC`, but provides access to a raw
-   hardware-based time that is not subject to NTP adjustments.
-
-   Availability: Linux 2.6.28 or later.
-
-   .. versionadded:: 3.3
-
-
-.. data:: CLOCK_PROCESS_CPUTIME_ID
-
-   High-resolution per-process timer from the CPU.
-
-   Availability: Unix.
-
-   .. versionadded:: 3.3
-
-
-.. data:: CLOCK_REALTIME
-
-   System-wide real-time clock.  Setting this clock requires appropriate
-   privileges.
-
-   Availability: Unix.
-
-   .. versionadded:: 3.3
-
-
-.. data:: CLOCK_THREAD_CPUTIME_ID
-
-   Thread-specific CPU-time clock.
+   Set the time of the specified clock *clk_id*.  Currently,
+   :data:`CLOCK_REALTIME` is the only accepted value for *clk_id*.
 
    Availability: Unix.
 
@@ -257,11 +197,6 @@ The module defines the following functions and data items:
    ``asctime(localtime(secs))``. Locale information is not used by :func:`ctime`.
 
 
-.. data:: daylight
-
-   Nonzero if a DST timezone is defined.
-
-
 .. function:: get_clock_info(name)
 
    Get information on the specified clock as a namespace object.
@@ -279,7 +214,7 @@ The module defines the following functions and data items:
    - *adjustable*: ``True`` if the clock can be changed automatically (e.g. by
      a NTP daemon) or manually by the system administrator, ``False`` otherwise
    - *implementation*: The name of the underlying C function used to get
-     the clock value
+     the clock value.  Refer to :ref:`time-clock-id-constants` for possible values.
    - *monotonic*: ``True`` if the clock cannot go backward,
      ``False`` otherwise
    - *resolution*: The resolution of the clock in seconds (:class:`float`)
@@ -607,18 +542,6 @@ The module defines the following functions and data items:
    :class:`struct_time` object is returned, from which the components
    of the calendar date may be accessed as attributes.
 
-.. data:: timezone
-
-   The offset of the local (non-DST) timezone, in seconds west of UTC (negative in
-   most of Western Europe, positive in the US, zero in the UK).
-
-
-.. data:: tzname
-
-   A tuple of two strings: the first is the name of the local non-DST timezone, the
-   second is the name of the local DST timezone.  If no DST timezone is defined,
-   the second string should not be used.
-
 
 .. function:: tzset()
 
@@ -703,6 +626,111 @@ The module defines the following functions and data items:
       ('EET', 'EEST')
 
 
+.. _time-clock-id-constants:
+
+Clock ID Constants
+------------------
+
+These constants are used as parameters for :func:`clock_getres` and
+:func:`clock_gettime`.
+
+.. data:: CLOCK_HIGHRES
+
+   The Solaris OS has a ``CLOCK_HIGHRES`` timer that attempts to use an optimal
+   hardware source, and may give close to nanosecond resolution.
+   ``CLOCK_HIGHRES`` is the nonadjustable, high-resolution clock.
+
+   Availability: Solaris.
+
+   .. versionadded:: 3.3
+
+
+.. data:: CLOCK_MONOTONIC
+
+   Clock that cannot be set and represents monotonic time since some unspecified
+   starting point.
+
+   Availability: Unix.
+
+   .. versionadded:: 3.3
+
+
+.. data:: CLOCK_MONOTONIC_RAW
+
+   Similar to :data:`CLOCK_MONOTONIC`, but provides access to a raw
+   hardware-based time that is not subject to NTP adjustments.
+
+   Availability: Linux 2.6.28 or later.
+
+   .. versionadded:: 3.3
+
+
+.. data:: CLOCK_PROCESS_CPUTIME_ID
+
+   High-resolution per-process timer from the CPU.
+
+   Availability: Unix.
+
+   .. versionadded:: 3.3
+
+
+.. data:: CLOCK_THREAD_CPUTIME_ID
+
+   Thread-specific CPU-time clock.
+
+   Availability: Unix.
+
+   .. versionadded:: 3.3
+
+
+The following constant is the only parameter that can be sent to
+:func:`clock_settime`.
+
+.. data:: CLOCK_REALTIME
+
+   System-wide real-time clock.  Setting this clock requires appropriate
+   privileges.
+
+   Availability: Unix.
+
+   .. versionadded:: 3.3
+
+
+.. _time-timezone-constants:
+
+Timezone Constants
+-------------------
+
+.. data:: altzone
+
+   The offset of the local DST timezone, in seconds west of UTC, if one is defined.
+   This is negative if the local DST timezone is east of UTC (as in Western Europe,
+   including the UK).  Only use this if ``daylight`` is nonzero.  See note below.
+
+.. data:: daylight
+
+   Nonzero if a DST timezone is defined.  See note below.
+
+.. data:: timezone
+
+   The offset of the local (non-DST) timezone, in seconds west of UTC (negative in
+   most of Western Europe, positive in the US, zero in the UK).  See note below.
+
+.. data:: tzname
+
+   A tuple of two strings: the first is the name of the local non-DST timezone, the
+   second is the name of the local DST timezone.  If no DST timezone is defined,
+   the second string should not be used.  See note below.
+
+.. note::
+
+   For the above Timezone constants (:data:`altzone`, :data:`daylight`, :data:`timezone`,
+   and :data:`tzname`), the value is determined by the timezone rules in effect
+   at module load time or the last time :func:`tzset` is called and may be incorrect
+   for times in the past.  It is recommended to use the :attr:`tm_gmtoff` and
+   :attr:`tm_zone` results from :func:`localtime` to obtain timezone information.
+
+
 .. seealso::
 
    Module :mod:`datetime`
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index d6c34b9225c..0abe569f137 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -1316,28 +1316,7 @@ The tuple items are:\n\
   DST (Daylight Savings Time) flag (-1, 0 or 1)\n\
 If the DST flag is 0, the time is given in the regular time zone;\n\
 if it is 1, the time is given in the DST time zone;\n\
-if it is -1, mktime() should guess based on the date and time.\n\
-\n\
-Variables:\n\
-\n\
-timezone -- difference in seconds between UTC and local standard time\n\
-altzone -- difference in  seconds between UTC and local DST time\n\
-daylight -- whether local time should reflect DST\n\
-tzname -- tuple of (standard time zone name, DST time zone name)\n\
-\n\
-Functions:\n\
-\n\
-time() -- return current time in seconds since the Epoch as a float\n\
-clock() -- return CPU time since process start as a float\n\
-sleep() -- delay for a number of seconds given as a float\n\
-gmtime() -- convert seconds since Epoch to UTC tuple\n\
-localtime() -- convert seconds since Epoch to local time tuple\n\
-asctime() -- convert time tuple to string\n\
-ctime() -- convert time in seconds to string\n\
-mktime() -- convert local time tuple to seconds since Epoch\n\
-strftime() -- convert time tuple to string according to format specification\n\
-strptime() -- parse string to time tuple according to format specification\n\
-tzset() -- change the local timezone");
+if it is -1, mktime() should guess based on the date and time.\n");
 
 
 


From webhook-mailer at python.org  Wed Oct 11 10:10:06 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Wed, 11 Oct 2017 14:10:06 -0000
Subject: [Python-checkins] bpo-28647: Update -u documentation (GH-3954)
Message-ID: <mailman.21.1507731008.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/5f908005ce16b06d5af7b413264009c4b062f33c
commit: 5f908005ce16b06d5af7b413264009c4b062f33c
branch: 3.6
author: Berker Peksag <berker.peksag at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-11T17:09:57+03:00
summary:

bpo-28647: Update -u documentation (GH-3954)

* stdout and stderr are always opened in text mode
* and they are line-buffered

Initial patch by Gareth Rees.

files:
M Modules/main.c

diff --git a/Modules/main.c b/Modules/main.c
index 475a2fdc36d..bcb992feab7 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -71,9 +71,9 @@ static const char usage_2[] = "\
 -S     : don't imply 'import site' on initialization\n\
 ";
 static const char usage_3[] = "\
--u     : unbuffered binary stdout and stderr, stdin always buffered;\n\
+-u     : force the binary I/O layers of stdout and stderr to be unbuffered;\n\
+         stdin is always buffered; text I/O layer will be line-buffered;\n\
          also PYTHONUNBUFFERED=x\n\
-         see man page for details on internal buffering relating to '-u'\n\
 -v     : verbose (trace import statements); also PYTHONVERBOSE=x\n\
          can be supplied multiple times to increase verbosity\n\
 -V     : print the Python version number and exit (also --version)\n\


From webhook-mailer at python.org  Wed Oct 11 11:11:41 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 11 Oct 2017 15:11:41 -0000
Subject: [Python-checkins] Cleanup pytime.c (#3955)
Message-ID: <mailman.22.1507734702.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/277c84067ff5dfa271725ee9da1a9d75a7c0bcd8
commit: 277c84067ff5dfa271725ee9da1a9d75a7c0bcd8
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-11T08:11:38-07:00
summary:

Cleanup pytime.c (#3955)

* Move _PyTime_overflow() at the top
* Move assertion on numerator into _PyTime_ObjectToDenominator()
* PEP 7: add { ... } to if blocks

files:
M Python/pytime.c

diff --git a/Python/pytime.c b/Python/pytime.c
index bda6d8bb912..dbf1dda4a0e 100644
--- a/Python/pytime.c
+++ b/Python/pytime.c
@@ -35,6 +35,13 @@ error_time_t_overflow(void)
                     "timestamp out of range for platform time_t");
 }
 
+static void
+_PyTime_overflow(void)
+{
+    PyErr_SetString(PyExc_OverflowError,
+                    "timestamp too large to convert to C _PyTime_t");
+}
+
 time_t
 _PyLong_AsTime_t(PyObject *obj)
 {
@@ -47,8 +54,9 @@ _PyLong_AsTime_t(PyObject *obj)
     val = PyLong_AsLong(obj);
 #endif
     if (val == -1 && PyErr_Occurred()) {
-        if (PyErr_ExceptionMatches(PyExc_OverflowError))
+        if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
             error_time_t_overflow();
+        }
         return -1;
     }
     return (time_t)val;
@@ -71,9 +79,10 @@ static double
 _PyTime_RoundHalfEven(double x)
 {
     double rounded = round(x);
-    if (fabs(x-rounded) == 0.5)
+    if (fabs(x-rounded) == 0.5) {
         /* halfway case: round to even */
         rounded = 2.0*round(x/2.0);
+    }
     return rounded;
 }
 
@@ -84,19 +93,23 @@ _PyTime_Round(double x, _PyTime_round_t round)
     volatile double d;
 
     d = x;
-    if (round == _PyTime_ROUND_HALF_EVEN)
+    if (round == _PyTime_ROUND_HALF_EVEN) {
         d = _PyTime_RoundHalfEven(d);
-    else if (round == _PyTime_ROUND_CEILING)
+    }
+    else if (round == _PyTime_ROUND_CEILING) {
         d = ceil(d);
-    else
+    }
+    else {
         d = floor(d);
+    }
     return d;
 }
 
 static int
 _PyTime_DoubleToDenominator(double d, time_t *sec, long *numerator,
-                            double denominator, _PyTime_round_t round)
+                            long idenominator, _PyTime_round_t round)
 {
+    double denominator = (double)idenominator;
     double intpart;
     /* volatile avoids optimization changing how numbers are rounded */
     volatile double floatpart;
@@ -121,15 +134,15 @@ _PyTime_DoubleToDenominator(double d, time_t *sec, long *numerator,
     }
     *sec = (time_t)intpart;
     *numerator = (long)floatpart;
-
+    assert(0 <= *numerator && *numerator < idenominator);
     return 0;
 }
 
 static int
 _PyTime_ObjectToDenominator(PyObject *obj, time_t *sec, long *numerator,
-                            double denominator, _PyTime_round_t round)
+                            long denominator, _PyTime_round_t round)
 {
-    assert(denominator <= (double)LONG_MAX);
+    assert(denominator >= 1);
 
     if (PyFloat_Check(obj)) {
         double d = PyFloat_AsDouble(obj);
@@ -144,8 +157,9 @@ _PyTime_ObjectToDenominator(PyObject *obj, time_t *sec, long *numerator,
     else {
         *sec = _PyLong_AsTime_t(obj);
         *numerator = 0;
-        if (*sec == (time_t)-1 && PyErr_Occurred())
+        if (*sec == (time_t)-1 && PyErr_Occurred()) {
             return -1;
+        }
         return 0;
     }
 }
@@ -176,8 +190,9 @@ _PyTime_ObjectToTime_t(PyObject *obj, time_t *sec, _PyTime_round_t round)
     }
     else {
         *sec = _PyLong_AsTime_t(obj);
-        if (*sec == (time_t)-1 && PyErr_Occurred())
+        if (*sec == (time_t)-1 && PyErr_Occurred()) {
             return -1;
+        }
         return 0;
     }
 }
@@ -186,43 +201,27 @@ int
 _PyTime_ObjectToTimespec(PyObject *obj, time_t *sec, long *nsec,
                          _PyTime_round_t round)
 {
-    int res;
-    res = _PyTime_ObjectToDenominator(obj, sec, nsec, 1e9, round);
-    if (res == 0) {
-        assert(0 <= *nsec && *nsec < SEC_TO_NS);
-    }
-    return res;
+    return _PyTime_ObjectToDenominator(obj, sec, nsec, SEC_TO_NS, round);
 }
 
 int
 _PyTime_ObjectToTimeval(PyObject *obj, time_t *sec, long *usec,
                         _PyTime_round_t round)
 {
-    int res;
-    res = _PyTime_ObjectToDenominator(obj, sec, usec, 1e6, round);
-    if (res == 0) {
-        assert(0 <= *usec && *usec < SEC_TO_US);
-    }
-    return res;
-}
-
-static void
-_PyTime_overflow(void)
-{
-    PyErr_SetString(PyExc_OverflowError,
-                    "timestamp too large to convert to C _PyTime_t");
+    return _PyTime_ObjectToDenominator(obj, sec, usec, SEC_TO_US, round);
 }
 
 _PyTime_t
 _PyTime_FromSeconds(int seconds)
 {
     _PyTime_t t;
-    t = (_PyTime_t)seconds;
     /* ensure that integer overflow cannot happen, int type should have 32
        bits, whereas _PyTime_t type has at least 64 bits (SEC_TO_MS takes 30
        bits). */
     Py_BUILD_ASSERT(INT_MAX <= _PyTime_MAX / SEC_TO_NS);
     Py_BUILD_ASSERT(INT_MIN >= _PyTime_MIN / SEC_TO_NS);
+
+    t = (_PyTime_t)seconds;
     assert((t >= 0 && t <= _PyTime_MAX / SEC_TO_NS)
            || (t < 0 && t >= _PyTime_MIN / SEC_TO_NS));
     t *= SEC_TO_NS;
@@ -249,8 +248,9 @@ _PyTime_FromTimespec(_PyTime_t *tp, struct timespec *ts, int raise)
     t = (_PyTime_t)ts->tv_sec;
 
     if (_PyTime_check_mul_overflow(t, SEC_TO_NS)) {
-        if (raise)
+        if (raise) {
             _PyTime_overflow();
+        }
         res = -1;
     }
     t = t * SEC_TO_NS;
@@ -271,8 +271,9 @@ _PyTime_FromTimeval(_PyTime_t *tp, struct timeval *tv, int raise)
     t = (_PyTime_t)tv->tv_sec;
 
     if (_PyTime_check_mul_overflow(t, SEC_TO_NS)) {
-        if (raise)
+        if (raise) {
             _PyTime_overflow();
+        }
         res = -1;
     }
     t = t * SEC_TO_NS;
@@ -323,8 +324,9 @@ _PyTime_FromObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round,
 
         sec = PyLong_AsLongLong(obj);
         if (sec == -1 && PyErr_Occurred()) {
-            if (PyErr_ExceptionMatches(PyExc_OverflowError))
+            if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
                 _PyTime_overflow();
+            }
             return -1;
         }
 
@@ -387,24 +389,30 @@ _PyTime_Divide(const _PyTime_t t, const _PyTime_t k,
         r = t % k;
         abs_r = Py_ABS(r);
         if (abs_r > k / 2 || (abs_r == k / 2 && (Py_ABS(x) & 1))) {
-            if (t >= 0)
+            if (t >= 0) {
                 x++;
-            else
+            }
+            else {
                 x--;
+            }
         }
         return x;
     }
     else if (round == _PyTime_ROUND_CEILING) {
-        if (t >= 0)
+        if (t >= 0) {
             return (t + k - 1) / k;
-        else
+        }
+        else {
             return t / k;
+        }
     }
     else {
-        if (t >= 0)
+        if (t >= 0) {
             return t / k;
-        else
+        }
+        else {
             return (t - (k - 1)) / k;
+        }
     }
 }
 
@@ -434,17 +442,21 @@ _PyTime_AsTimeval_impl(_PyTime_t t, _PyTime_t *p_secs, int *p_us,
     usec = (int)_PyTime_Divide(ns, US_TO_NS, round);
     if (usec < 0) {
         usec += SEC_TO_US;
-        if (secs != _PyTime_MIN)
+        if (secs != _PyTime_MIN) {
             secs -= 1;
-        else
+        }
+        else {
             res = -1;
+        }
     }
     else if (usec >= SEC_TO_US) {
         usec -= SEC_TO_US;
-        if (secs != _PyTime_MAX)
+        if (secs != _PyTime_MAX) {
             secs += 1;
-        else
+        }
+        else {
             res = -1;
+        }
     }
     assert(0 <= usec && usec < SEC_TO_US);
 
@@ -473,8 +485,9 @@ _PyTime_AsTimevalStruct_impl(_PyTime_t t, struct timeval *tv,
 
     secs2 = (_PyTime_t)tv->tv_sec;
     if (res < 0 || secs2 != secs) {
-        if (raise)
+        if (raise) {
             error_time_t_overflow();
+        }
         return -1;
     }
     return 0;
@@ -580,22 +593,26 @@ pygettimeofday(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
 #ifdef HAVE_CLOCK_GETTIME
     err = clock_gettime(CLOCK_REALTIME, &ts);
     if (err) {
-        if (raise)
+        if (raise) {
             PyErr_SetFromErrno(PyExc_OSError);
+        }
         return -1;
     }
-    if (_PyTime_FromTimespec(tp, &ts, raise) < 0)
+    if (_PyTime_FromTimespec(tp, &ts, raise) < 0) {
         return -1;
+    }
 
     if (info) {
         struct timespec res;
         info->implementation = "clock_gettime(CLOCK_REALTIME)";
         info->monotonic = 0;
         info->adjustable = 1;
-        if (clock_getres(CLOCK_REALTIME, &res) == 0)
+        if (clock_getres(CLOCK_REALTIME, &res) == 0) {
             info->resolution = res.tv_sec + res.tv_nsec * 1e-9;
-        else
+        }
+        else {
             info->resolution = 1e-9;
+        }
     }
 #else   /* HAVE_CLOCK_GETTIME */
 
@@ -606,12 +623,14 @@ pygettimeofday(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
     err = gettimeofday(&tv, (struct timezone *)NULL);
 #endif
     if (err) {
-        if (raise)
+        if (raise) {
             PyErr_SetFromErrno(PyExc_OSError);
+        }
         return -1;
     }
-    if (_PyTime_FromTimeval(tp, &tv, raise) < 0)
+    if (_PyTime_FromTimeval(tp, &tv, raise) < 0) {
         return -1;
+    }
 
     if (info) {
         info->implementation = "gettimeofday()";
@@ -755,8 +774,9 @@ pymonotonic(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
         }
         info->resolution = res.tv_sec + res.tv_nsec * 1e-9;
     }
-    if (_PyTime_FromTimespec(tp, &ts, raise) < 0)
+    if (_PyTime_FromTimespec(tp, &ts, raise) < 0) {
         return -1;
+    }
 #endif
     return 0;
 }
@@ -872,8 +892,9 @@ _PyTime_localtime(time_t t, struct tm *tm)
 #else /* !MS_WINDOWS */
     if (localtime_r(&t, tm) == NULL) {
 #ifdef EINVAL
-        if (errno == 0)
+        if (errno == 0) {
             errno = EINVAL;
+        }
 #endif
         PyErr_SetFromErrno(PyExc_OSError);
         return -1;
@@ -898,8 +919,9 @@ _PyTime_gmtime(time_t t, struct tm *tm)
 #else /* !MS_WINDOWS */
     if (gmtime_r(&t, tm) == NULL) {
 #ifdef EINVAL
-        if (errno == 0)
+        if (errno == 0) {
             errno = EINVAL;
+        }
 #endif
         PyErr_SetFromErrno(PyExc_OSError);
         return -1;


From lp_benchmark_robot at intel.com  Wed Oct 11 13:25:13 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Wed, 11 Oct 2017 10:25:13 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-10-11
Message-ID: <e2e1e288-075e-4744-9443-9dbf661e1836@orsmsx108.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-11 03:02:59-07:00.
  - commit:		eeb5ffd
  - previous commit:	a997c7b
  - revision date:	2017-10-10 14:52:58-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.213% |  -0.198%   |  +5.447%   |  +7.758%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 0.702% |  -0.017%   |  +16.772%  |  +18.033%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 0.485% |  -0.139%   |  +17.718%  |  +18.396%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.508% |  -0.047%   |  +17.333%  |  +16.197%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 1.999% |  -0.032%   |  +0.711%   |  +16.304%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 2.227% |  -0.078%   |  +10.936%  |  +6.944%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.598% |  +0.357%   |  +8.249%   |  +10.377%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.802% |  +0.122%   |  +1.996%   |  +8.635%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.414% |  +0.676%   |  +5.963%   |  +19.941%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 2.742% |  +1.139%   |  +10.898%  |  +12.402%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.374% |  +0.437%   |  +4.850%   |  +6.004%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.278% |  +0.218%   |  +6.856%   |  +3.284%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.906% |  -0.180%   |  +3.743%   |  +6.655%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.149% |  -0.118%   |  +8.874%   |  +9.670%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.704% |  +1.097%   |  +7.778%   |  +8.389%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.718% |  +0.151%   |  +6.532%   |  +10.740%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 1.464% |  -0.049%   |  +9.048%   |  +11.333%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 2.924% |  +0.488%   |  +9.941%   |  +8.536%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.076% |  +0.047%   |  +3.996%   |  +7.785%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 5.849% |  +0.412%   |  +1.282%   |  +11.534%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.464% |  +1.017%   |  +9.942%   |  +9.562%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.566% |  -0.030%   |  +46.450%  |  +12.891%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.469% |  +0.835%   |  +10.329%  |  +11.081%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.438% |  -0.060%   |  +17.571%  |  +11.385%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 1.969% |  +0.032%   |  +7.273%   |  +10.497%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.078% |  -0.093%   |  +2.454%   |  +6.925%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.750% |  +0.194%   |  -1.462%   |  +2.716%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.585% |  +0.424%   |  +2.744%   |  +6.773%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.115% |  +0.119%   |  +5.935%   |  +8.545%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.974% |  -0.891%   |  -0.658%   |  +21.926%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.235% |  +0.510%   |  +3.788%   |  +19.272%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.695% |  +0.067%   |  +5.661%   |  +15.983%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 4.124% |  -0.828%   |  +12.015%  |  +8.036%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.134% |  +0.115%   |  +0.490%   |  +10.005%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.122% |  +0.087%   |  +11.226%  |  +4.370%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.090% |  +0.096%   |  +2.586%   |  +4.591%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 0.849% |  +0.195%   |  +10.336%  |  +12.570%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.484% |  -0.587%   |  +2.212%   |  +12.273%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.320% |  +0.200%   |  +1.825%   |  +8.377%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.207% |  -0.042%   |  -0.057%   |  +1.835%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 2.372% |  -0.703%   |  +8.982%   |  +3.708%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.625% |  +0.054%   |  +7.831%   |  +13.607%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.945% |  -0.031%   |  +2.758%   |  +2.024%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.555% |  +0.384%   |  +26.598%  |  +8.912%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.203% |  +0.368%   |  +4.579%   |  +6.215%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 1.563% |  +0.124%   |  +15.100%  |  +9.876%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 2.198% |  +1.033%   |  +3.712%   |  -3.694%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 1.151% |  +0.294%   |  +6.058%   |  +2.962%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.173% |  +0.037%   |  +7.207%   |  +7.898%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.930% |  +0.425%   |  +6.194%   |  +5.512%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 5.358% |  -0.333%   |  +20.225%  |  +6.409%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.984% |  -0.359%   |  +11.652%  |  +8.309%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 2.050% |  -0.097%   |  +10.034%  |  +6.785%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.737% |  +0.339%   |  +11.663%  |  +9.078%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.707% |  +1.025%   |  +12.618%  |  +10.567%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 6.396% |  -0.378%   |  +23.473%  |  +8.434%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.156% |  -0.260%   |  +6.188%   |  +6.679%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.712% |  -0.466%   |  +2.120%   |  -0.136%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 5.728% |  -0.102%   |  +9.635%   |  +18.801%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 1.482% |  -0.318%   |  +0.572%   |  +17.863%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 3.904% |  -0.235%   |  +6.545%   |  +7.569%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 0.977% |  +0.185%   |  +6.530%   |  +6.750%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 3.234% |  -1.065%   |  +0.898%   |  +7.598%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 4.626% |  -0.741%   |  -9.529%   |  +12.656%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 2.330% |  +0.139%   |  +5.715%   |  +8.706%   |
+-----+------------------------+--------+------------+------------+------------+

* 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-10-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  Thu Oct 12 05:07:03 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 12 Oct 2017 09:07:03 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=4
Message-ID: <20171012090703.95114.4FBCD9D983C83020@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/reflogEURApp', '--timeout', '7200']

From webhook-mailer at python.org  Thu Oct 12 10:39:04 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 12 Oct 2017 14:39:04 -0000
Subject: [Python-checkins] [2.7] bpo-31490: Fix an assertion failure in
 ctypes in case an _anonymous_ attr is defined only outside _fields_.
 (GH-3615) (#3952)
Message-ID: <mailman.23.1507819146.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/fb3bb8d5d5d70acaaa0fdec15c137544fdd4463f
commit: fb3bb8d5d5d70acaaa0fdec15c137544fdd4463f
branch: 2.7
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-12T17:39:01+03:00
summary:

[2.7] bpo-31490: Fix an assertion failure in ctypes in case an _anonymous_ attr is defined only outside _fields_. (GH-3615) (#3952)

files:
M Modules/_ctypes/stgdict.c

diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c
index 42182431017..d1be3ca93e5 100644
--- a/Modules/_ctypes/stgdict.c
+++ b/Modules/_ctypes/stgdict.c
@@ -288,9 +288,9 @@ MakeAnonFields(PyObject *type)
         }
         if (Py_TYPE(descr) != &PyCField_Type) {
             PyErr_Format(PyExc_AttributeError,
-                         "'%U' is specified in _anonymous_ but not in "
-                         "_fields_",
-                         fname);
+                         "an item in _anonymous_ (index %zd) is not "
+                         "specified in _fields_",
+                         i);
             Py_DECREF(anon_names);
             Py_DECREF(descr);
             return -1;


From webhook-mailer at python.org  Thu Oct 12 10:39:46 2017
From: webhook-mailer at python.org (=?utf-8?q?=C3=89ric?= Araujo)
Date: Thu, 12 Oct 2017 14:39:46 -0000
Subject: [Python-checkins] bpo-31567: add or fix decorator markup in docs
 (#3959)
Message-ID: <mailman.24.1507819189.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/0e61e67a57deb4abc677808201d7cf3c38138e02
commit: 0e61e67a57deb4abc677808201d7cf3c38138e02
branch: master
author: Daisuke Miyakawa <d.miyakawa at gmail.com>
committer: ?ric Araujo <merwok at users.noreply.github.com>
date: 2017-10-12T10:39:43-04:00
summary:

bpo-31567: add or fix decorator markup in docs (#3959)

files:
M Doc/library/abc.rst
M Doc/library/functions.rst
M Doc/library/functools.rst
M Doc/library/test.rst

diff --git a/Doc/library/abc.rst b/Doc/library/abc.rst
index 6001db32df4..9522dd62049 100644
--- a/Doc/library/abc.rst
+++ b/Doc/library/abc.rst
@@ -278,7 +278,7 @@ The :mod:`abc` module also provides the following decorators:
        :func:`abstractmethod`, making this decorator redundant.
 
 
-.. decorator:: abstractproperty(fget=None, fset=None, fdel=None, doc=None)
+.. decorator:: abstractproperty
 
    A subclass of the built-in :func:`property`, indicating an abstract
    property.
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 08093e61fe5..eed67301c04 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -196,9 +196,9 @@ are always available.  They are listed here in alphabetical order.
    base 16).  :exc:`ValueError` will be raised if *i* is outside that range.
 
 
-.. function:: classmethod(function)
+.. decorator:: classmethod
 
-   Return a class method for *function*.
+   Transform a method into a class method.
 
    A class method receives the class as implicit first argument, just like an
    instance method receives the instance. To declare a class method, use this
@@ -1398,9 +1398,9 @@ are always available.  They are listed here in alphabetical order.
 
    For sorting examples and a brief sorting tutorial, see :ref:`sortinghowto`.
 
-.. function:: staticmethod(function)
+.. decorator:: staticmethod
 
-   Return a static method for *function*.
+   Transform a method into a static method.
 
    A static method does not receive an implicit first argument. To declare a static
    method, use this idiom::
diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst
index 9a8defee546..28062c11890 100644
--- a/Doc/library/functools.rst
+++ b/Doc/library/functools.rst
@@ -264,9 +264,9 @@ The :mod:`functools` module defines the following functions:
           return value
 
 
-.. decorator:: singledispatch(default)
+.. decorator:: singledispatch
 
-   Transforms a function into a :term:`single-dispatch <single
+   Transform a function into a :term:`single-dispatch <single
    dispatch>` :term:`generic function`.
 
    To define a generic function, decorate it with the ``@singledispatch``
diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index 33978e331b6..01ba1ec7062 100644
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -440,7 +440,7 @@ The :mod:`test.support` module defines the following functions:
    otherwise.
 
 
-.. decorator:: skip_unless_symlink()
+.. decorator:: skip_unless_symlink
 
    A decorator for running tests that require support for symbolic links.
 


From webhook-mailer at python.org  Thu Oct 12 11:51:58 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 12 Oct 2017 15:51:58 -0000
Subject: [Python-checkins] bpo-31773: time.perf_counter() uses again double
 (GH-3964)
Message-ID: <mailman.25.1507823521.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/cba9a0c6def70549046f1afa6a80e38fe706520e
commit: cba9a0c6def70549046f1afa6a80e38fe706520e
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-12T08:51:56-07:00
summary:

bpo-31773: time.perf_counter() uses again double (GH-3964)

time.clock() and time.perf_counter() now use again C double
internally.

Remove also _PyTime_GetWinPerfCounterWithInfo(): use
_PyTime_GetPerfCounterDoubleWithInfo() instead on Windows.

files:
M Include/pytime.h
M Modules/timemodule.c
M Python/import.c
M Python/pytime.c

diff --git a/Include/pytime.h b/Include/pytime.h
index 95d482fee3b..fd95045519d 100644
--- a/Include/pytime.h
+++ b/Include/pytime.h
@@ -192,20 +192,21 @@ PyAPI_FUNC(int) _PyTime_localtime(time_t t, struct tm *tm);
    Return 0 on success, raise an exception and return -1 on error. */
 PyAPI_FUNC(int) _PyTime_gmtime(time_t t, struct tm *tm);
 
-#ifdef MS_WINDOWS
-PyAPI_FUNC(int) _PyTime_GetWinPerfCounterWithInfo(
-    _PyTime_t *t,
-    _Py_clock_info_t *info);
-#endif
+/* Get the performance counter: clock with the highest available resolution to
+   measure a short duration.
+
+   The function cannot fail. _PyTime_Init() ensures that the system clock
+   works. */
+PyAPI_FUNC(double) _PyTime_GetPerfCounterDouble(void);
 
 /* Get the performance counter: clock with the highest available resolution to
-   measure a short duration. */
-PyAPI_FUNC(_PyTime_t) _PyTime_GetPerfCounter(void);
+   measure a short duration.
 
-/* Similar to _PyTime_GetPerfCounter(),
-   but get also clock info if info is non-NULL. */
-PyAPI_FUNC(int) _PyTime_GetPerfCounterWithInfo(
-    _PyTime_t *t,
+   Fill info (if set) with information of the function used to get the time.
+
+   Return 0 on success, raise an exception and return -1 on error. */
+PyAPI_FUNC(int) _PyTime_GetPerfCounterDoubleWithInfo(
+    double *t,
     _Py_clock_info_t *info);
 
 #ifdef __cplusplus
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 2c0a8d61eda..3cb1b4ec0b6 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -88,19 +88,23 @@ floatclock(_Py_clock_info_t *info)
 }
 #endif /* HAVE_CLOCK */
 
+static PyObject*
+perf_counter(_Py_clock_info_t *info)
+{
+    double t;
+    if (_PyTime_GetPerfCounterDoubleWithInfo(&t, info) < 0) {
+        return NULL;
+    }
+    return PyFloat_FromDouble(t);
+}
+
 #if defined(MS_WINDOWS) || defined(HAVE_CLOCK)
 #define PYCLOCK
 static PyObject*
 pyclock(_Py_clock_info_t *info)
 {
 #ifdef MS_WINDOWS
-    /* Win32 has better clock replacement; we have our own version, due to Mark
-       Hammond and Tim Peters */
-    _PyTime_t t;
-    if (_PyTime_GetWinPerfCounterWithInfo(&t, info) < 0) {
-        return NULL;
-    }
-    return _PyFloat_FromPyTime(t);
+    return perf_counter(info);
 #else
     return floatclock(info);
 #endif
@@ -936,16 +940,6 @@ PyDoc_STRVAR(monotonic_doc,
 \n\
 Monotonic clock, cannot go backward.");
 
-static PyObject*
-perf_counter(_Py_clock_info_t *info)
-{
-    _PyTime_t t;
-    if (_PyTime_GetPerfCounterWithInfo(&t, info) < 0) {
-        return NULL;
-    }
-    return _PyFloat_FromPyTime(t);
-}
-
 static PyObject *
 time_perf_counter(PyObject *self, PyObject *unused)
 {
diff --git a/Python/import.c b/Python/import.c
index d396b4de793..76aa912dc86 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1669,10 +1669,10 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals,
     else {
         static int ximporttime = 0;
         static int import_level;
-        static _PyTime_t accumulated;
+        static double accumulated;
         _Py_IDENTIFIER(importtime);
 
-        _PyTime_t t1 = 0, accumulated_copy = accumulated;
+        double t1 = 0, accumulated_copy = accumulated;
 
         Py_XDECREF(mod);
 
@@ -1695,7 +1695,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals,
 
         if (ximporttime) {
             import_level++;
-            t1 = _PyTime_GetPerfCounter();
+            t1 = _PyTime_GetPerfCounterDouble();
             accumulated = 0;
         }
 
@@ -1711,12 +1711,12 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals,
                                            mod != NULL);
 
         if (ximporttime) {
-            _PyTime_t cum = _PyTime_GetPerfCounter() - t1;
+            double cum = _PyTime_GetPerfCounterDouble() - t1;
 
             import_level--;
             fprintf(stderr, "import time: %9ld | %10ld | %*s%s\n",
-                    (long)_PyTime_AsMicroseconds(cum - accumulated, _PyTime_ROUND_CEILING),
-                    (long)_PyTime_AsMicroseconds(cum, _PyTime_ROUND_CEILING),
+                    (long)ceil((cum - accumulated) * 1e6),
+                    (long)ceil(cum * 1e6),
                     import_level*2, "", PyUnicode_AsUTF8(abs_name));
 
             accumulated = accumulated_copy + cum;
diff --git a/Python/pytime.c b/Python/pytime.c
index dbf1dda4a0e..7fd2a90f3bd 100644
--- a/Python/pytime.c
+++ b/Python/pytime.c
@@ -801,8 +801,8 @@ _PyTime_GetMonotonicClockWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
 
 
 #ifdef MS_WINDOWS
-int
-_PyTime_GetWinPerfCounterWithInfo(_PyTime_t *t, _Py_clock_info_t *info)
+static int
+win_perf_counter(double *tp, _Py_clock_info_t *info)
 {
     static LONGLONG cpu_frequency = 0;
     static LONGLONG ctrStart;
@@ -829,28 +829,33 @@ _PyTime_GetWinPerfCounterWithInfo(_PyTime_t *t, _Py_clock_info_t *info)
     }
 
     diff = diff / (double)cpu_frequency;
-    return _PyTime_FromDouble(t, diff, _PyTime_ROUND_FLOOR, SEC_TO_NS);
+    *tp = diff;
+    return 0;
 }
 #endif
 
 
 int
-_PyTime_GetPerfCounterWithInfo(_PyTime_t *t, _Py_clock_info_t *info)
+_PyTime_GetPerfCounterDoubleWithInfo(double *d, _Py_clock_info_t *info)
 {
 #ifdef MS_WINDOWS
-    return _PyTime_GetWinPerfCounterWithInfo(t, info);
+    return win_perf_counter(d, info);
 #else
-    return _PyTime_GetMonotonicClockWithInfo(t, info);
+    _PyTime_t t;
+    if (_PyTime_GetMonotonicClockWithInfo(&t, info) < 0) {
+        return -1;
+    }
+    *d = _PyTime_AsSecondsDouble(t);
+    return 0;
 #endif
 }
 
 
-_PyTime_t
-_PyTime_GetPerfCounter(void)
+double
+_PyTime_GetPerfCounterDouble(void)
 {
-    _PyTime_t t;
-    if (_PyTime_GetPerfCounterWithInfo(&t, NULL) < 0) {
-        /* should not happen, _PyTime_Init() checked the clock at startup */
+    double t;
+    if (_PyTime_GetPerfCounterDoubleWithInfo(&t, NULL)) {
         Py_UNREACHABLE();
     }
     return t;
@@ -860,17 +865,18 @@ _PyTime_GetPerfCounter(void)
 int
 _PyTime_Init(void)
 {
-    /* check that the 3 most important clocks are working properly
-       to not have to check for exceptions at runtime. If a clock works once,
-       it cannot fail in next calls. */
+    /* check that time.time(), time.monotonic() and time.perf_counter() clocks
+       are working properly to not have to check for exceptions at runtime. If
+       a clock works once, it cannot fail in next calls. */
     _PyTime_t t;
+    double d;
     if (_PyTime_GetSystemClockWithInfo(&t, NULL) < 0) {
         return -1;
     }
     if (_PyTime_GetMonotonicClockWithInfo(&t, NULL) < 0) {
         return -1;
     }
-    if (_PyTime_GetPerfCounterWithInfo(&t, NULL) < 0) {
+    if (_PyTime_GetPerfCounterDoubleWithInfo(&d, NULL) < 0) {
         return -1;
     }
     return 0;


From webhook-mailer at python.org  Thu Oct 12 12:28:59 2017
From: webhook-mailer at python.org (=?utf-8?q?=C3=89ric?= Araujo)
Date: Thu, 12 Oct 2017 16:28:59 -0000
Subject: [Python-checkins] bpo-31567: more decorator markup fixes in docs
 (GH-3959) (#3966)
Message-ID: <mailman.26.1507825743.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/03b9537dc515d10528f83c920d38910b95755aff
commit: 03b9537dc515d10528f83c920d38910b95755aff
branch: master
author: ?ric Araujo <merwok at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-10-12T12:28:55-04:00
summary:

bpo-31567: more decorator markup fixes in docs (GH-3959) (#3966)

files:
M Doc/library/functions.rst
M Doc/library/typing.rst
M Lib/test/test_typing.py

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index eed67301c04..e47225718c1 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1419,12 +1419,21 @@ are always available.  They are listed here in alphabetical order.
    :func:`classmethod` for a variant that is useful for creating alternate class
    constructors.
 
+   Like all decorators, it is also possible to call ``staticmethod`` as
+   a regular function and do something with its result.  This is needed
+   in some cases where you need a reference to a function from a class
+   body and you want to avoid the automatic transformation to instance
+   method.  For these cases, use this idiom:
+
+      class C:
+          builtin_open = staticmethod(open)
+
    For more information on static methods, consult the documentation on the
    standard type hierarchy in :ref:`types`.
 
-   .. index::
-      single: string; str() (built-in function)
 
+.. index::
+   single: string; str() (built-in function)
 
 .. _func-str:
 .. class:: str(object='')
diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index bd04f731a12..9883d8bbe86 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -897,17 +897,17 @@ The module defines the following classes, functions and decorators:
 
    See :pep:`484` for details and comparison with other typing semantics.
 
-.. decorator:: no_type_check(arg)
+.. decorator:: no_type_check
 
    Decorator to indicate that annotations are not type hints.
 
-   The argument must be a class or function; if it is a class, it
+   This works as class or function :term:`decorator`.  With a class, it
    applies recursively to all methods defined in that class (but not
    to methods defined in its superclasses or subclasses).
 
    This mutates the function(s) in place.
 
-.. decorator:: no_type_check_decorator(decorator)
+.. decorator:: no_type_check_decorator
 
    Decorator to give another decorator the :func:`no_type_check` effect.
 
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 87d707c1cde..a3b6eb93393 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -1471,8 +1471,8 @@ class D(C):
     def test_meta_no_type_check(self):
 
         @no_type_check_decorator
-        def magic_decorator(deco):
-            return deco
+        def magic_decorator(func):
+            return func
 
         self.assertEqual(magic_decorator.__name__, 'magic_decorator')
 


From webhook-mailer at python.org  Thu Oct 12 12:33:08 2017
From: webhook-mailer at python.org (=?utf-8?q?=C3=89ric?= Araujo)
Date: Thu, 12 Oct 2017 16:33:08 -0000
Subject: [Python-checkins] [3.6] bpo-31567: add or fix decorator markup in
 docs (GH-3959) (GH-3966)
Message-ID: <mailman.27.1507825991.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/205dd4e14de77f9c8ed2903ddebbcf9968bbb6a9
commit: 205dd4e14de77f9c8ed2903ddebbcf9968bbb6a9
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ?ric Araujo <merwok at users.noreply.github.com>
date: 2017-10-12T12:33:05-04:00
summary:

[3.6] bpo-31567: add or fix decorator markup in docs (GH-3959) (GH-3966)

(cherry picked from commit 0e61e67a57deb4abc677808201d7cf3c38138e02)

files:
M Doc/library/abc.rst
M Doc/library/functions.rst
M Doc/library/functools.rst
M Doc/library/test.rst
M Doc/library/typing.rst
M Lib/test/test_typing.py

diff --git a/Doc/library/abc.rst b/Doc/library/abc.rst
index 6001db32df4..9522dd62049 100644
--- a/Doc/library/abc.rst
+++ b/Doc/library/abc.rst
@@ -278,7 +278,7 @@ The :mod:`abc` module also provides the following decorators:
        :func:`abstractmethod`, making this decorator redundant.
 
 
-.. decorator:: abstractproperty(fget=None, fset=None, fdel=None, doc=None)
+.. decorator:: abstractproperty
 
    A subclass of the built-in :func:`property`, indicating an abstract
    property.
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index bd4c94fcae1..7a7a84d1d42 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -182,9 +182,9 @@ are always available.  They are listed here in alphabetical order.
    base 16).  :exc:`ValueError` will be raised if *i* is outside that range.
 
 
-.. function:: classmethod(function)
+.. decorator:: classmethod
 
-   Return a class method for *function*.
+   Transform a method into a class method.
 
    A class method receives the class as implicit first argument, just like an
    instance method receives the instance. To declare a class method, use this
@@ -1384,9 +1384,9 @@ are always available.  They are listed here in alphabetical order.
 
    For sorting examples and a brief sorting tutorial, see :ref:`sortinghowto`.
 
-.. function:: staticmethod(function)
+.. decorator:: staticmethod
 
-   Return a static method for *function*.
+   Transform a method into a static method.
 
    A static method does not receive an implicit first argument. To declare a static
    method, use this idiom::
@@ -1405,12 +1405,21 @@ are always available.  They are listed here in alphabetical order.
    :func:`classmethod` for a variant that is useful for creating alternate class
    constructors.
 
+   Like all decorators, it is also possible to call ``staticmethod`` as
+   a regular function and do something with its result.  This is needed
+   in some cases where you need a reference to a function from a class
+   body and you want to avoid the automatic transformation to instance
+   method.  For these cases, use this idiom:
+
+      class C:
+          builtin_open = staticmethod(open)
+
    For more information on static methods, consult the documentation on the
    standard type hierarchy in :ref:`types`.
 
-   .. index::
-      single: string; str() (built-in function)
 
+.. index::
+   single: string; str() (built-in function)
 
 .. _func-str:
 .. class:: str(object='')
diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst
index 9a8defee546..28062c11890 100644
--- a/Doc/library/functools.rst
+++ b/Doc/library/functools.rst
@@ -264,9 +264,9 @@ The :mod:`functools` module defines the following functions:
           return value
 
 
-.. decorator:: singledispatch(default)
+.. decorator:: singledispatch
 
-   Transforms a function into a :term:`single-dispatch <single
+   Transform a function into a :term:`single-dispatch <single
    dispatch>` :term:`generic function`.
 
    To define a generic function, decorate it with the ``@singledispatch``
diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index 9d4ff7ad8b4..1a3f8f9c5dc 100644
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -440,7 +440,7 @@ The :mod:`test.support` module defines the following functions:
    otherwise.
 
 
-.. decorator:: skip_unless_symlink()
+.. decorator:: skip_unless_symlink
 
    A decorator for running tests that require support for symbolic links.
 
diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index bd04f731a12..9883d8bbe86 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -897,17 +897,17 @@ The module defines the following classes, functions and decorators:
 
    See :pep:`484` for details and comparison with other typing semantics.
 
-.. decorator:: no_type_check(arg)
+.. decorator:: no_type_check
 
    Decorator to indicate that annotations are not type hints.
 
-   The argument must be a class or function; if it is a class, it
+   This works as class or function :term:`decorator`.  With a class, it
    applies recursively to all methods defined in that class (but not
    to methods defined in its superclasses or subclasses).
 
    This mutates the function(s) in place.
 
-.. decorator:: no_type_check_decorator(decorator)
+.. decorator:: no_type_check_decorator
 
    Decorator to give another decorator the :func:`no_type_check` effect.
 
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index a3b2ea7f03e..ffefa8ed2dd 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -1471,8 +1471,8 @@ class D(C):
     def test_meta_no_type_check(self):
 
         @no_type_check_decorator
-        def magic_decorator(deco):
-            return deco
+        def magic_decorator(func):
+            return func
 
         self.assertEqual(magic_decorator.__name__, 'magic_decorator')
 


From webhook-mailer at python.org  Thu Oct 12 14:08:46 2017
From: webhook-mailer at python.org (Ned Deily)
Date: Thu, 12 Oct 2017 18:08:46 -0000
Subject: [Python-checkins] bpo-31766: restore 3.5 to docs version switchers
 (#3969)
Message-ID: <mailman.28.1507831728.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/b7cbfe49e39a7bbd7da20b937735a8a60bbf1872
commit: b7cbfe49e39a7bbd7da20b937735a8a60bbf1872
branch: master
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-12T14:08:43-04:00
summary:

bpo-31766: restore 3.5 to docs version switchers (#3969)

files:
M Doc/tools/static/switchers.js
M Doc/tools/templates/indexsidebar.html

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index c2b342b919a..c450f5eafff 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -12,6 +12,7 @@
   var all_versions = {
     '3.7': 'dev (3.7)',
     '3.6': '3.6',
+    '3.5': '3.5',
     '2.7': '2.7',
   };
 
diff --git a/Doc/tools/templates/indexsidebar.html b/Doc/tools/templates/indexsidebar.html
index 4d01842dc67..9fa814f923b 100644
--- a/Doc/tools/templates/indexsidebar.html
+++ b/Doc/tools/templates/indexsidebar.html
@@ -2,8 +2,9 @@
 <p><a href="{{ pathto('download') }}">{% trans %}Download these documents{% endtrans %}</a></p>
 <h3>{% trans %}Docs for other versions{% endtrans %}</h3>
 <ul>
-  <li><a href="https://docs.python.org/2.7/">{% trans %}Python 2.7 (stable){% endtrans %}</a></li>
   <li><a href="https://docs.python.org/3.6/">{% trans %}Python 3.6 (stable){% endtrans %}</a></li>
+  <li><a href="https://docs.python.org/3.5/">{% trans %}Python 3.5 (stable){% endtrans %}</a></li>
+  <li><a href="https://docs.python.org/2.7/">{% trans %}Python 2.7 (stable){% endtrans %}</a></li>
   <li><a href="https://www.python.org/doc/versions/">{% trans %}Old versions{% endtrans %}</a></li>
 </ul>
 


From webhook-mailer at python.org  Thu Oct 12 14:19:10 2017
From: webhook-mailer at python.org (Ned Deily)
Date: Thu, 12 Oct 2017 18:19:10 -0000
Subject: [Python-checkins] bpo-31766: restore 3.5 to docs version switchers
 (#3970)
Message-ID: <mailman.29.1507832352.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/f8d42ea0e4341b270f1de71b4ff40cfa18420eed
commit: f8d42ea0e4341b270f1de71b4ff40cfa18420eed
branch: 3.6
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-12T14:19:07-04:00
summary:

bpo-31766: restore 3.5 to docs version switchers (#3970)

files:
M Doc/tools/static/switchers.js
M Doc/tools/templates/indexsidebar.html

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index c2b342b919a..c450f5eafff 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -12,6 +12,7 @@
   var all_versions = {
     '3.7': 'dev (3.7)',
     '3.6': '3.6',
+    '3.5': '3.5',
     '2.7': '2.7',
   };
 
diff --git a/Doc/tools/templates/indexsidebar.html b/Doc/tools/templates/indexsidebar.html
index a3c4bc8e3a9..c73c406426a 100644
--- a/Doc/tools/templates/indexsidebar.html
+++ b/Doc/tools/templates/indexsidebar.html
@@ -2,8 +2,9 @@
 <p><a href="{{ pathto('download') }}">{% trans %}Download these documents{% endtrans %}</a></p>
 <h3>{% trans %}Docs for other versions{% endtrans %}</h3>
 <ul>
-  <li><a href="https://docs.python.org/2.7/">{% trans %}Python 2.7 (stable){% endtrans %}</a></li>
   <li><a href="https://docs.python.org/3.7/">{% trans %}Python 3.7 (in development){% endtrans %}</a></li>
+  <li><a href="https://docs.python.org/3.5/">{% trans %}Python 3.5 (stable){% endtrans %}</a></li>
+  <li><a href="https://docs.python.org/2.7/">{% trans %}Python 2.7 (stable){% endtrans %}</a></li>
   <li><a href="https://www.python.org/doc/versions/">{% trans %}Old versions{% endtrans %}</a></li>
 </ul>
 


From webhook-mailer at python.org  Thu Oct 12 14:24:26 2017
From: webhook-mailer at python.org (Ned Deily)
Date: Thu, 12 Oct 2017 18:24:26 -0000
Subject: [Python-checkins] bpo-31766: restore 3.5 to docs version switchers
 (#3971)
Message-ID: <mailman.30.1507832668.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/356b68023d6fee5e30d25a4a680ac5b9e4f8dd65
commit: 356b68023d6fee5e30d25a4a680ac5b9e4f8dd65
branch: 2.7
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-12T14:24:23-04:00
summary:

bpo-31766: restore 3.5 to docs version switchers (#3971)

files:
M Doc/tools/static/switchers.js
M Doc/tools/templates/indexsidebar.html

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index c2b342b919a..c450f5eafff 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -12,6 +12,7 @@
   var all_versions = {
     '3.7': 'dev (3.7)',
     '3.6': '3.6',
+    '3.5': '3.5',
     '2.7': '2.7',
   };
 
diff --git a/Doc/tools/templates/indexsidebar.html b/Doc/tools/templates/indexsidebar.html
index 847a2eddc2e..7ad6a076734 100644
--- a/Doc/tools/templates/indexsidebar.html
+++ b/Doc/tools/templates/indexsidebar.html
@@ -2,8 +2,9 @@
 <p><a href="{{ pathto('download') }}">{% trans %}Download these documents{% endtrans %}</a></p>
 <h3>{% trans %}Docs for other versions{% endtrans %}</h3>
 <ul>
-  <li><a href="https://docs.python.org/3.6/">{% trans %}Python 3.6 (stable){% endtrans %}</a></li>
   <li><a href="https://docs.python.org/3.7/">{% trans %}Python 3.7 (in development){% endtrans %}</a></li>
+  <li><a href="https://docs.python.org/3.6/">{% trans %}Python 3.6 (stable){% endtrans %}</a></li>
+  <li><a href="https://docs.python.org/3.5/">{% trans %}Python 3.5 (stable){% endtrans %}</a></li>
   <li><a href="https://www.python.org/doc/versions/">{% trans %}Old versions{% endtrans %}</a></li>
 </ul>
 


From webhook-mailer at python.org  Thu Oct 12 15:17:49 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 12 Oct 2017 19:17:49 -0000
Subject: [Python-checkins] bpo-30058: Fixed buffer overflow in
 select.kqueue.control(). (#1095)
Message-ID: <mailman.31.1507835871.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/de072100775cc29e6cd93a75466cecbd1086f258
commit: de072100775cc29e6cd93a75466cecbd1086f258
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-12T22:17:46+03:00
summary:

bpo-30058: Fixed buffer overflow in select.kqueue.control(). (#1095)

files:
A Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst
M Lib/test/test_kqueue.py
M Modules/selectmodule.c

diff --git a/Lib/test/test_kqueue.py b/Lib/test/test_kqueue.py
index 9f49886878f..1099c759a79 100644
--- a/Lib/test/test_kqueue.py
+++ b/Lib/test/test_kqueue.py
@@ -208,6 +208,30 @@ def testPair(self):
         b.close()
         kq.close()
 
+    def test_issue30058(self):
+        # changelist must be an iterable
+        kq = select.kqueue()
+        a, b = socket.socketpair()
+        ev = select.kevent(a, select.KQ_FILTER_READ, select.KQ_EV_ADD | select.KQ_EV_ENABLE)
+
+        kq.control([ev], 0)
+        # not a list
+        kq.control((ev,), 0)
+        # __len__ is not consistent with __iter__
+        class BadList:
+            def __len__(self):
+                return 0
+            def __iter__(self):
+                for i in range(100):
+                    yield ev
+        kq.control(BadList(), 0)
+        # doesn't have __len__
+        kq.control(iter([ev]), 0)
+
+        a.close()
+        b.close()
+        kq.close()
+
     def test_close(self):
         open_file = open(__file__, "rb")
         self.addCleanup(open_file.close)
diff --git a/Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst b/Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst
new file mode 100644
index 00000000000..fa1c8f4e74f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst
@@ -0,0 +1 @@
+Fixed buffer overflow in select.kqueue.control().
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index d763bae4be4..66d1a37fb4a 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -2102,7 +2102,7 @@ kqueue_queue_control(kqueue_queue_Object *self, PyObject *args)
     int i = 0;
     PyObject *otimeout = NULL;
     PyObject *ch = NULL;
-    PyObject *it = NULL, *ei = NULL;
+    PyObject *seq = NULL, *ei = NULL;
     PyObject *result = NULL;
     struct kevent *evl = NULL;
     struct kevent *chl = NULL;
@@ -2148,37 +2148,34 @@ kqueue_queue_control(kqueue_queue_Object *self, PyObject *args)
     }
 
     if (ch != NULL && ch != Py_None) {
-        it = PyObject_GetIter(ch);
-        if (it == NULL) {
-            PyErr_SetString(PyExc_TypeError,
-                            "changelist is not iterable");
+        seq = PySequence_Fast(ch, "changelist is not iterable");
+        if (seq == NULL) {
             return NULL;
         }
-        nchanges = PyObject_Size(ch);
-        if (nchanges < 0) {
+        if (PySequence_Fast_GET_SIZE(seq) > INT_MAX) {
+            PyErr_SetString(PyExc_OverflowError,
+                            "changelist is too long");
             goto error;
         }
+        nchanges = (int)PySequence_Fast_GET_SIZE(seq);
 
         chl = PyMem_New(struct kevent, nchanges);
         if (chl == NULL) {
             PyErr_NoMemory();
             goto error;
         }
-        i = 0;
-        while ((ei = PyIter_Next(it)) != NULL) {
+        for (i = 0; i < nchanges; ++i) {
+            ei = PySequence_Fast_GET_ITEM(seq, i);
             if (!kqueue_event_Check(ei)) {
-                Py_DECREF(ei);
                 PyErr_SetString(PyExc_TypeError,
                     "changelist must be an iterable of "
                     "select.kevent objects");
                 goto error;
-            } else {
-                chl[i++] = ((kqueue_event_Object *)ei)->e;
             }
-            Py_DECREF(ei);
+            chl[i] = ((kqueue_event_Object *)ei)->e;
         }
+        Py_CLEAR(seq);
     }
-    Py_CLEAR(it);
 
     /* event list */
     if (nevents) {
@@ -2246,7 +2243,7 @@ kqueue_queue_control(kqueue_queue_Object *self, PyObject *args)
     PyMem_Free(chl);
     PyMem_Free(evl);
     Py_XDECREF(result);
-    Py_XDECREF(it);
+    Py_XDECREF(seq);
     return NULL;
 }
 
@@ -2254,7 +2251,7 @@ PyDoc_STRVAR(kqueue_queue_control_doc,
 "control(changelist, max_events[, timeout=None]) -> eventlist\n\
 \n\
 Calls the kernel kevent function.\n\
-- changelist must be a list of kevent objects describing the changes\n\
+- changelist must be an iterable of kevent objects describing the changes\n\
   to be made to the kernel's watch list or None.\n\
 - max_events lets you specify the maximum number of events that the\n\
   kernel will return.\n\


From webhook-mailer at python.org  Thu Oct 12 16:05:00 2017
From: webhook-mailer at python.org (Ned Deily)
Date: Thu, 12 Oct 2017 20:05:00 -0000
Subject: [Python-checkins] Exclude non-default VENVDIR in Doc builds (#3974)
Message-ID: <mailman.32.1507838701.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/6129250b74fc480a614e6db30b5e4fc8d0ff6835
commit: 6129250b74fc480a614e6db30b5e4fc8d0ff6835
branch: master
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-12T16:04:57-04:00
summary:

Exclude non-default VENVDIR in Doc builds (#3974)

files:
M Doc/conf.py

diff --git a/Doc/conf.py b/Doc/conf.py
index c4ae16a2054..aaee983984b 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -38,7 +38,8 @@
 needs_sphinx = '1.2'
 
 # Ignore any .rst files in the venv/ directory.
-exclude_patterns = ['venv/*', 'README.rst']
+venvdir = os.getenv('VENVDIR', 'venv')
+exclude_patterns = [venvdir+'/*', 'README.rst']
 
 
 # Options for HTML output


From webhook-mailer at python.org  Thu Oct 12 16:20:46 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 12 Oct 2017 20:20:46 -0000
Subject: [Python-checkins] [3.6] bpo-30058: Fixed buffer overflow in
 select.kqueue.control(). (GH-1095) (#3973)
Message-ID: <mailman.33.1507839647.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/c923da188bc055e4f3001a6daf1caf54f2b10e40
commit: c923da188bc055e4f3001a6daf1caf54f2b10e40
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-12T23:20:44+03:00
summary:

[3.6] bpo-30058: Fixed buffer overflow in select.kqueue.control(). (GH-1095) (#3973)

(cherry picked from commit de072100775cc29e6cd93a75466cecbd1086f258)

files:
A Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst
M Lib/test/test_kqueue.py
M Modules/selectmodule.c

diff --git a/Lib/test/test_kqueue.py b/Lib/test/test_kqueue.py
index 9f49886878f..1099c759a79 100644
--- a/Lib/test/test_kqueue.py
+++ b/Lib/test/test_kqueue.py
@@ -208,6 +208,30 @@ def testPair(self):
         b.close()
         kq.close()
 
+    def test_issue30058(self):
+        # changelist must be an iterable
+        kq = select.kqueue()
+        a, b = socket.socketpair()
+        ev = select.kevent(a, select.KQ_FILTER_READ, select.KQ_EV_ADD | select.KQ_EV_ENABLE)
+
+        kq.control([ev], 0)
+        # not a list
+        kq.control((ev,), 0)
+        # __len__ is not consistent with __iter__
+        class BadList:
+            def __len__(self):
+                return 0
+            def __iter__(self):
+                for i in range(100):
+                    yield ev
+        kq.control(BadList(), 0)
+        # doesn't have __len__
+        kq.control(iter([ev]), 0)
+
+        a.close()
+        b.close()
+        kq.close()
+
     def test_close(self):
         open_file = open(__file__, "rb")
         self.addCleanup(open_file.close)
diff --git a/Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst b/Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst
new file mode 100644
index 00000000000..fa1c8f4e74f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst
@@ -0,0 +1 @@
+Fixed buffer overflow in select.kqueue.control().
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 07a20c85d76..4a7fe002f0b 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -2103,7 +2103,7 @@ kqueue_queue_control(kqueue_queue_Object *self, PyObject *args)
     int i = 0;
     PyObject *otimeout = NULL;
     PyObject *ch = NULL;
-    PyObject *it = NULL, *ei = NULL;
+    PyObject *seq = NULL, *ei = NULL;
     PyObject *result = NULL;
     struct kevent *evl = NULL;
     struct kevent *chl = NULL;
@@ -2149,37 +2149,34 @@ kqueue_queue_control(kqueue_queue_Object *self, PyObject *args)
     }
 
     if (ch != NULL && ch != Py_None) {
-        it = PyObject_GetIter(ch);
-        if (it == NULL) {
-            PyErr_SetString(PyExc_TypeError,
-                            "changelist is not iterable");
+        seq = PySequence_Fast(ch, "changelist is not iterable");
+        if (seq == NULL) {
             return NULL;
         }
-        nchanges = PyObject_Size(ch);
-        if (nchanges < 0) {
+        if (PySequence_Fast_GET_SIZE(seq) > INT_MAX) {
+            PyErr_SetString(PyExc_OverflowError,
+                            "changelist is too long");
             goto error;
         }
+        nchanges = (int)PySequence_Fast_GET_SIZE(seq);
 
         chl = PyMem_New(struct kevent, nchanges);
         if (chl == NULL) {
             PyErr_NoMemory();
             goto error;
         }
-        i = 0;
-        while ((ei = PyIter_Next(it)) != NULL) {
+        for (i = 0; i < nchanges; ++i) {
+            ei = PySequence_Fast_GET_ITEM(seq, i);
             if (!kqueue_event_Check(ei)) {
-                Py_DECREF(ei);
                 PyErr_SetString(PyExc_TypeError,
                     "changelist must be an iterable of "
                     "select.kevent objects");
                 goto error;
-            } else {
-                chl[i++] = ((kqueue_event_Object *)ei)->e;
             }
-            Py_DECREF(ei);
+            chl[i] = ((kqueue_event_Object *)ei)->e;
         }
+        Py_CLEAR(seq);
     }
-    Py_CLEAR(it);
 
     /* event list */
     if (nevents) {
@@ -2247,7 +2244,7 @@ kqueue_queue_control(kqueue_queue_Object *self, PyObject *args)
     PyMem_Free(chl);
     PyMem_Free(evl);
     Py_XDECREF(result);
-    Py_XDECREF(it);
+    Py_XDECREF(seq);
     return NULL;
 }
 
@@ -2255,7 +2252,7 @@ PyDoc_STRVAR(kqueue_queue_control_doc,
 "control(changelist, max_events[, timeout=None]) -> eventlist\n\
 \n\
 Calls the kernel kevent function.\n\
-- changelist must be a list of kevent objects describing the changes\n\
+- changelist must be an iterable of kevent objects describing the changes\n\
   to be made to the kernel's watch list or None.\n\
 - max_events lets you specify the maximum number of events that the\n\
   kernel will return.\n\


From webhook-mailer at python.org  Thu Oct 12 16:21:20 2017
From: webhook-mailer at python.org (Ned Deily)
Date: Thu, 12 Oct 2017 20:21:20 -0000
Subject: [Python-checkins] Exclude non-default VENVDIR in Doc builds (#3974)
 (#3975)
Message-ID: <mailman.34.1507839681.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/86f37b5225f992e466b1d2a7d0a05ceea6ea5450
commit: 86f37b5225f992e466b1d2a7d0a05ceea6ea5450
branch: 3.6
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-12T16:21:17-04:00
summary:

Exclude non-default VENVDIR in Doc builds (#3974) (#3975)

files:
M Doc/conf.py

diff --git a/Doc/conf.py b/Doc/conf.py
index d4ee50de7db..f7073d116a4 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -37,7 +37,8 @@
 needs_sphinx = '1.2'
 
 # Ignore any .rst files in the venv/ directory.
-exclude_patterns = ['venv/*', 'README.rst']
+venvdir = os.getenv('VENVDIR', 'venv')
+exclude_patterns = [venvdir+'/*', 'README.rst']
 
 
 # Options for HTML output


From webhook-mailer at python.org  Thu Oct 12 16:39:55 2017
From: webhook-mailer at python.org (Ned Deily)
Date: Thu, 12 Oct 2017 20:39:55 -0000
Subject: [Python-checkins] Exclude VENVDIR in Doc builds (#3977)
Message-ID: <mailman.35.1507840796.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/dcb101e7f078f12fc3d2bf1730410798a880bfe3
commit: dcb101e7f078f12fc3d2bf1730410798a880bfe3
branch: 3.5
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-12T16:39:51-04:00
summary:

Exclude VENVDIR in Doc builds (#3977)

files:
M Doc/Makefile
M Doc/conf.py

diff --git a/Doc/Makefile b/Doc/Makefile
index da3274396eb..7f3e216c70e 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -170,7 +170,7 @@ dist:
 	cp -pPR build/epub/Python.epub dist/python-$(DISTVERSION)-docs.epub
 
 check:
-	$(PYTHON) tools/rstlint.py -i tools
+	$(PYTHON) tools/rstlint.py -i tools -i $(VENVDIR) -i README.rst
 
 serve:
 	../Tools/scripts/serve.py build/html
diff --git a/Doc/conf.py b/Doc/conf.py
index b3f26d5a692..4145fd5a90a 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -37,7 +37,8 @@
 needs_sphinx = '1.2'
 
 # Ignore any .rst files in the venv/ directory.
-exclude_patterns = ['venv/*']
+venvdir = os.getenv('VENVDIR', 'venv')
+exclude_patterns = [venvdir+'/*', 'README.rst']
 
 
 # Options for HTML output


From webhook-mailer at python.org  Thu Oct 12 17:13:13 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 12 Oct 2017 21:13:13 -0000
Subject: [Python-checkins] [2.7] bpo-30058: Fixed buffer overflow in
 select.kqueue.control(). (GH-1095). (#3976)
Message-ID: <mailman.36.1507842795.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/9aa60245a0ff929e528b4521da7af20dacd4145b
commit: 9aa60245a0ff929e528b4521da7af20dacd4145b
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-13T00:13:11+03:00
summary:

[2.7] bpo-30058: Fixed buffer overflow in select.kqueue.control(). (GH-1095). (#3976)

(cherry picked from commit de072100775cc29e6cd93a75466cecbd1086f258)

files:
A Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst
M Lib/test/test_kqueue.py
M Modules/selectmodule.c

diff --git a/Lib/test/test_kqueue.py b/Lib/test/test_kqueue.py
index 1bdfec835df..c599e021756 100644
--- a/Lib/test/test_kqueue.py
+++ b/Lib/test/test_kqueue.py
@@ -205,6 +205,30 @@ def testPair(self):
         b.close()
         kq.close()
 
+    def test_issue30058(self):
+        # changelist must be an iterable
+        kq = select.kqueue()
+        a, b = socket.socketpair()
+        ev = select.kevent(a, select.KQ_FILTER_READ, select.KQ_EV_ADD | select.KQ_EV_ENABLE)
+
+        kq.control([ev], 0)
+        # not a list
+        kq.control((ev,), 0)
+        # __len__ is not consistent with __iter__
+        class BadList:
+            def __len__(self):
+                return 0
+            def __iter__(self):
+                for i in range(100):
+                    yield ev
+        kq.control(BadList(), 0)
+        # doesn't have __len__
+        kq.control(iter([ev]), 0)
+
+        a.close()
+        b.close()
+        kq.close()
+
 def test_main():
     test_support.run_unittest(TestKQueue)
 
diff --git a/Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst b/Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst
new file mode 100644
index 00000000000..fa1c8f4e74f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst
@@ -0,0 +1 @@
+Fixed buffer overflow in select.kqueue.control().
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index da03366bb91..a38aa08798c 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1537,7 +1537,7 @@ kqueue_queue_control(kqueue_queue_Object *self, PyObject *args)
     int i = 0;
     PyObject *otimeout = NULL;
     PyObject *ch = NULL;
-    PyObject *it = NULL, *ei = NULL;
+    PyObject *seq = NULL, *ei = NULL;
     PyObject *result = NULL;
     struct kevent *evl = NULL;
     struct kevent *chl = NULL;
@@ -1593,37 +1593,34 @@ kqueue_queue_control(kqueue_queue_Object *self, PyObject *args)
     }
 
     if (ch != NULL && ch != Py_None) {
-        it = PyObject_GetIter(ch);
-        if (it == NULL) {
-            PyErr_SetString(PyExc_TypeError,
-                            "changelist is not iterable");
+        seq = PySequence_Fast(ch, "changelist is not iterable");
+        if (seq == NULL) {
             return NULL;
         }
-        nchanges = PyObject_Size(ch);
-        if (nchanges < 0) {
+        if (PySequence_Fast_GET_SIZE(seq) > INT_MAX) {
+            PyErr_SetString(PyExc_OverflowError,
+                            "changelist is too long");
             goto error;
         }
+        nchanges = (int)PySequence_Fast_GET_SIZE(seq);
 
         chl = PyMem_New(struct kevent, nchanges);
         if (chl == NULL) {
             PyErr_NoMemory();
             goto error;
         }
-        i = 0;
-        while ((ei = PyIter_Next(it)) != NULL) {
+        for (i = 0; i < nchanges; ++i) {
+            ei = PySequence_Fast_GET_ITEM(seq, i);
             if (!kqueue_event_Check(ei)) {
-                Py_DECREF(ei);
                 PyErr_SetString(PyExc_TypeError,
                     "changelist must be an iterable of "
                     "select.kevent objects");
                 goto error;
-            } else {
-                chl[i++] = ((kqueue_event_Object *)ei)->e;
             }
-            Py_DECREF(ei);
+            chl[i] = ((kqueue_event_Object *)ei)->e;
         }
+        Py_CLEAR(seq);
     }
-    Py_CLEAR(it);
 
     /* event list */
     if (nevents) {
@@ -1667,7 +1664,7 @@ kqueue_queue_control(kqueue_queue_Object *self, PyObject *args)
     PyMem_Free(chl);
     PyMem_Free(evl);
     Py_XDECREF(result);
-    Py_XDECREF(it);
+    Py_XDECREF(seq);
     return NULL;
 }
 
@@ -1675,7 +1672,7 @@ PyDoc_STRVAR(kqueue_queue_control_doc,
 "control(changelist, max_events[, timeout=None]) -> eventlist\n\
 \n\
 Calls the kernel kevent function.\n\
-- changelist must be a list of kevent objects describing the changes\n\
+- changelist must be an iterable of kevent objects describing the changes\n\
   to be made to the kernel's watch list or None.\n\
 - max_events lets you specify the maximum number of events that the\n\
   kernel will return.\n\


From lp_benchmark_robot at intel.com  Thu Oct 12 17:48:25 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Thu, 12 Oct 2017 14:48:25 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-10-12
Message-ID: <715f08ac-e732-424f-82af-09eee37ae57d@orsmsx102.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-12 03:03:02-07:00.
  - commit:		277c840
  - previous commit:	eeb5ffd
  - revision date:	2017-10-11 08:11:38-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.256% |  +0.181%   |  +5.619%   |  +7.635%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.025% |  -0.291%   |  +16.530%  |  +15.710%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 0.442% |  +0.018%   |  +17.733%  |  +14.275%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.685% |  -0.152%   |  +17.207%  |  +12.153%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.266% |  +0.218%   |  +0.928%   |  +14.877%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.931% |  +0.581%   |  +11.454%  |  +9.476%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.656% |  -0.032%   |  +8.219%   |  +10.074%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.723% |  +0.131%   |  +2.125%   |  +6.565%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.492% |  -0.299%   |  +5.682%   |  +21.382%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.466% |  -1.189%   |  +9.839%   |  +12.006%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.628% |  -0.143%   |  +4.714%   |  +6.174%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.501% |  -0.186%   |  +6.683%   |  +5.039%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 1.155% |  -0.106%   |  +3.641%   |  +6.250%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.050% |  +0.167%   |  +9.026%   |  +11.470%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.485% |  +0.370%   |  +8.119%   |  +7.625%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.603% |  -0.082%   |  +6.456%   |  +11.588%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.624% |  +0.202%   |  +9.232%   |  +11.369%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.042% |  -0.021%   |  +9.922%   |  +8.487%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.984% |  -0.034%   |  +3.964%   |  +10.055%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 5.428% |  +0.174%   |  +1.453%   |  +11.612%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.886% |  -0.546%   |  +9.450%   |  +10.411%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.599% |  -0.446%   |  +46.211%  |  +12.567%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.752% |  +0.143%   |  +10.457%  |  +11.933%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.973% |  -0.092%   |  +17.495%  |  +11.855%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 2.378% |  -0.218%   |  +7.070%   |  +11.075%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.552% |  +0.460%   |  +2.902%   |  +6.092%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.749% |  +0.172%   |  -1.288%   |  +3.196%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.842% |  -0.413%   |  +2.342%   |  +8.155%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.258% |  -0.652%   |  +5.322%   |  +8.778%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.088% |  +0.343%   |  -0.312%   |  +19.909%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.240% |  -0.100%   |  +3.692%   |  +18.419%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.870% |  -0.088%   |  +5.578%   |  +14.842%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.777% |  +0.737%   |  +12.664%  |  +9.838%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.077% |  -0.038%   |  +0.453%   |  +9.655%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.127% |  -0.019%   |  +11.210%  |  +4.435%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.086% |  +0.056%   |  +2.640%   |  +4.617%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.083% |  -0.041%   |  +10.299%  |  +13.015%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.587% |  +1.041%   |  +3.230%   |  +12.479%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 1.391% |  -0.263%   |  +1.567%   |  +8.768%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.491% |  +0.233%   |  +0.175%   |  -0.883%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 2.243% |  +0.367%   |  +9.316%   |  +3.155%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.491% |  -0.202%   |  +7.646%   |  +14.671%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.523% |  +0.179%   |  +2.933%   |  +3.168%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.400% |  +0.154%   |  +26.711%  |  +7.609%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.330% |  -0.664%   |  +3.945%   |  +7.160%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 2.025% |  -0.109%   |  +15.008%  |  +8.412%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 6.208% |  -3.168%   |  +0.661%   |  -3.205%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.556% |  -0.013%   |  +6.045%   |  +3.178%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.274% |  +0.302%   |  +7.488%   |  +7.097%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.103% |  +0.042%   |  +6.233%   |  +5.610%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.312% |  -0.118%   |  +20.131%  |  +5.626%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.806% |  +0.303%   |  +11.920%  |  +8.964%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.778% |  +0.411%   |  +10.403%  |  +6.701%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.706% |  +0.233%   |  +11.869%  |  +9.552%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.362% |  -0.315%   |  +12.342%  |  +11.143%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 2.638% |  +0.677%   |  +23.990%  |  +8.692%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.203% |  +0.106%   |  +6.287%   |  +6.676%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.031% |  +0.277%   |  +2.391%   |  +2.716%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 9.798% |  -3.570%   |  +6.409%   |  +21.532%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.896% |  +0.969%   |  +1.536%   |  +15.772%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 1.980% |  +1.060%   |  +7.536%   |  +6.626%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.216% |  -0.094%   |  +6.442%   |  +6.938%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 3.194% |  +0.529%   |  +1.422%   |  +6.745%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 4.116% |  +0.463%   |  -9.023%   |  +12.537%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 2.072% |  +0.169%   |  +5.874%   |  +7.894%   |
+-----+------------------------+--------+------------+------------+------------+

* 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-10-12

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 Oct 12 23:42:01 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Fri, 13 Oct 2017 03:42:01 -0000
Subject: [Python-checkins] Improve test suite customization example (GH-3967)
Message-ID: <mailman.37.1507866122.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/925510449984399cf58711843ddfe2e8007c3878
commit: 925510449984399cf58711843ddfe2e8007c3878
branch: master
author: Berker Peksag <berker.peksag at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-13T06:41:57+03:00
summary:

Improve test suite customization example (GH-3967)

Reported by John Gamboa on docs at p.o at
https://mail.python.org/pipermail/docs/2017-June/031942.html

files:
M Doc/library/unittest.rst

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 2099bd1e2e9..e52f140029c 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -402,10 +402,14 @@ you can do it yourself::
 
    def suite():
        suite = unittest.TestSuite()
-       suite.addTest(WidgetTestCase('test_default_size'))
-       suite.addTest(WidgetTestCase('test_resize'))
+       suite.addTest(WidgetTestCase('test_default_widget_size'))
+       suite.addTest(WidgetTestCase('test_widget_resize'))
        return suite
 
+   if __name__ == '__main__':
+       runner = unittest.TextTestRunner()
+       runner.run(suite())
+
 You can place the definitions of test cases and test suites in the same modules
 as the code they are to test (such as :file:`widget.py`), but there are several
 advantages to placing the test code in a separate module, such as


From webhook-mailer at python.org  Thu Oct 12 23:54:36 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Fri, 13 Oct 2017 03:54:36 -0000
Subject: [Python-checkins] [3.6] Improve test suite customization example
 (GH-3967)
Message-ID: <mailman.38.1507866877.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/fdf151bbfbd5aed7c860ff212faf711a270544f3
commit: fdf151bbfbd5aed7c860ff212faf711a270544f3
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Berker Peksag <berker.peksag at gmail.com>
date: 2017-10-13T06:54:32+03:00
summary:

[3.6] Improve test suite customization example (GH-3967)

Reported by John Gamboa on docs at p.o at
https://mail.python.org/pipermail/docs/2017-June/031942.html

(cherry picked from commit 925510449984399cf58711843ddfe2e8007c3878)

files:
M Doc/library/unittest.rst

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 2099bd1e2e9..e52f140029c 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -402,10 +402,14 @@ you can do it yourself::
 
    def suite():
        suite = unittest.TestSuite()
-       suite.addTest(WidgetTestCase('test_default_size'))
-       suite.addTest(WidgetTestCase('test_resize'))
+       suite.addTest(WidgetTestCase('test_default_widget_size'))
+       suite.addTest(WidgetTestCase('test_widget_resize'))
        return suite
 
+   if __name__ == '__main__':
+       runner = unittest.TextTestRunner()
+       runner.run(suite())
+
 You can place the definitions of test cases and test suites in the same modules
 as the code they are to test (such as :file:`widget.py`), but there are several
 advantages to placing the test code in a separate module, such as


From webhook-mailer at python.org  Fri Oct 13 03:02:27 2017
From: webhook-mailer at python.org (INADA Naoki)
Date: Fri, 13 Oct 2017 07:02:27 -0000
Subject: [Python-checkins] bpo-31672: Fix string.Template accidentally
 matched non-ASCII identifiers (GH-3872)
Message-ID: <mailman.39.1507878148.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/b22273ec5d1992b0cbe078b887427ae9977dfb78
commit: b22273ec5d1992b0cbe078b887427ae9977dfb78
branch: master
author: INADA Naoki <methane at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-10-13T16:02:23+09:00
summary:

bpo-31672: Fix string.Template accidentally matched non-ASCII identifiers (GH-3872)

Pattern `[a-z]` with `IGNORECASE` flag can match to some non-ASCII characters.

Straightforward solution for this is using `IGNORECASE | ASCII` flag.
But users may subclass `Template` and override only `idpattern`. So we want to
avoid changing `Template.flags`.

So this commit uses local flag `-i` for `idpattern` and change `[a-z]` to `[a-zA-Z]`.

files:
A Misc/NEWS.d/next/Library/2017-10-12-02-47-16.bpo-31672.DaOkVd.rst
M Doc/library/string.rst
M Lib/string.py
M Lib/test/test_string.py

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 1a9b6309752..1076cdb2346 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -755,8 +755,17 @@ attributes:
 
 * *idpattern* -- This is the regular expression describing the pattern for
   non-braced placeholders.  The default value is the regular expression
-  ``[_a-z][_a-z0-9]*``.  If this is given and *braceidpattern* is ``None``
-  this pattern will also apply to braced placeholders.
+  ``(?-i:[_a-zA-Z][_a-zA-Z0-9]*)``.  If this is given and *braceidpattern* is
+  ``None`` this pattern will also apply to braced placeholders.
+
+  .. note::
+
+     Since default *flags* is ``re.IGNORECASE``, pattern ``[a-z]`` can match
+     with some non-ASCII characters. That's why we use local ``-i`` flag here.
+
+     While *flags* is kept to ``re.IGNORECASE`` for backward compatibility,
+     you can override it to ``0`` or ``re.IGNORECASE | re.ASCII`` when
+     subclassing.  It's simple way to avoid unexpected match like above example.
 
   .. versionchanged:: 3.7
      *braceidpattern* can be used to define separate patterns used inside and
diff --git a/Lib/string.py b/Lib/string.py
index b46e60c38f4..a3e6d91bb4a 100644
--- a/Lib/string.py
+++ b/Lib/string.py
@@ -79,7 +79,11 @@ class Template(metaclass=_TemplateMetaclass):
     """A string class for supporting $-substitutions."""
 
     delimiter = '$'
-    idpattern = r'[_a-z][_a-z0-9]*'
+    # r'[a-z]' matches to non-ASCII letters when used with IGNORECASE,
+    # but without ASCII flag.  We can't add re.ASCII to flags because of
+    # backward compatibility.  So we use local -i flag and [a-zA-Z] pattern.
+    # See https://bugs.python.org/issue31672
+    idpattern = r'(?-i:[_a-zA-Z][_a-zA-Z0-9]*)'
     braceidpattern = None
     flags = _re.IGNORECASE
 
diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py
index 6e241ac72ab..3480459c282 100644
--- a/Lib/test/test_string.py
+++ b/Lib/test/test_string.py
@@ -270,6 +270,12 @@ def test_invalid_placeholders(self):
         raises(ValueError, s.substitute, dict(who='tim'))
         s = Template('$who likes $100')
         raises(ValueError, s.substitute, dict(who='tim'))
+        # Template.idpattern should match to only ASCII characters.
+        # https://bugs.python.org/issue31672
+        s = Template("$who likes $\u0131")  # (DOTLESS I)
+        raises(ValueError, s.substitute, dict(who='tim'))
+        s = Template("$who likes $\u0130")  # (LATIN CAPITAL LETTER I WITH DOT ABOVE)
+        raises(ValueError, s.substitute, dict(who='tim'))
 
     def test_idpattern_override(self):
         class PathPattern(Template):
diff --git a/Misc/NEWS.d/next/Library/2017-10-12-02-47-16.bpo-31672.DaOkVd.rst b/Misc/NEWS.d/next/Library/2017-10-12-02-47-16.bpo-31672.DaOkVd.rst
new file mode 100644
index 00000000000..b8de1f3b1db
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-12-02-47-16.bpo-31672.DaOkVd.rst
@@ -0,0 +1,2 @@
+``idpattern`` in ``string.Template`` matched some non-ASCII characters. Now
+it uses ``-i`` regular expression local flag to avoid non-ASCII characters.


From solipsis at pitrou.net  Fri Oct 13 05:07:04 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 13 Oct 2017 09:07:04 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=4
Message-ID: <20171013090704.32562.BC14C8E1F49494D4@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


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

From webhook-mailer at python.org  Fri Oct 13 08:16:37 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Fri, 13 Oct 2017 12:16:37 -0000
Subject: [Python-checkins] bpo-28647: Update -u documentation after
 bpo-30404 (GH-3961)
Message-ID: <mailman.40.1507897000.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/7f580970836b0f6bc9c5db868d95bea81a3e1558
commit: 7f580970836b0f6bc9c5db868d95bea81a3e1558
branch: master
author: Berker Peksag <berker.peksag at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-13T15:16:31+03:00
summary:

bpo-28647: Update -u documentation after bpo-30404 (GH-3961)

files:
M Doc/library/sys.rst
M Doc/using/cmdline.rst
M Misc/python.man
M Modules/main.c

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index aa7bd477b05..853e91b93de 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -1275,9 +1275,9 @@ always available.
      Under all platforms though, you can override this value by setting the
      :envvar:`PYTHONIOENCODING` environment variable before starting Python.
 
-   * When interactive, standard streams are line-buffered.  Otherwise, they
-     are block-buffered like regular text files.  You can override this
-     value with the :option:`-u` command-line option.
+   * When interactive, ``stdout`` and ``stderr`` streams are line-buffered.
+     Otherwise, they are block-buffered like regular text files.  You can
+     override this value with the :option:`-u` command-line option.
 
    .. note::
 
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index a8cdff641e4..8ab26f59557 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -303,7 +303,8 @@ Miscellaneous options
 
 .. cmdoption:: -u
 
-   Force the stdout and stderr streams to be unbuffered.
+   Force the stdout and stderr streams to be unbuffered.  This option has no
+   effect on the stdin stream.
 
    See also :envvar:`PYTHONUNBUFFERED`.
 
diff --git a/Misc/python.man b/Misc/python.man
index 075b974e904..9f71d69dfaf 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -178,13 +178,8 @@ that it entails.  Also disable these manipulations if
 is explicitly imported later.
 .TP
 .B \-u
-Force the binary I/O layers of stdout and stderr to be unbuffered.
-stdin is always buffered.
-The text I/O layer will still be line-buffered.
-.\" Note that there is internal buffering in readlines() and
-.\" file-object iterators ("for line in sys.stdin") which is not
-.\" influenced by this option.  To work around this, you will want to use
-.\" "sys.stdin.readline()" inside a "while 1:" loop.
+Force the stdout and stderr streams to be unbuffered.
+This option has no effect on the stdin stream.
 .TP
 .B \-v
 Print a message each time a module is initialized, showing the place
diff --git a/Modules/main.c b/Modules/main.c
index 3e347dc8e24..e8621133104 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -71,9 +71,8 @@ static const char usage_2[] = "\
 -S     : don't imply 'import site' on initialization\n\
 ";
 static const char usage_3[] = "\
--u     : unbuffered binary stdout and stderr, stdin always buffered;\n\
-         also PYTHONUNBUFFERED=x\n\
-         see man page for details on internal buffering relating to '-u'\n\
+-u     : force the stdout and stderr streams to be unbuffered;\n\
+         this option has no effect on stdin; also PYTHONUNBUFFERED=x\n\
 -v     : verbose (trace import statements); also PYTHONVERBOSE=x\n\
          can be supplied multiple times to increase verbosity\n\
 -V     : print the Python version number and exit (also --version)\n\


From webhook-mailer at python.org  Fri Oct 13 15:59:16 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 13 Oct 2017 19:59:16 -0000
Subject: [Python-checkins] bpo-25588: Fix regrtest when run inside IDLE
 (#3962)
Message-ID: <mailman.41.1507924758.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/ccef823939d4ef602f2d8d13d0bfec29eda597a5
commit: ccef823939d4ef602f2d8d13d0bfec29eda597a5
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-13T12:59:12-07:00
summary:

bpo-25588: Fix regrtest when run inside IDLE (#3962)

When regrtest in run inside IDLE, sys.stdout and sys.stderr are not
TextIOWrapper objects and have no file descriptor associated:
sys.stderr.fileno() raises io.UnsupportedOperation.

Disable faulthandler and don't replace sys.stdout in that case.

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

diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py
index 1d24531fc26..bf899a9e4d4 100644
--- a/Lib/test/libregrtest/setup.py
+++ b/Lib/test/libregrtest/setup.py
@@ -14,17 +14,26 @@
 
 
 def setup_tests(ns):
-    # Display the Python traceback on fatal errors (e.g. segfault)
-    faulthandler.enable(all_threads=True)
-
-    # Display the Python traceback on SIGALRM or SIGUSR1 signal
-    signals = []
-    if hasattr(signal, 'SIGALRM'):
-        signals.append(signal.SIGALRM)
-    if hasattr(signal, 'SIGUSR1'):
-        signals.append(signal.SIGUSR1)
-    for signum in signals:
-        faulthandler.register(signum, chain=True)
+    try:
+        stderr_fd = sys.__stderr__.fileno()
+    except (ValueError, AttributeError):
+        # Catch ValueError to catch io.UnsupportedOperation on TextIOBase
+        # and ValueError on a closed stream.
+        #
+        # Catch AttributeError for stderr being None.
+        stderr_fd = None
+    else:
+        # Display the Python traceback on fatal errors (e.g. segfault)
+        faulthandler.enable(all_threads=True, file=stderr_fd)
+
+        # Display the Python traceback on SIGALRM or SIGUSR1 signal
+        signals = []
+        if hasattr(signal, 'SIGALRM'):
+            signals.append(signal.SIGALRM)
+        if hasattr(signal, 'SIGUSR1'):
+            signals.append(signal.SIGUSR1)
+        for signum in signals:
+            faulthandler.register(signum, chain=True, file=stderr_fd)
 
     replace_stdout()
     support.record_original_stdout(sys.stdout)
@@ -109,7 +118,17 @@ def replace_stdout():
     """Set stdout encoder error handler to backslashreplace (as stderr error
     handler) to avoid UnicodeEncodeError when printing a traceback"""
     stdout = sys.stdout
-    sys.stdout = open(stdout.fileno(), 'w',
+    try:
+        fd = stdout.fileno()
+    except ValueError:
+        # On IDLE, sys.stdout has no file descriptor and is not a TextIOWrapper
+        # object. Leaving sys.stdout unchanged.
+        #
+        # Catch ValueError to catch io.UnsupportedOperation on TextIOBase
+        # and ValueError on a closed stream.
+        return
+
+    sys.stdout = open(fd, 'w',
         encoding=stdout.encoding,
         errors="backslashreplace",
         closefd=False,


From webhook-mailer at python.org  Fri Oct 13 16:42:29 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 13 Oct 2017 20:42:29 -0000
Subject: [Python-checkins] [3.6] bpo-25588: Fix regrtest when run inside
 IDLE (GH-3962) (#3987)
Message-ID: <mailman.42.1507927351.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/6234e9068332f61f935cf13fa5b1a924a99c28b2
commit: 6234e9068332f61f935cf13fa5b1a924a99c28b2
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-10-13T13:42:27-07:00
summary:

[3.6] bpo-25588: Fix regrtest when run inside IDLE (GH-3962) (#3987)

When regrtest in run inside IDLE, sys.stdout and sys.stderr are not
TextIOWrapper objects and have no file descriptor associated:
sys.stderr.fileno() raises io.UnsupportedOperation.

Disable faulthandler and don't replace sys.stdout in that case.
(cherry picked from commit ccef823939d4ef602f2d8d13d0bfec29eda597a5)

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

diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py
index 1d24531fc26..bf899a9e4d4 100644
--- a/Lib/test/libregrtest/setup.py
+++ b/Lib/test/libregrtest/setup.py
@@ -14,17 +14,26 @@
 
 
 def setup_tests(ns):
-    # Display the Python traceback on fatal errors (e.g. segfault)
-    faulthandler.enable(all_threads=True)
-
-    # Display the Python traceback on SIGALRM or SIGUSR1 signal
-    signals = []
-    if hasattr(signal, 'SIGALRM'):
-        signals.append(signal.SIGALRM)
-    if hasattr(signal, 'SIGUSR1'):
-        signals.append(signal.SIGUSR1)
-    for signum in signals:
-        faulthandler.register(signum, chain=True)
+    try:
+        stderr_fd = sys.__stderr__.fileno()
+    except (ValueError, AttributeError):
+        # Catch ValueError to catch io.UnsupportedOperation on TextIOBase
+        # and ValueError on a closed stream.
+        #
+        # Catch AttributeError for stderr being None.
+        stderr_fd = None
+    else:
+        # Display the Python traceback on fatal errors (e.g. segfault)
+        faulthandler.enable(all_threads=True, file=stderr_fd)
+
+        # Display the Python traceback on SIGALRM or SIGUSR1 signal
+        signals = []
+        if hasattr(signal, 'SIGALRM'):
+            signals.append(signal.SIGALRM)
+        if hasattr(signal, 'SIGUSR1'):
+            signals.append(signal.SIGUSR1)
+        for signum in signals:
+            faulthandler.register(signum, chain=True, file=stderr_fd)
 
     replace_stdout()
     support.record_original_stdout(sys.stdout)
@@ -109,7 +118,17 @@ def replace_stdout():
     """Set stdout encoder error handler to backslashreplace (as stderr error
     handler) to avoid UnicodeEncodeError when printing a traceback"""
     stdout = sys.stdout
-    sys.stdout = open(stdout.fileno(), 'w',
+    try:
+        fd = stdout.fileno()
+    except ValueError:
+        # On IDLE, sys.stdout has no file descriptor and is not a TextIOWrapper
+        # object. Leaving sys.stdout unchanged.
+        #
+        # Catch ValueError to catch io.UnsupportedOperation on TextIOBase
+        # and ValueError on a closed stream.
+        return
+
+    sys.stdout = open(fd, 'w',
         encoding=stdout.encoding,
         errors="backslashreplace",
         closefd=False,


From webhook-mailer at python.org  Fri Oct 13 16:46:59 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 13 Oct 2017 20:46:59 -0000
Subject: [Python-checkins] os.startfile(): add a C comment on security
 (#3877)
Message-ID: <mailman.43.1507927621.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/a99121526a14e7710843aa5dd6ac82a779542dfb
commit: a99121526a14e7710843aa5dd6ac82a779542dfb
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-13T13:46:57-07:00
summary:

os.startfile(): add a C comment on security (#3877)

LoadLibrary("SHELL32") is not vulnerable to DLL hijacking.

files:
M Modules/posixmodule.c

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 5f30b202ec6..639e45021f2 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -10556,6 +10556,10 @@ check_ShellExecute()
     /* only recheck */
     if (-1 == has_ShellExecute) {
         Py_BEGIN_ALLOW_THREADS
+        /* Security note: this call is not vulnerable to "DLL hijacking".
+           SHELL32 is part of "KnownDLLs" and so Windows always load
+           the system SHELL32.DLL, even if there is another SHELL32.DLL
+           in the DLL search path. */
         hShell32 = LoadLibraryW(L"SHELL32");
         Py_END_ALLOW_THREADS
         if (hShell32) {


From webhook-mailer at python.org  Fri Oct 13 16:47:51 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 13 Oct 2017 20:47:51 -0000
Subject: [Python-checkins] bpo-31676: Fix test_imp.test_load_source() side
 effect (#3871)
Message-ID: <mailman.44.1507927672.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/a505ecdc5013cd8f930aacc1ec4fb2afa62d3853
commit: a505ecdc5013cd8f930aacc1ec4fb2afa62d3853
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-13T13:47:49-07:00
summary:

bpo-31676: Fix test_imp.test_load_source() side effect (#3871)

test_load_source() now replaces the current __name__ module with a
temporary module to prevent side effects.

files:
M Lib/test/test_imp.py

diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
index 51bec50cc2f..1ef0accf0f3 100644
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -310,8 +310,13 @@ def test_multiple_calls_to_get_data(self):
         loader.get_data(imp.__file__)  # Will need to create a newly opened file
 
     def test_load_source(self):
-        with self.assertRaisesRegex(ValueError, 'embedded null'):
-            imp.load_source(__name__, __file__ + "\0")
+        # Create a temporary module since load_source(name) modifies
+        # sys.modules[name] attributes like __loader___
+        modname = f"tmp{__name__}"
+        mod = type(sys.modules[__name__])(modname)
+        with support.swap_item(sys.modules, modname, mod):
+            with self.assertRaisesRegex(ValueError, 'embedded null'):
+                imp.load_source(modname, __file__ + "\0")
 
     @support.cpython_only
     def test_issue31315(self):


From webhook-mailer at python.org  Fri Oct 13 16:49:45 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 13 Oct 2017 20:49:45 -0000
Subject: [Python-checkins] bpo-30807: signal.setitimer() now uses _PyTime
 API (GH-3865)
Message-ID: <mailman.45.1507927787.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/ef611c96eab0ab667ebb43fdf429b319f6d99890
commit: ef611c96eab0ab667ebb43fdf429b319f6d99890
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-13T13:49:43-07:00
summary:

bpo-30807: signal.setitimer() now uses _PyTime API (GH-3865)

The _PyTime API handles detects overflow and is well tested.

Document that the signal will only be sent once if internal is equal
to zero.

files:
M Doc/library/signal.rst
M Modules/clinic/signalmodule.c.h
M Modules/signalmodule.c

diff --git a/Doc/library/signal.rst b/Doc/library/signal.rst
index 46d71def08a..2bc39d9f133 100644
--- a/Doc/library/signal.rst
+++ b/Doc/library/signal.rst
@@ -273,13 +273,14 @@ The :mod:`signal` module defines the following functions:
    .. versionadded:: 3.3
 
 
-.. function:: setitimer(which, seconds[, interval])
+.. function:: setitimer(which, seconds, interval=0.0)
 
    Sets given interval timer (one of :const:`signal.ITIMER_REAL`,
    :const:`signal.ITIMER_VIRTUAL` or :const:`signal.ITIMER_PROF`) specified
    by *which* to fire after *seconds* (float is accepted, different from
-   :func:`alarm`) and after that every *interval* seconds. The interval
-   timer specified by *which* can be cleared by setting seconds to zero.
+   :func:`alarm`) and after that every *interval* seconds (if *interval*
+   is non-zero). The interval timer specified by *which* can be cleared by
+   setting *seconds* to zero.
 
    When an interval timer fires, a signal is sent to the process.
    The signal sent is dependent on the timer being used;
diff --git a/Modules/clinic/signalmodule.c.h b/Modules/clinic/signalmodule.c.h
index a4542cc45a0..cc3e64002bc 100644
--- a/Modules/clinic/signalmodule.c.h
+++ b/Modules/clinic/signalmodule.c.h
@@ -182,18 +182,18 @@ PyDoc_STRVAR(signal_setitimer__doc__,
     {"setitimer", (PyCFunction)signal_setitimer, METH_FASTCALL, signal_setitimer__doc__},
 
 static PyObject *
-signal_setitimer_impl(PyObject *module, int which, double seconds,
-                      double interval);
+signal_setitimer_impl(PyObject *module, int which, PyObject *seconds,
+                      PyObject *interval);
 
 static PyObject *
 signal_setitimer(PyObject *module, PyObject **args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int which;
-    double seconds;
-    double interval = 0.0;
+    PyObject *seconds;
+    PyObject *interval = NULL;
 
-    if (!_PyArg_ParseStack(args, nargs, "id|d:setitimer",
+    if (!_PyArg_ParseStack(args, nargs, "iO|O:setitimer",
         &which, &seconds, &interval)) {
         goto exit;
     }
@@ -440,4 +440,4 @@ signal_pthread_kill(PyObject *module, PyObject **args, Py_ssize_t nargs)
 #ifndef SIGNAL_PTHREAD_KILL_METHODDEF
     #define SIGNAL_PTHREAD_KILL_METHODDEF
 #endif /* !defined(SIGNAL_PTHREAD_KILL_METHODDEF) */
-/*[clinic end generated code: output=3f6e6298696f1b75 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=a003d3fea9a33daa input=a9049054013a1b77]*/
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index 66331088176..d470727fb62 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -131,16 +131,21 @@ static HANDLE sigint_event = NULL;
 #ifdef HAVE_GETITIMER
 static PyObject *ItimerError;
 
-/* auxiliary functions for setitimer/getitimer */
-static void
-timeval_from_double(double d, struct timeval *tv)
+/* auxiliary functions for setitimer */
+static int
+timeval_from_double(PyObject *obj, struct timeval *tv)
 {
-    tv->tv_sec = floor(d);
-    tv->tv_usec = fmod(d, 1.0) * 1000000.0;
-    /* Don't disable the timer if the computation above rounds down to zero. */
-    if (d > 0.0 && tv->tv_sec == 0 && tv->tv_usec == 0) {
-        tv->tv_usec = 1;
+    if (obj == NULL) {
+        tv->tv_sec = 0;
+        tv->tv_usec = 0;
+        return 0;
+    }
+
+    _PyTime_t t;
+    if (_PyTime_FromSecondsObject(&t, obj, _PyTime_ROUND_CEILING) < 0) {
+        return -1;
     }
+    return _PyTime_AsTimeval(t, tv, _PyTime_ROUND_CEILING);
 }
 
 Py_LOCAL_INLINE(double)
@@ -677,8 +682,8 @@ PySignal_SetWakeupFd(int fd)
 signal.setitimer
 
     which:    int
-    seconds:  double
-    interval: double = 0.0
+    seconds:  object
+    interval: object(c_default="NULL") = 0.0
     /
 
 Sets given itimer (one of ITIMER_REAL, ITIMER_VIRTUAL or ITIMER_PROF).
@@ -690,14 +695,19 @@ Returns old values as a tuple: (delay, interval).
 [clinic start generated code]*/
 
 static PyObject *
-signal_setitimer_impl(PyObject *module, int which, double seconds,
-                      double interval)
-/*[clinic end generated code: output=6f51da0fe0787f2c input=0d27d417cfcbd51a]*/
+signal_setitimer_impl(PyObject *module, int which, PyObject *seconds,
+                      PyObject *interval)
+/*[clinic end generated code: output=65f9dcbddc35527b input=de43daf194e6f66f]*/
 {
     struct itimerval new, old;
 
-    timeval_from_double(seconds, &new.it_value);
-    timeval_from_double(interval, &new.it_interval);
+    if (timeval_from_double(seconds, &new.it_value) < 0) {
+        return NULL;
+    }
+    if (timeval_from_double(interval, &new.it_interval) < 0) {
+        return NULL;
+    }
+
     /* Let OS check "which" value */
     if (setitimer(which, &new, &old) != 0) {
         PyErr_SetFromErrno(ItimerError);


From webhook-mailer at python.org  Sat Oct 14 01:22:06 2017
From: webhook-mailer at python.org (INADA Naoki)
Date: Sat, 14 Oct 2017 05:22:06 -0000
Subject: [Python-checkins] bpo-31672: Fix string.Template accidentally
 matched non-ASCII identifiers (GH-3872)
Message-ID: <mailman.46.1507958527.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/7060380d577690a40ebc201c0725076349e977cd
commit: 7060380d577690a40ebc201c0725076349e977cd
branch: 3.6
author: INADA Naoki <methane at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-10-14T14:21:59+09:00
summary:

bpo-31672: Fix string.Template accidentally matched non-ASCII identifiers (GH-3872)

Pattern `[a-z]` with `IGNORECASE` flag can match to some non-ASCII characters.

Straightforward solution for this is using `IGNORECASE | ASCII` flag.
But users may subclass `Template` and override only `idpattern`. So we want to
avoid changing `Template.flags`.

So this commit uses local flag `-i` for `idpattern` and change `[a-z]` to `[a-zA-Z]`.
(cherry picked from commit b22273ec5d1992b0cbe078b887427ae9977dfb78)

files:
A Misc/NEWS.d/next/Library/2017-10-12-02-47-16.bpo-31672.DaOkVd.rst
M Doc/library/string.rst
M Lib/string.py
M Lib/test/test_string.py

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index a0977b64613..7a9fcc38bbd 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -746,8 +746,18 @@ to parse template strings.  To do this, you can override these class attributes:
 
 * *idpattern* -- This is the regular expression describing the pattern for
   non-braced placeholders (the braces will be added automatically as
-  appropriate).  The default value is the regular expression
-  ``[_a-z][_a-z0-9]*``.
+  appropriate). The default value is the regular expression
+  ``(?-i:[_a-zA-Z][_a-zA-Z0-9]*)``.
+
+  .. note::
+
+     Since default *flags* is ``re.IGNORECASE``, pattern ``[a-z]`` can match
+     with some non-ASCII characters. That's why we use local ``-i`` flag here.
+
+     While *flags* is kept to ``re.IGNORECASE`` for backward compatibility,
+     you can override it to ``0`` or ``re.IGNORECASE | re.ASCII`` when
+     subclassing.
+
 
 * *flags* -- The regular expression flags that will be applied when compiling
   the regular expression used for recognizing substitutions.  The default value
diff --git a/Lib/string.py b/Lib/string.py
index c9020076437..670c1951a8a 100644
--- a/Lib/string.py
+++ b/Lib/string.py
@@ -78,7 +78,11 @@ class Template(metaclass=_TemplateMetaclass):
     """A string class for supporting $-substitutions."""
 
     delimiter = '$'
-    idpattern = r'[_a-z][_a-z0-9]*'
+    # r'[a-z]' matches to non-ASCII letters when used with IGNORECASE,
+    # but without ASCII flag.  We can't add re.ASCII to flags because of
+    # backward compatibility.  So we use local -i flag and [a-zA-Z] pattern.
+    # See https://bugs.python.org/issue31672
+    idpattern = r'(?-i:[_a-zA-Z][_a-zA-Z0-9]*)'
     flags = _re.IGNORECASE
 
     def __init__(self, template):
diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py
index 70439f85c89..8db23e76c1c 100644
--- a/Lib/test/test_string.py
+++ b/Lib/test/test_string.py
@@ -271,6 +271,12 @@ def test_invalid_placeholders(self):
         raises(ValueError, s.substitute, dict(who='tim'))
         s = Template('$who likes $100')
         raises(ValueError, s.substitute, dict(who='tim'))
+        # Template.idpattern should match to only ASCII characters.
+        # https://bugs.python.org/issue31672
+        s = Template("$who likes $\u0131")  # (DOTLESS I)
+        raises(ValueError, s.substitute, dict(who='tim'))
+        s = Template("$who likes $\u0130")  # (LATIN CAPITAL LETTER I WITH DOT ABOVE)
+        raises(ValueError, s.substitute, dict(who='tim'))
 
     def test_idpattern_override(self):
         class PathPattern(Template):
diff --git a/Misc/NEWS.d/next/Library/2017-10-12-02-47-16.bpo-31672.DaOkVd.rst b/Misc/NEWS.d/next/Library/2017-10-12-02-47-16.bpo-31672.DaOkVd.rst
new file mode 100644
index 00000000000..b8de1f3b1db
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-12-02-47-16.bpo-31672.DaOkVd.rst
@@ -0,0 +1,2 @@
+``idpattern`` in ``string.Template`` matched some non-ASCII characters. Now
+it uses ``-i`` regular expression local flag to avoid non-ASCII characters.


From webhook-mailer at python.org  Sat Oct 14 04:14:33 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sat, 14 Oct 2017 08:14:33 -0000
Subject: [Python-checkins] bpo-31714: Improved regular expression
 documentation. (#3907)
Message-ID: <mailman.47.1507968875.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/cd195e2a7ac5c9b2574d5462752b7939641de4a9
commit: cd195e2a7ac5c9b2574d5462752b7939641de4a9
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-14T11:14:26+03:00
summary:

bpo-31714: Improved regular expression documentation. (#3907)

files:
M Doc/howto/regex.rst
M Doc/library/re.rst

diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
index 3121a9ffb82..e8466ee5423 100644
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -153,8 +153,8 @@ These sequences can be included inside a character class.  For example,
 ``','`` or ``'.'``.
 
 The final metacharacter in this section is ``.``.  It matches anything except a
-newline character, and there's an alternate mode (``re.DOTALL``) where it will
-match even a newline.  ``'.'`` is often used where you want to match "any
+newline character, and there's an alternate mode (:const:`re.DOTALL`) where it will
+match even a newline.  ``.`` is often used where you want to match "any
 character".
 
 
@@ -168,14 +168,11 @@ wouldn't be much of an advance. Another capability is that you can specify that
 portions of the RE must be repeated a certain number of times.
 
 The first metacharacter for repeating things that we'll look at is ``*``.  ``*``
-doesn't match the literal character ``*``; instead, it specifies that the
+doesn't match the literal character ``'*'``; instead, it specifies that the
 previous character can be matched zero or more times, instead of exactly once.
 
-For example, ``ca*t`` will match ``ct`` (0 ``a`` characters), ``cat`` (1 ``a``),
-``caaat`` (3 ``a`` characters), and so forth.  The RE engine has various
-internal limitations stemming from the size of C's ``int`` type that will
-prevent it from matching over 2 billion ``a`` characters; patterns
-are usually not written to match that much data.
+For example, ``ca*t`` will match ``'ct'`` (0 ``'a'`` characters), ``'cat'`` (1 ``'a'``),
+``'caaat'`` (3 ``'a'`` characters), and so forth.
 
 Repetitions such as ``*`` are :dfn:`greedy`; when repeating a RE, the matching
 engine will try to repeat it as many times as possible. If later portions of the
@@ -185,7 +182,7 @@ fewer repetitions.
 A step-by-step example will make this more obvious.  Let's consider the
 expression ``a[bcd]*b``.  This matches the letter ``'a'``, zero or more letters
 from the class ``[bcd]``, and finally ends with a ``'b'``.  Now imagine matching
-this RE against the string ``abcbd``.
+this RE against the string ``'abcbd'``.
 
 +------+-----------+---------------------------------+
 | Step | Matched   | Explanation                     |
@@ -218,7 +215,7 @@ this RE against the string ``abcbd``.
 |      |           | it succeeds.                    |
 +------+-----------+---------------------------------+
 
-The end of the RE has now been reached, and it has matched ``abcb``.  This
+The end of the RE has now been reached, and it has matched ``'abcb'``.  This
 demonstrates how the matching engine goes as far as it can at first, and if no
 match is found it will then progressively back up and retry the rest of the RE
 again and again.  It will back up until it has tried zero matches for
@@ -229,24 +226,23 @@ Another repeating metacharacter is ``+``, which matches one or more times.  Pay
 careful attention to the difference between ``*`` and ``+``; ``*`` matches
 *zero* or more times, so whatever's being repeated may not be present at all,
 while ``+`` requires at least *one* occurrence.  To use a similar example,
-``ca+t`` will match ``cat`` (1 ``a``), ``caaat`` (3 ``a``'s), but won't match
-``ct``.
+``ca+t`` will match ``'cat'`` (1 ``'a'``), ``'caaat'`` (3 ``'a'``\ s), but won't
+match ``'ct'``.
 
 There are two more repeating qualifiers.  The question mark character, ``?``,
 matches either once or zero times; you can think of it as marking something as
-being optional.  For example, ``home-?brew`` matches either ``homebrew`` or
-``home-brew``.
+being optional.  For example, ``home-?brew`` matches either ``'homebrew'`` or
+``'home-brew'``.
 
 The most complicated repeated qualifier is ``{m,n}``, where *m* and *n* are
 decimal integers.  This qualifier means there must be at least *m* repetitions,
-and at most *n*.  For example, ``a/{1,3}b`` will match ``a/b``, ``a//b``, and
-``a///b``.  It won't match ``ab``, which has no slashes, or ``a////b``, which
+and at most *n*.  For example, ``a/{1,3}b`` will match ``'a/b'``, ``'a//b'``, and
+``'a///b'``.  It won't match ``'ab'``, which has no slashes, or ``'a////b'``, which
 has four.
 
 You can omit either *m* or *n*; in that case, a reasonable value is assumed for
 the missing value.  Omitting *m* is interpreted as a lower limit of 0, while
-omitting *n* results in an upper bound of infinity --- actually, the upper bound
-is the 2-billion limit mentioned earlier, but that might as well be infinity.
+omitting *n* results in an upper bound of infinity.
 
 Readers of a reductionist bent may notice that the three other qualifiers can
 all be expressed using this notation.  ``{0,}`` is the same as ``*``, ``{1,}``
@@ -366,7 +362,7 @@ for a complete listing.
 |                  | returns them as an :term:`iterator`.          |
 +------------------+-----------------------------------------------+
 
-:meth:`~re.regex.match` and :meth:`~re.regex.search` return ``None`` if no match can be found.  If
+:meth:`~re.Pattern.match` and :meth:`~re.Pattern.search` return ``None`` if no match can be found.  If
 they're successful, a :ref:`match object <match-objects>` instance is returned,
 containing information about the match: where it starts and ends, the substring
 it matched, and more.
@@ -388,24 +384,24 @@ Python interpreter, import the :mod:`re` module, and compile a RE::
 
 Now, you can try matching various strings against the RE ``[a-z]+``.  An empty
 string shouldn't match at all, since ``+`` means 'one or more repetitions'.
-:meth:`match` should return ``None`` in this case, which will cause the
+:meth:`~re.Pattern.match` should return ``None`` in this case, which will cause the
 interpreter to print no output.  You can explicitly print the result of
-:meth:`match` to make this clear. ::
+:meth:`!match` to make this clear. ::
 
    >>> p.match("")
    >>> print(p.match(""))
    None
 
 Now, let's try it on a string that it should match, such as ``tempo``.  In this
-case, :meth:`match` will return a :ref:`match object <match-objects>`, so you
+case, :meth:`~re.Pattern.match` will return a :ref:`match object <match-objects>`, so you
 should store the result in a variable for later use. ::
 
    >>> m = p.match('tempo')
-   >>> m  #doctest: +ELLIPSIS
+   >>> m
    <re.Match object; span=(0, 5), match='tempo'>
 
 Now you can query the :ref:`match object <match-objects>` for information
-about the matching string.  :ref:`match object <match-objects>` instances
+about the matching string.  Match object instances
 also have several methods and attributes; the most important ones are:
 
 +------------------+--------------------------------------------+
@@ -430,17 +426,17 @@ Trying these methods will soon clarify their meaning::
    >>> m.span()
    (0, 5)
 
-:meth:`~re.match.group` returns the substring that was matched by the RE.  :meth:`~re.match.start`
-and :meth:`~re.match.end` return the starting and ending index of the match. :meth:`~re.match.span`
-returns both start and end indexes in a single tuple.  Since the :meth:`match`
-method only checks if the RE matches at the start of a string, :meth:`start`
-will always be zero.  However, the :meth:`search` method of patterns
+:meth:`~re.Match.group` returns the substring that was matched by the RE.  :meth:`~re.Match.start`
+and :meth:`~re.Match.end` return the starting and ending index of the match. :meth:`~re.Match.span`
+returns both start and end indexes in a single tuple.  Since the :meth:`~re.Pattern.match`
+method only checks if the RE matches at the start of a string, :meth:`!start`
+will always be zero.  However, the :meth:`~re.Pattern.search` method of patterns
 scans through the string, so  the match may not start at zero in that
 case. ::
 
    >>> print(p.match('::: message'))
    None
-   >>> m = p.search('::: message'); print(m)  #doctest: +ELLIPSIS
+   >>> m = p.search('::: message'); print(m)
    <re.Match object; span=(4, 11), match='message'>
    >>> m.group()
    'message'
@@ -459,14 +455,14 @@ In actual programs, the most common style is to store the
        print('No match')
 
 Two pattern methods return all of the matches for a pattern.
-:meth:`~re.regex.findall` returns a list of matching strings::
+:meth:`~re.Pattern.findall` returns a list of matching strings::
 
    >>> p = re.compile('\d+')
    >>> p.findall('12 drummers drumming, 11 pipers piping, 10 lords a-leaping')
    ['12', '11', '10']
 
-:meth:`findall` has to create the entire list before it can be returned as the
-result.  The :meth:`~re.regex.finditer` method returns a sequence of
+:meth:`~re.Pattern.findall` has to create the entire list before it can be returned as the
+result.  The :meth:`~re.Pattern.finditer` method returns a sequence of
 :ref:`match object <match-objects>` instances as an :term:`iterator`::
 
    >>> iterator = p.finditer('12 drummers drumming, 11 ... 10 ...')
@@ -529,14 +525,14 @@ of each one.
 |                                 | characters with the respective property.   |
 +---------------------------------+--------------------------------------------+
 | :const:`DOTALL`, :const:`S`     | Make ``.`` match any character, including  |
-|                                 | newlines                                   |
+|                                 | newlines.                                  |
 +---------------------------------+--------------------------------------------+
-| :const:`IGNORECASE`, :const:`I` | Do case-insensitive matches                |
+| :const:`IGNORECASE`, :const:`I` | Do case-insensitive matches.               |
 +---------------------------------+--------------------------------------------+
-| :const:`LOCALE`, :const:`L`     | Do a locale-aware match                    |
+| :const:`LOCALE`, :const:`L`     | Do a locale-aware match.                   |
 +---------------------------------+--------------------------------------------+
 | :const:`MULTILINE`, :const:`M`  | Multi-line matching, affecting ``^`` and   |
-|                                 | ``$``                                      |
+|                                 | ``$``.                                     |
 +---------------------------------+--------------------------------------------+
 | :const:`VERBOSE`, :const:`X`    | Enable verbose REs, which can be organized |
 | (for 'extended')                | more cleanly and understandably.           |
@@ -549,27 +545,41 @@ of each one.
 
    Perform case-insensitive matching; character class and literal strings will
    match letters by ignoring case.  For example, ``[A-Z]`` will match lowercase
-   letters, too, and ``Spam`` will match ``Spam``, ``spam``, or ``spAM``. This
-   lowercasing doesn't take the current locale into account; it will if you also
-   set the :const:`LOCALE` flag.
+   letters, too. Full Unicode matching also works unless the :const:`ASCII`
+   flag is used to disable non-ASCII matches.  When the Unicode patterns
+   ``[a-z]`` or ``[A-Z]`` are used in combination with the :const:`IGNORECASE`
+   flag, they will match the 52 ASCII letters and 4 additional non-ASCII
+   letters: '?' (U+0130, Latin capital letter I with dot above), '?' (U+0131,
+   Latin small letter dotless i), '?' (U+017F, Latin small letter long s) and
+   '?' (U+212A, Kelvin sign).  ``Spam`` will match ``'Spam'``, ``'spam'``,
+   ``'spAM'``, or ``'?pam'`` (the latter is matched only in Unicode mode).
+   This lowercasing doesn't take the current locale into account;
+   it will if you also set the :const:`LOCALE` flag.
 
 
 .. data:: L
           LOCALE
    :noindex:
 
-   Make ``\w``, ``\W``, ``\b``, and ``\B``, dependent on the current locale
-   instead of the Unicode database.
-
-   Locales are a feature of the C library intended to help in writing programs that
-   take account of language differences.  For example, if you're processing French
-   text, you'd want to be able to write ``\w+`` to match words, but ``\w`` only
-   matches the character class ``[A-Za-z]``; it won't match ``'?'`` or ``'?'``.  If
-   your system is configured properly and a French locale is selected, certain C
-   functions will tell the program that ``'?'`` should also be considered a letter.
+   Make ``\w``, ``\W``, ``\b``, ``\B`` and case-insensitive matching dependent
+   on the current locale instead of the Unicode database.
+
+   Locales are a feature of the C library intended to help in writing programs
+   that take account of language differences.  For example, if you're
+   processing encoded French text, you'd want to be able to write ``\w+`` to
+   match words, but ``\w`` only matches the character class ``[A-Za-z]`` in
+   bytes patterns; it won't match bytes corresponding to ``?`` or ``?``.
+   If your system is configured properly and a French locale is selected,
+   certain C functions will tell the program that the byte corresponding to
+   ``?`` should also be considered a letter.
    Setting the :const:`LOCALE` flag when compiling a regular expression will cause
    the resulting compiled object to use these C functions for ``\w``; this is
    slower, but also enables ``\w+`` to match French words as you'd expect.
+   The use of this flag is discouraged in Python 3 as the locale mechanism
+   is very unreliable, it only handles one "culture" at a time, and it only
+   works with 8-bit locales.  Unicode matching is already enabled by default
+   in Python 3 for Unicode (str) patterns, and it is able to handle different
+   locales/languages.
 
 
 .. data:: M
@@ -667,11 +677,11 @@ zero-width assertions should never be repeated, because if they match once at a
 given location, they can obviously be matched an infinite number of times.
 
 ``|``
-   Alternation, or the "or" operator.   If A and B are regular expressions,
-   ``A|B`` will match any string that matches either ``A`` or ``B``. ``|`` has very
+   Alternation, or the "or" operator.   If *A* and *B* are regular expressions,
+   ``A|B`` will match any string that matches either *A* or *B*. ``|`` has very
    low precedence in order to make it work reasonably when you're alternating
-   multi-character strings. ``Crow|Servo`` will match either ``Crow`` or ``Servo``,
-   not ``Cro``, a ``'w'`` or an ``'S'``, and ``ervo``.
+   multi-character strings. ``Crow|Servo`` will match either ``'Crow'`` or ``'Servo'``,
+   not ``'Cro'``, a ``'w'`` or an ``'S'``, and ``'ervo'``.
 
    To match a literal ``'|'``, use ``\|``, or enclose it inside a character class,
    as in ``[|]``.
@@ -689,8 +699,7 @@ given location, they can obviously be matched an infinite number of times.
       >>> print(re.search('^From', 'Reciting From Memory'))
       None
 
-   .. To match a literal \character{\^}, use \regexp{\e\^} or enclose it
-   .. inside a character class, as in \regexp{[{\e}\^]}.
+   To match a literal ``'^'``, use ``\^``.
 
 ``$``
    Matches at the end of a line, which is defined as either the end of the string,
@@ -725,7 +734,7 @@ given location, they can obviously be matched an infinite number of times.
    match when it's contained inside another word. ::
 
       >>> p = re.compile(r'\bclass\b')
-      >>> print(p.search('no class at all'))  #doctest: +ELLIPSIS
+      >>> print(p.search('no class at all'))
       <re.Match object; span=(3, 8), match='class'>
       >>> print(p.search('the declassified algorithm'))
       None
@@ -743,7 +752,7 @@ given location, they can obviously be matched an infinite number of times.
       >>> p = re.compile('\bclass\b')
       >>> print(p.search('no class at all'))
       None
-      >>> print(p.search('\b' + 'class' + '\b'))  #doctest: +ELLIPSIS
+      >>> print(p.search('\b' + 'class' + '\b'))
       <re.Match object; span=(0, 7), match='\x08class\x08'>
 
    Second, inside a character class, where there's no use for this assertion,
@@ -786,7 +795,8 @@ of a group with a repeating qualifier, such as ``*``, ``+``, ``?``, or
 
 Groups indicated with ``'('``, ``')'`` also capture the starting and ending
 index of the text that they match; this can be retrieved by passing an argument
-to :meth:`group`, :meth:`start`, :meth:`end`, and :meth:`span`.  Groups are
+to :meth:`~re.Match.group`, :meth:`~re.Match.start`, :meth:`~re.Match.end`, and
+:meth:`~re.Match.span`.  Groups are
 numbered starting with 0.  Group 0 is always present; it's the whole RE, so
 :ref:`match object <match-objects>` methods all have group 0 as their default
 argument.  Later we'll see how to express groups that don't capture the span
@@ -812,13 +822,13 @@ from left to right. ::
    >>> m.group(2)
    'b'
 
-:meth:`group` can be passed multiple group numbers at a time, in which case it
+:meth:`~re.Match.group` can be passed multiple group numbers at a time, in which case it
 will return a tuple containing the corresponding values for those groups. ::
 
    >>> m.group(2,1,2)
    ('b', 'abc', 'b')
 
-The :meth:`groups` method returns a tuple containing the strings for all the
+The :meth:`~re.Match.groups` method returns a tuple containing the strings for all the
 subgroups, from 1 up to however many there are. ::
 
    >>> m.groups()
@@ -1034,7 +1044,7 @@ using the following pattern methods:
 | ``sub()``        | Find all substrings where the RE matches, and |
 |                  | replace them with a different string          |
 +------------------+-----------------------------------------------+
-| ``subn()``       | Does the same thing as :meth:`sub`,  but      |
+| ``subn()``       | Does the same thing as :meth:`!sub`,  but     |
 |                  | returns the new string and the number of      |
 |                  | replacements                                  |
 +------------------+-----------------------------------------------+
@@ -1043,10 +1053,10 @@ using the following pattern methods:
 Splitting Strings
 -----------------
 
-The :meth:`split` method of a pattern splits a string apart
+The :meth:`~re.Pattern.split` method of a pattern splits a string apart
 wherever the RE matches, returning a list of the pieces. It's similar to the
-:meth:`split` method of strings but provides much more generality in the
-delimiters that you can split by; string :meth:`split` only supports splitting by
+:meth:`~str.split` method of strings but provides much more generality in the
+delimiters that you can split by; string :meth:`!split` only supports splitting by
 whitespace or by a fixed string.  As you'd expect, there's a module-level
 :func:`re.split` function, too.
 
@@ -1098,7 +1108,7 @@ Search and Replace
 ------------------
 
 Another common task is to find all the matches for a pattern, and replace them
-with a different string.  The :meth:`sub` method takes a replacement value,
+with a different string.  The :meth:`~re.Pattern.sub` method takes a replacement value,
 which can be either a string or a function, and the string to be processed.
 
 .. method:: .sub(replacement, string[, count=0])
@@ -1112,7 +1122,7 @@ which can be either a string or a function, and the string to be processed.
    replaced; *count* must be a non-negative integer.  The default value of 0 means
    to replace all occurrences.
 
-Here's a simple example of using the :meth:`sub` method.  It replaces colour
+Here's a simple example of using the :meth:`~re.Pattern.sub` method.  It replaces colour
 names with the word ``colour``::
 
    >>> p = re.compile('(blue|white|red)')
@@ -1121,7 +1131,7 @@ names with the word ``colour``::
    >>> p.sub('colour', 'blue socks and red shoes', count=1)
    'colour socks and red shoes'
 
-The :meth:`subn` method does the same work, but returns a 2-tuple containing the
+The :meth:`~re.Pattern.subn` method does the same work, but returns a 2-tuple containing the
 new string value and the number of replacements  that were performed::
 
    >>> p = re.compile('(blue|white|red)')
@@ -1206,24 +1216,24 @@ Use String Methods
 
 Sometimes using the :mod:`re` module is a mistake.  If you're matching a fixed
 string, or a single character class, and you're not using any :mod:`re` features
-such as the :const:`IGNORECASE` flag, then the full power of regular expressions
+such as the :const:`~re.IGNORECASE` flag, then the full power of regular expressions
 may not be required. Strings have several methods for performing operations with
 fixed strings and they're usually much faster, because the implementation is a
 single small C loop that's been optimized for the purpose, instead of the large,
 more generalized regular expression engine.
 
 One example might be replacing a single fixed string with another one; for
-example, you might replace ``word`` with ``deed``.  ``re.sub()`` seems like the
-function to use for this, but consider the :meth:`replace` method.  Note that
-:func:`replace` will also replace ``word`` inside words, turning ``swordfish``
+example, you might replace ``word`` with ``deed``.  :func:`re.sub` seems like the
+function to use for this, but consider the :meth:`~str.replace` method.  Note that
+:meth:`!replace` will also replace ``word`` inside words, turning ``swordfish``
 into ``sdeedfish``, but the  naive RE ``word`` would have done that, too.  (To
 avoid performing the substitution on parts of words, the pattern would have to
 be ``\bword\b``, in order to require that ``word`` have a word boundary on
-either side.  This takes the job beyond  :meth:`replace`'s abilities.)
+either side.  This takes the job beyond  :meth:`!replace`'s abilities.)
 
 Another common task is deleting every occurrence of a single character from a
 string or replacing it with another single character.  You might do this with
-something like ``re.sub('\n', ' ', S)``, but :meth:`translate` is capable of
+something like ``re.sub('\n', ' ', S)``, but :meth:`~str.translate` is capable of
 doing both tasks and will be faster than any regular expression operation can
 be.
 
@@ -1234,18 +1244,18 @@ can be solved with a faster and simpler string method.
 match() versus search()
 -----------------------
 
-The :func:`match` function only checks if the RE matches at the beginning of the
-string while :func:`search` will scan forward through the string for a match.
-It's important to keep this distinction in mind.  Remember,  :func:`match` will
+The :func:`~re.match` function only checks if the RE matches at the beginning of the
+string while :func:`~re.search` will scan forward through the string for a match.
+It's important to keep this distinction in mind.  Remember,  :func:`!match` will
 only report a successful match which will start at 0; if the match wouldn't
-start at zero,  :func:`match` will *not* report it. ::
+start at zero,  :func:`!match` will *not* report it. ::
 
    >>> print(re.match('super', 'superstition').span())
    (0, 5)
    >>> print(re.match('super', 'insuperable'))
    None
 
-On the other hand, :func:`search` will scan forward through the string,
+On the other hand, :func:`~re.search` will scan forward through the string,
 reporting the first match it finds. ::
 
    >>> print(re.search('super', 'superstition').span())
@@ -1284,12 +1294,12 @@ doesn't work because of the greedy nature of ``.*``. ::
    >>> print(re.match('<.*>', s).group())
    <html><head><title>Title</title>
 
-The RE matches the ``'<'`` in ``<html>``, and the ``.*`` consumes the rest of
+The RE matches the ``'<'`` in ``'<html>'``, and the ``.*`` consumes the rest of
 the string.  There's still more left in the RE, though, and the ``>`` can't
 match at the end of the string, so the regular expression engine has to
 backtrack character by character until it finds a match for the ``>``.   The
-final match extends from the ``'<'`` in ``<html>`` to the ``'>'`` in
-``</title>``, which isn't what you want.
+final match extends from the ``'<'`` in ``'<html>'`` to the ``'>'`` in
+``'</title>'``, which isn't what you want.
 
 In this case, the solution is to use the non-greedy qualifiers ``*?``, ``+?``,
 ``??``, or ``{m,n}?``, which match as *little* text as possible.  In the above
@@ -1315,7 +1325,7 @@ notation, but they're not terribly readable.  REs of moderate complexity can
 become lengthy collections of backslashes, parentheses, and metacharacters,
 making them difficult to read and understand.
 
-For such REs, specifying the ``re.VERBOSE`` flag when compiling the regular
+For such REs, specifying the :const:`re.VERBOSE` flag when compiling the regular
 expression can be helpful, because it allows you to format the regular
 expression more clearly.
 
@@ -1354,5 +1364,5 @@ Friedl's Mastering Regular Expressions, published by O'Reilly.  Unfortunately,
 it exclusively concentrates on Perl and Java's flavours of regular expressions,
 and doesn't contain any Python material at all, so it won't be useful as a
 reference for programming in Python.  (The first edition covered Python's
-now-removed :mod:`regex` module, which won't help you much.)  Consider checking
+now-removed :mod:`!regex` module, which won't help you much.)  Consider checking
 it out from your library.
diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index 7efdd5d9d65..3dd3a0f80d2 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -14,8 +14,9 @@
 This module provides regular expression matching operations similar to
 those found in Perl.
 
-Both patterns and strings to be searched can be Unicode strings as well as
-8-bit strings. However, Unicode strings and 8-bit strings cannot be mixed:
+Both patterns and strings to be searched can be Unicode strings (:class:`str`)
+as well as 8-bit strings (:class:`bytes`).
+However, Unicode strings and 8-bit strings cannot be mixed:
 that is, you cannot match a Unicode string with a byte pattern or
 vice-versa; similarly, when asking for a substitution, the replacement
 string must be of the same type as both the pattern and the search string.
@@ -81,9 +82,7 @@ strings to be matched ``'in single quotes'``.)
 
 Some characters, like ``'|'`` or ``'('``, are special. Special
 characters either stand for classes of ordinary characters, or affect
-how the regular expressions around them are interpreted. Regular
-expression pattern strings may not contain null bytes, but can specify
-the null byte using a ``\number`` notation such as ``'\x00'``.
+how the regular expressions around them are interpreted.
 
 Repetition qualifiers (``*``, ``+``, ``?``, ``{m,n}``, etc) cannot be
 directly nested. This avoids ambiguity with the non-greedy modifier suffix
@@ -94,16 +93,16 @@ the expression ``(?:a{6})*`` matches any multiple of six ``'a'`` characters.
 
 The special characters are:
 
-``'.'``
+``.``
    (Dot.)  In the default mode, this matches any character except a newline.  If
    the :const:`DOTALL` flag has been specified, this matches any character
    including a newline.
 
-``'^'``
+``^``
    (Caret.)  Matches the start of the string, and in :const:`MULTILINE` mode also
    matches immediately after each newline.
 
-``'$'``
+``$``
    Matches the end of the string or just before the newline at the end of the
    string, and in :const:`MULTILINE` mode also matches before a newline.  ``foo``
    matches both 'foo' and 'foobar', while the regular expression ``foo$`` matches
@@ -112,28 +111,28 @@ The special characters are:
    a single ``$`` in ``'foo\n'`` will find two (empty) matches: one just before
    the newline, and one at the end of the string.
 
-``'*'``
+``*``
    Causes the resulting RE to match 0 or more repetitions of the preceding RE, as
    many repetitions as are possible.  ``ab*`` will match 'a', 'ab', or 'a' followed
    by any number of 'b's.
 
-``'+'``
+``+``
    Causes the resulting RE to match 1 or more repetitions of the preceding RE.
    ``ab+`` will match 'a' followed by any non-zero number of 'b's; it will not
    match just 'a'.
 
-``'?'``
+``?``
    Causes the resulting RE to match 0 or 1 repetitions of the preceding RE.
    ``ab?`` will match either 'a' or 'ab'.
 
 ``*?``, ``+?``, ``??``
    The ``'*'``, ``'+'``, and ``'?'`` qualifiers are all :dfn:`greedy`; they match
    as much text as possible.  Sometimes this behaviour isn't desired; if the RE
-   ``<.*>`` is matched against ``<a> b <c>``, it will match the entire
-   string, and not just ``<a>``.  Adding ``?`` after the qualifier makes it
+   ``<.*>`` is matched against ``'<a> b <c>'``, it will match the entire
+   string, and not just ``'<a>'``.  Adding ``?`` after the qualifier makes it
    perform the match in :dfn:`non-greedy` or :dfn:`minimal` fashion; as *few*
    characters as possible will be matched.  Using the RE ``<.*?>`` will match
-   only ``<a>``.
+   only ``'<a>'``.
 
 ``{m}``
    Specifies that exactly *m* copies of the previous RE should be matched; fewer
@@ -145,8 +144,8 @@ The special characters are:
    RE, attempting to match as many repetitions as possible.  For example,
    ``a{3,5}`` will match from 3 to 5 ``'a'`` characters.  Omitting *m* specifies a
    lower bound of zero,  and omitting *n* specifies an infinite upper bound.  As an
-   example, ``a{4,}b`` will match ``aaaab`` or a thousand ``'a'`` characters
-   followed by a ``b``, but not ``aaab``. The comma may not be omitted or the
+   example, ``a{4,}b`` will match ``'aaaab'`` or a thousand ``'a'`` characters
+   followed by a ``'b'``, but not ``'aaab'``. The comma may not be omitted or the
    modifier would be confused with the previously described form.
 
 ``{m,n}?``
@@ -156,7 +155,7 @@ The special characters are:
    6-character string ``'aaaaaa'``, ``a{3,5}`` will match 5 ``'a'`` characters,
    while ``a{3,5}?`` will only match 3 characters.
 
-``'\'``
+``\``
    Either escapes special characters (permitting you to match characters like
    ``'*'``, ``'?'``, and so forth), or signals a special sequence; special
    sequences are discussed below.
@@ -179,8 +178,8 @@ The special characters are:
      them by a ``'-'``, for example ``[a-z]`` will match any lowercase ASCII letter,
      ``[0-5][0-9]`` will match all the two-digits numbers from ``00`` to ``59``, and
      ``[0-9A-Fa-f]`` will match any hexadecimal digit.  If ``-`` is escaped (e.g.
-     ``[a\-z]``) or if it's placed as the first or last character (e.g. ``[a-]``),
-     it will match a literal ``'-'``.
+     ``[a\-z]``) or if it's placed as the first or last character
+     (e.g. ``[-a]`` or ``[a-]``), it will match a literal ``'-'``.
 
    * Special characters lose their special meaning inside sets.  For example,
      ``[(+*)]`` will match any of the literal characters ``'('``, ``'+'``,
@@ -201,13 +200,13 @@ The special characters are:
      place it at the beginning of the set.  For example, both ``[()[\]{}]`` and
      ``[]()[{}]`` will both match a parenthesis.
 
-``'|'``
-   ``A|B``, where A and B can be arbitrary REs, creates a regular expression that
-   will match either A or B.  An arbitrary number of REs can be separated by the
+``|``
+   ``A|B``, where *A* and *B* can be arbitrary REs, creates a regular expression that
+   will match either *A* or *B*.  An arbitrary number of REs can be separated by the
    ``'|'`` in this way.  This can be used inside groups (see below) as well.  As
    the target string is scanned, REs separated by ``'|'`` are tried from left to
    right. When one pattern completely matches, that branch is accepted. This means
-   that once ``A`` matches, ``B`` will not be tested further, even if it would
+   that once *A* matches, *B* will not be tested further, even if it would
    produce a longer overall match.  In other words, the ``'|'`` operator is never
    greedy.  To match a literal ``'|'``, use ``\|``, or enclose it inside a
    character class, as in ``[|]``.
@@ -217,7 +216,7 @@ The special characters are:
    start and end of a group; the contents of a group can be retrieved after a match
    has been performed, and can be matched later in the string with the ``\number``
    special sequence, described below.  To match the literals ``'('`` or ``')'``,
-   use ``\(`` or ``\)``, or enclose them inside a character class: ``[(] [)]``.
+   use ``\(`` or ``\)``, or enclose them inside a character class: ``[(]``, ``[)]``.
 
 ``(?...)``
    This is an extension notation (a ``'?'`` following a ``'('`` is not meaningful
@@ -232,10 +231,11 @@ The special characters are:
    letters set the corresponding flags: :const:`re.A` (ASCII-only matching),
    :const:`re.I` (ignore case), :const:`re.L` (locale dependent),
    :const:`re.M` (multi-line), :const:`re.S` (dot matches all),
-   and :const:`re.X` (verbose), for the entire regular expression. (The
-   flags are described in :ref:`contents-of-module-re`.) This
-   is useful if you wish to include the flags as part of the regular
-   expression, instead of passing a *flag* argument to the
+   :const:`re.U` (Unicode matching), and :const:`re.X` (verbose),
+   for the entire regular expression.
+   (The flags are described in :ref:`contents-of-module-re`.)
+   This is useful if you wish to include the flags as part of the
+   regular expression, instead of passing a *flag* argument to the
    :func:`re.compile` function.  Flags should be used first in the
    expression string.
 
@@ -272,10 +272,10 @@ The special characters are:
    | in the same pattern itself            | * ``(?P=quote)`` (as shown)      |
    |                                       | * ``\1``                         |
    +---------------------------------------+----------------------------------+
-   | when processing match object ``m``    | * ``m.group('quote')``           |
+   | when processing match object *m*      | * ``m.group('quote')``           |
    |                                       | * ``m.end('quote')`` (etc.)      |
    +---------------------------------------+----------------------------------+
-   | in a string passed to the ``repl``    | * ``\g<quote>``                  |
+   | in a string passed to the *repl*      | * ``\g<quote>``                  |
    | argument of ``re.sub()``              | * ``\g<1>``                      |
    |                                       | * ``\1``                         |
    +---------------------------------------+----------------------------------+
@@ -289,18 +289,18 @@ The special characters are:
 
 ``(?=...)``
    Matches if ``...`` matches next, but doesn't consume any of the string.  This is
-   called a lookahead assertion.  For example, ``Isaac (?=Asimov)`` will match
+   called a :dfn:`lookahead assertion`.  For example, ``Isaac (?=Asimov)`` will match
    ``'Isaac '`` only if it's followed by ``'Asimov'``.
 
 ``(?!...)``
-   Matches if ``...`` doesn't match next.  This is a negative lookahead assertion.
+   Matches if ``...`` doesn't match next.  This is a :dfn:`negative lookahead assertion`.
    For example, ``Isaac (?!Asimov)`` will match ``'Isaac '`` only if it's *not*
    followed by ``'Asimov'``.
 
 ``(?<=...)``
    Matches if the current position in the string is preceded by a match for ``...``
    that ends at the current position.  This is called a :dfn:`positive lookbehind
-   assertion`. ``(?<=abc)def`` will find a match in ``abcdef``, since the
+   assertion`. ``(?<=abc)def`` will find a match in ``'abcdef'``, since the
    lookbehind will back up 3 characters and check if the contained pattern matches.
    The contained pattern must only match strings of some fixed length, meaning that
    ``abc`` or ``a|b`` are allowed, but ``a*`` and ``a{3,4}`` are not.  Note that
@@ -358,26 +358,26 @@ character ``'$'``.
 
 ``\b``
    Matches the empty string, but only at the beginning or end of a word.
-   A word is defined as a sequence of Unicode alphanumeric or underscore
-   characters, so the end of a word is indicated by whitespace or a
-   non-alphanumeric, non-underscore Unicode character.  Note that formally,
+   A word is defined as a sequence of word characters.  Note that formally,
    ``\b`` is defined as the boundary between a ``\w`` and a ``\W`` character
    (or vice versa), or between ``\w`` and the beginning/end of the string.
    This means that ``r'\bfoo\b'`` matches ``'foo'``, ``'foo.'``, ``'(foo)'``,
    ``'bar foo baz'`` but not ``'foobar'`` or ``'foo3'``.
 
-   By default Unicode alphanumerics are the ones used, but this can  be changed
-   by using the :const:`ASCII` flag.  Inside a character range, ``\b``
-   represents the backspace character, for compatibility with Python's string
-   literals.
+   By default Unicode alphanumerics are the ones used in Unicode patterns, but
+   this can be changed by using the :const:`ASCII` flag.  Word boundaries are
+   determined by the current locale if the :const:`LOCALE` flag is used.
+   Inside a character range, ``\b`` represents the backspace character, for
+   compatibility with Python's string literals.
 
 ``\B``
    Matches the empty string, but only when it is *not* at the beginning or end
    of a word.  This means that ``r'py\B'`` matches ``'python'``, ``'py3'``,
    ``'py2'``, but not ``'py'``, ``'py.'``, or ``'py!'``.
-   ``\B`` is just the opposite of ``\b``, so word characters are
-   Unicode alphanumerics or the underscore, although this can be changed
-   by using the :const:`ASCII` flag.
+   ``\B`` is just the opposite of ``\b``, so word characters in Unicode
+   patterns are Unicode alphanumerics or the underscore, although this can
+   be changed by using the :const:`ASCII` flag.  Word boundaries are
+   determined by the current locale if the :const:`LOCALE` flag is used.
 
 ``\d``
    For Unicode (str) patterns:
@@ -387,11 +387,12 @@ character ``'$'``.
       used only ``[0-9]`` is matched (but the flag affects the entire
       regular expression, so in such cases using an explicit ``[0-9]``
       may be a better choice).
+
    For 8-bit (bytes) patterns:
       Matches any decimal digit; this is equivalent to ``[0-9]``.
 
 ``\D``
-   Matches any character which is not a Unicode decimal digit. This is
+   Matches any character which is not a decimal digit. This is
    the opposite of ``\d``. If the :const:`ASCII` flag is used this
    becomes the equivalent of ``[^0-9]`` (but the flag affects the entire
    regular expression, so in such cases using an explicit ``[^0-9]`` may
@@ -412,7 +413,7 @@ character ``'$'``.
       this is equivalent to ``[ \t\n\r\f\v]``.
 
 ``\S``
-   Matches any character which is not a Unicode whitespace character. This is
+   Matches any character which is not a whitespace character. This is
    the opposite of ``\s``. If the :const:`ASCII` flag is used this
    becomes the equivalent of ``[^ \t\n\r\f\v]`` (but the flag affects the entire
    regular expression, so in such cases using an explicit ``[^ \t\n\r\f\v]`` may
@@ -426,16 +427,21 @@ character ``'$'``.
       ``[a-zA-Z0-9_]`` is matched (but the flag affects the entire
       regular expression, so in such cases using an explicit
       ``[a-zA-Z0-9_]`` may be a better choice).
+
    For 8-bit (bytes) patterns:
       Matches characters considered alphanumeric in the ASCII character set;
-      this is equivalent to ``[a-zA-Z0-9_]``.
+      this is equivalent to ``[a-zA-Z0-9_]``.  If the :const:`LOCALE` flag is
+      used, matches characters considered alphanumeric in the current locale
+      and the underscore.
 
 ``\W``
-   Matches any character which is not a Unicode word character. This is
+   Matches any character which is not a word character. This is
    the opposite of ``\w``. If the :const:`ASCII` flag is used this
    becomes the equivalent of ``[^a-zA-Z0-9_]`` (but the flag affects the
    entire regular expression, so in such cases using an explicit
-   ``[^a-zA-Z0-9_]`` may be a better choice).
+   ``[^a-zA-Z0-9_]`` may be a better choice).  If the :const:`LOCALE` flag is
+   used, matches characters considered alphanumeric in the current locale
+   and the underscore.
 
 ``\Z``
    Matches only at the end of the string.
@@ -451,7 +457,7 @@ accepted by the regular expression parser::
 only inside character classes.)
 
 ``'\u'`` and ``'\U'`` escape sequences are only recognized in Unicode
-patterns.  In bytes patterns they are not treated specially.
+patterns.  In bytes patterns they are errors.
 
 Octal escapes are included in a limited form.  If the first digit is a 0, or if
 there are three octal digits, it is considered an octal escape. Otherwise, it is
@@ -526,6 +532,7 @@ form.
    Make ``\w``, ``\W``, ``\b``, ``\B``, ``\d``, ``\D``, ``\s`` and ``\S``
    perform ASCII-only matching instead of full Unicode matching.  This is only
    meaningful for Unicode patterns, and is ignored for byte patterns.
+   Corresponds to the inline flag ``(?a)``.
 
    Note that for backward compatibility, the :const:`re.U` flag still
    exists (as well as its synonym :const:`re.UNICODE` and its embedded
@@ -537,26 +544,40 @@ form.
 .. data:: DEBUG
 
    Display debug information about compiled expression.
+   No corresponding inline flag.
 
 
 .. data:: I
           IGNORECASE
 
    Perform case-insensitive matching; expressions like ``[A-Z]`` will also
-   match lowercase letters.  The current locale does not change the effect of
-   this flag.  Full Unicode matching (such as ``?`` matching ``?``) also
-   works unless the :const:`re.ASCII` flag is also used to disable non-ASCII
-   matches.
-
+   match lowercase letters.  Full Unicode matching (such as ``?`` matching
+   ``?``) also works unless the :const:`re.ASCII` flag is used to disable
+   non-ASCII matches.  The current locale does not change the effect of this
+   flag unless the :const:`re.LOCALE` flag is also used.
+   Corresponds to the inline flag ``(?i)``.
+
+   Note that when the Unicode patterns ``[a-z]`` or ``[A-Z]`` are used in
+   combination with the :const:`IGNORECASE` flag, they will match the 52 ASCII
+   letters and 4 additional non-ASCII letters: '?' (U+0130, Latin capital
+   letter I with dot above), '?' (U+0131, Latin small letter dotless i),
+   '?' (U+017F, Latin small letter long s) and '?' (U+212A, Kelvin sign).
+   If the :const:`ASCII` flag is used, only letters 'a' to 'z'
+   and 'A' to 'Z' are matched (but the flag affects the entire regular
+   expression, so in such cases using an explicit ``(?-i:[a-zA-Z])`` may be
+   a better choice).
 
 .. data:: L
           LOCALE
 
-   Make ``\w``, ``\W``, ``\b``, ``\B``, ``\s`` and ``\S`` dependent on the
-   current locale. The use of this flag is discouraged as the locale mechanism
-   is very unreliable, and it only handles one "culture" at a time anyway;
-   you should use Unicode matching instead, which is the default in Python 3
-   for Unicode (str) patterns. This flag can be used only with bytes patterns.
+   Make ``\w``, ``\W``, ``\b``, ``\B`` and case-insensitive matching
+   dependent on the current locale.  This flag can be used only with bytes
+   patterns.  The use of this flag is discouraged as the locale mechanism
+   is very unreliable, it only handles one "culture" at a time, and it only
+   works with 8-bit locales.  Unicode matching is already enabled by default
+   in Python 3 for Unicode (str) patterns, and it is able to handle different
+   locales/languages.
+   Corresponds to the inline flag ``(?L)``.
 
    .. versionchanged:: 3.6
       :const:`re.LOCALE` can be used only with bytes patterns and is
@@ -577,6 +598,7 @@ form.
    end of each line (immediately preceding each newline).  By default, ``'^'``
    matches only at the beginning of the string, and ``'$'`` only at the end of the
    string and immediately before the newline (if any) at the end of the string.
+   Corresponds to the inline flag ``(?m)``.
 
 
 .. data:: S
@@ -584,6 +606,7 @@ form.
 
    Make the ``'.'`` special character match any character at all, including a
    newline; without this flag, ``'.'`` will match anything *except* a newline.
+   Corresponds to the inline flag ``(?s)``.
 
 
 .. data:: X
@@ -605,7 +628,7 @@ form.
                          \d *  # some fractional digits""", re.X)
       b = re.compile(r"\d+\.\d*")
 
-
+   Corresponds to the inline flag ``(?x)``.
 
 
 .. function:: search(pattern, string, flags=0)
@@ -660,7 +683,7 @@ form.
 
    If there are capturing groups in the separator and it matches at the start of
    the string, the result will start with an empty string.  The same holds for
-   the end of the string:
+   the end of the string::
 
       >>> re.split('(\W+)', '...words, words...')
       ['', '...', 'words', ', ', 'words', '...', '']
@@ -671,7 +694,7 @@ form.
    .. note::
 
       :func:`split` doesn't currently split a string on an empty pattern match.
-      For example:
+      For example::
 
          >>> re.split('x*', 'axbc')
          ['a', 'bc']
@@ -728,7 +751,7 @@ form.
    converted to a single newline character, ``\r`` is converted to a carriage return, and
    so forth.  Unknown escapes such as ``\&`` are left alone.  Backreferences, such
    as ``\6``, are replaced with the substring matched by group 6 in the pattern.
-   For example:
+   For example::
 
       >>> re.sub(r'def\s+([a-zA-Z_][a-zA-Z_0-9]*)\s*\(\s*\):',
       ...        r'static PyObject*\npy_\1(void)\n{',
@@ -736,8 +759,8 @@ form.
       'static PyObject*\npy_myfunc(void)\n{'
 
    If *repl* is a function, it is called for every non-overlapping occurrence of
-   *pattern*.  The function takes a single match object argument, and returns the
-   replacement string.  For example:
+   *pattern*.  The function takes a single :ref:`match object <match-objects>`
+   argument, and returns the replacement string.  For example::
 
       >>> def dashrepl(matchobj):
       ...     if matchobj.group(0) == '-': return ' '
@@ -747,7 +770,7 @@ form.
       >>> re.sub(r'\sAND\s', ' & ', 'Baked Beans And Spam', flags=re.IGNORECASE)
       'Baked Beans & Spam'
 
-   The pattern may be a string or a :class:`Pattern` object.
+   The pattern may be a string or a :ref:`pattern object <re-objects>`.
 
    The optional argument *count* is the maximum number of pattern occurrences to be
    replaced; *count* must be a non-negative integer.  If omitted or zero, all
@@ -809,6 +832,14 @@ form.
       >>> print('|'.join(map(re.escape, sorted(operators, reverse=True))))
       /|\-|\+|\*\*|\*
 
+   This functions must not be used for the replacement string in :func:`sub`
+   and :func:`subn`, only backslashes should be escaped.  For example::
+
+      >>> digits_re = r'\d+'
+      >>> sample = '/usr/sbin/sendmail - 0 errors, 12 warnings'
+      >>> print(re.sub(digits_re, digits_re.replace('\\', r'\\'), sample))
+      /usr/sbin/sendmail - \d+ errors, \d+ warnings
+
    .. versionchanged:: 3.3
       The ``'_'`` character is no longer escaped.
 
@@ -880,12 +911,12 @@ attributes:
    from *pos* to ``endpos - 1`` will be searched for a match.  If *endpos* is less
    than *pos*, no match will be found; otherwise, if *rx* is a compiled regular
    expression object, ``rx.search(string, 0, 50)`` is equivalent to
-   ``rx.search(string[:50], 0)``.
+   ``rx.search(string[:50], 0)``. ::
 
-   >>> pattern = re.compile("d")
-   >>> pattern.search("dog")     # Match at index 0
-   <re.Match object; span=(0, 1), match='d'>
-   >>> pattern.search("dog", 1)  # No match; search doesn't include the "d"
+      >>> pattern = re.compile("d")
+      >>> pattern.search("dog")     # Match at index 0
+      <re.Match object; span=(0, 1), match='d'>
+      >>> pattern.search("dog", 1)  # No match; search doesn't include the "d"
 
 
 .. method:: Pattern.match(string[, pos[, endpos]])
@@ -896,12 +927,12 @@ attributes:
    different from a zero-length match.
 
    The optional *pos* and *endpos* parameters have the same meaning as for the
-   :meth:`~Pattern.search` method.
+   :meth:`~Pattern.search` method. ::
 
-   >>> pattern = re.compile("o")
-   >>> pattern.match("dog")      # No match as "o" is not at the start of "dog".
-   >>> pattern.match("dog", 1)   # Match as "o" is the 2nd character of "dog".
-   <re.Match object; span=(1, 2), match='o'>
+      >>> pattern = re.compile("o")
+      >>> pattern.match("dog")      # No match as "o" is not at the start of "dog".
+      >>> pattern.match("dog", 1)   # Match as "o" is the 2nd character of "dog".
+      <re.Match object; span=(1, 2), match='o'>
 
    If you want to locate a match anywhere in *string*, use
    :meth:`~Pattern.search` instead (see also :ref:`search-vs-match`).
@@ -914,13 +945,13 @@ attributes:
    match the pattern; note that this is different from a zero-length match.
 
    The optional *pos* and *endpos* parameters have the same meaning as for the
-   :meth:`~Pattern.search` method.
+   :meth:`~Pattern.search` method. ::
 
-   >>> pattern = re.compile("o[gh]")
-   >>> pattern.fullmatch("dog")      # No match as "o" is not at the start of "dog".
-   >>> pattern.fullmatch("ogre")     # No match as not the full string matches.
-   >>> pattern.fullmatch("doggie", 1, 3)   # Matches within given limits.
-   <re.Match object; span=(1, 3), match='og'>
+      >>> pattern = re.compile("o[gh]")
+      >>> pattern.fullmatch("dog")      # No match as "o" is not at the start of "dog".
+      >>> pattern.fullmatch("ogre")     # No match as not the full string matches.
+      >>> pattern.fullmatch("doggie", 1, 3)   # Matches within given limits.
+      <re.Match object; span=(1, 3), match='og'>
 
    .. versionadded:: 3.4
 
@@ -934,14 +965,14 @@ attributes:
 
    Similar to the :func:`findall` function, using the compiled pattern, but
    also accepts optional *pos* and *endpos* parameters that limit the search
-   region like for :meth:`match`.
+   region like for :meth:`search`.
 
 
 .. method:: Pattern.finditer(string[, pos[, endpos]])
 
    Similar to the :func:`finditer` function, using the compiled pattern, but
    also accepts optional *pos* and *endpos* parameters that limit the search
-   region like for :meth:`match`.
+   region like for :meth:`search`.
 
 
 .. method:: Pattern.sub(repl, string, count=0)
@@ -1024,7 +1055,7 @@ Match objects support the following methods and attributes:
    pattern, an :exc:`IndexError` exception is raised. If a group is contained in a
    part of the pattern that did not match, the corresponding result is ``None``.
    If a group is contained in a part of the pattern that matched multiple times,
-   the last match is returned.
+   the last match is returned. ::
 
       >>> m = re.match(r"(\w+) (\w+)", "Isaac Newton, physicist")
       >>> m.group(0)       # The entire match
@@ -1041,7 +1072,7 @@ Match objects support the following methods and attributes:
    string argument is not used as a group name in the pattern, an :exc:`IndexError`
    exception is raised.
 
-   A moderately complicated example:
+   A moderately complicated example::
 
       >>> m = re.match(r"(?P<first_name>\w+) (?P<last_name>\w+)", "Malcolm Reynolds")
       >>> m.group('first_name')
@@ -1049,14 +1080,14 @@ Match objects support the following methods and attributes:
       >>> m.group('last_name')
       'Reynolds'
 
-   Named groups can also be referred to by their index:
+   Named groups can also be referred to by their index::
 
       >>> m.group(1)
       'Malcolm'
       >>> m.group(2)
       'Reynolds'
 
-   If a group matches multiple times, only the last match is accessible:
+   If a group matches multiple times, only the last match is accessible::
 
       >>> m = re.match(r"(..)+", "a1b2c3")  # Matches 3 times.
       >>> m.group(1)                        # Returns only the last match.
@@ -1066,7 +1097,7 @@ Match objects support the following methods and attributes:
 .. method:: Match.__getitem__(g)
 
    This is identical to ``m.group(g)``.  This allows easier access to
-   an individual group from a match:
+   an individual group from a match::
 
       >>> m = re.match(r"(\w+) (\w+)", "Isaac Newton, physicist")
       >>> m[0]       # The entire match
@@ -1085,7 +1116,7 @@ Match objects support the following methods and attributes:
    many groups are in the pattern.  The *default* argument is used for groups that
    did not participate in the match; it defaults to ``None``.
 
-   For example:
+   For example::
 
       >>> m = re.match(r"(\d+)\.(\d+)", "24.1632")
       >>> m.groups()
@@ -1093,7 +1124,7 @@ Match objects support the following methods and attributes:
 
    If we make the decimal place and everything after it optional, not all groups
    might participate in the match.  These groups will default to ``None`` unless
-   the *default* argument is given:
+   the *default* argument is given::
 
       >>> m = re.match(r"(\d+)\.?(\d+)?", "24")
       >>> m.groups()      # Second group defaults to None.
@@ -1106,7 +1137,7 @@ Match objects support the following methods and attributes:
 
    Return a dictionary containing all the *named* subgroups of the match, keyed by
    the subgroup name.  The *default* argument is used for groups that did not
-   participate in the match; it defaults to ``None``.  For example:
+   participate in the match; it defaults to ``None``.  For example::
 
       >>> m = re.match(r"(?P<first_name>\w+) (?P<last_name>\w+)", "Malcolm Reynolds")
       >>> m.groupdict()
@@ -1129,7 +1160,7 @@ Match objects support the following methods and attributes:
    ``m.start(0)`` is 1, ``m.end(0)`` is 2, ``m.start(1)`` and ``m.end(1)`` are both
    2, and ``m.start(2)`` raises an :exc:`IndexError` exception.
 
-   An example that will remove *remove_this* from email addresses:
+   An example that will remove *remove_this* from email addresses::
 
       >>> email = "tony at tiremove_thisger.net"
       >>> m = re.search("remove_this", email)
@@ -1175,7 +1206,7 @@ Match objects support the following methods and attributes:
 
 .. attribute:: Match.re
 
-   The regular expression object whose :meth:`~Pattern.match` or
+   The :ref:`regular expression object <re-objects>` whose :meth:`~Pattern.match` or
    :meth:`~Pattern.search` method produced this match instance.
 
 
@@ -1213,7 +1244,7 @@ a 5-character string with each character representing a card, "a" for ace, "k"
 for king, "q" for queen, "j" for jack, "t" for 10, and "2" through "9"
 representing the card with that value.
 
-To see if a given string is a valid hand, one could do the following:
+To see if a given string is a valid hand, one could do the following::
 
    >>> valid = re.compile(r"^[a2-9tjqk]{5}$")
    >>> displaymatch(valid.match("akt5q"))  # Valid.
@@ -1224,7 +1255,7 @@ To see if a given string is a valid hand, one could do the following:
    "<Match: '727ak', groups=()>"
 
 That last hand, ``"727ak"``, contained a pair, or two of the same valued cards.
-To match this with a regular expression, one could use backreferences as such:
+To match this with a regular expression, one could use backreferences as such::
 
    >>> pair = re.compile(r".*(.).*\1")
    >>> displaymatch(pair.match("717ak"))     # Pair of 7s.
@@ -1326,7 +1357,7 @@ restrict the match at the beginning of the string::
 
 Note however that in :const:`MULTILINE` mode :func:`match` only matches at the
 beginning of the string, whereas using :func:`search` with a regular expression
-beginning with ``'^'`` will match at the beginning of each line.
+beginning with ``'^'`` will match at the beginning of each line. ::
 
    >>> re.match('X', 'A\nB\nX', re.MULTILINE)  # No match
    >>> re.search('^X', 'A\nB\nX', re.MULTILINE)  # Match
@@ -1342,7 +1373,7 @@ easily read and modified by Python as demonstrated in the following example that
 creates a phonebook.
 
 First, here is the input.  Normally it may come from a file, here we are using
-triple-quoted string syntax:
+triple-quoted string syntax::
 
    >>> text = """Ross McFluff: 834.345.1254 155 Elm Street
    ...
@@ -1417,7 +1448,7 @@ Finding all Adverbs
 :func:`findall` matches *all* occurrences of a pattern, not just the first
 one as :func:`search` does.  For example, if one was a writer and wanted to
 find all of the adverbs in some text, he or she might use :func:`findall` in
-the following manner:
+the following manner::
 
    >>> text = "He was carefully disguised but captured quickly by police."
    >>> re.findall(r"\w+ly", text)
@@ -1431,7 +1462,7 @@ If one wants more information about all matches of a pattern than the matched
 text, :func:`finditer` is useful as it provides :ref:`match objects
 <match-objects>` instead of strings.  Continuing with the previous example, if
 one was a writer who wanted to find all of the adverbs *and their positions* in
-some text, he or she would use :func:`finditer` in the following manner:
+some text, he or she would use :func:`finditer` in the following manner::
 
    >>> text = "He was carefully disguised but captured quickly by police."
    >>> for m in re.finditer(r"\w+ly", text):
@@ -1446,7 +1477,7 @@ Raw String Notation
 Raw string notation (``r"text"``) keeps regular expressions sane.  Without it,
 every backslash (``'\'``) in a regular expression would have to be prefixed with
 another one to escape it.  For example, the two following lines of code are
-functionally identical:
+functionally identical::
 
    >>> re.match(r"\W(.)\1\W", " ff ")
    <re.Match object; span=(0, 4), match=' ff '>
@@ -1456,7 +1487,7 @@ functionally identical:
 When one wants to match a literal backslash, it must be escaped in the regular
 expression.  With raw string notation, this means ``r"\\"``.  Without raw string
 notation, one must use ``"\\\\"``, making the following lines of code
-functionally identical:
+functionally identical::
 
    >>> re.match(r"\\", r"\\")
    <re.Match object; span=(0, 1), match='\\'>


From solipsis at pitrou.net  Sat Oct 14 05:07:10 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 14 Oct 2017 09:07:10 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=5
Message-ID: <20171014090710.129977.EC199ACB04F91026@psf.io>

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

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


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

From webhook-mailer at python.org  Sat Oct 14 05:17:21 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sat, 14 Oct 2017 09:17:21 -0000
Subject: [Python-checkins] [3.6] bpo-31714: Improved regular expression
 documentation. (GH-3907). (#3994)
Message-ID: <mailman.48.1507972644.12142.python-checkins@python.org>

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

[3.6] bpo-31714: Improved regular expression documentation. (GH-3907). (#3994)

(cherry picked from commit cd195e2a7ac5c9b2574d5462752b7939641de4a9)

files:
M Doc/howto/regex.rst
M Doc/library/re.rst

diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
index d9b7c9091d4..7ff4563d14f 100644
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -153,8 +153,8 @@ These sequences can be included inside a character class.  For example,
 ``','`` or ``'.'``.
 
 The final metacharacter in this section is ``.``.  It matches anything except a
-newline character, and there's an alternate mode (``re.DOTALL``) where it will
-match even a newline.  ``'.'`` is often used where you want to match "any
+newline character, and there's an alternate mode (:const:`re.DOTALL`) where it will
+match even a newline.  ``.`` is often used where you want to match "any
 character".
 
 
@@ -168,14 +168,11 @@ wouldn't be much of an advance. Another capability is that you can specify that
 portions of the RE must be repeated a certain number of times.
 
 The first metacharacter for repeating things that we'll look at is ``*``.  ``*``
-doesn't match the literal character ``*``; instead, it specifies that the
+doesn't match the literal character ``'*'``; instead, it specifies that the
 previous character can be matched zero or more times, instead of exactly once.
 
-For example, ``ca*t`` will match ``ct`` (0 ``a`` characters), ``cat`` (1 ``a``),
-``caaat`` (3 ``a`` characters), and so forth.  The RE engine has various
-internal limitations stemming from the size of C's ``int`` type that will
-prevent it from matching over 2 billion ``a`` characters; patterns
-are usually not written to match that much data.
+For example, ``ca*t`` will match ``'ct'`` (0 ``'a'`` characters), ``'cat'`` (1 ``'a'``),
+``'caaat'`` (3 ``'a'`` characters), and so forth.
 
 Repetitions such as ``*`` are :dfn:`greedy`; when repeating a RE, the matching
 engine will try to repeat it as many times as possible. If later portions of the
@@ -185,7 +182,7 @@ fewer repetitions.
 A step-by-step example will make this more obvious.  Let's consider the
 expression ``a[bcd]*b``.  This matches the letter ``'a'``, zero or more letters
 from the class ``[bcd]``, and finally ends with a ``'b'``.  Now imagine matching
-this RE against the string ``abcbd``.
+this RE against the string ``'abcbd'``.
 
 +------+-----------+---------------------------------+
 | Step | Matched   | Explanation                     |
@@ -218,7 +215,7 @@ this RE against the string ``abcbd``.
 |      |           | it succeeds.                    |
 +------+-----------+---------------------------------+
 
-The end of the RE has now been reached, and it has matched ``abcb``.  This
+The end of the RE has now been reached, and it has matched ``'abcb'``.  This
 demonstrates how the matching engine goes as far as it can at first, and if no
 match is found it will then progressively back up and retry the rest of the RE
 again and again.  It will back up until it has tried zero matches for
@@ -229,24 +226,23 @@ Another repeating metacharacter is ``+``, which matches one or more times.  Pay
 careful attention to the difference between ``*`` and ``+``; ``*`` matches
 *zero* or more times, so whatever's being repeated may not be present at all,
 while ``+`` requires at least *one* occurrence.  To use a similar example,
-``ca+t`` will match ``cat`` (1 ``a``), ``caaat`` (3 ``a``'s), but won't match
-``ct``.
+``ca+t`` will match ``'cat'`` (1 ``'a'``), ``'caaat'`` (3 ``'a'``\ s), but won't
+match ``'ct'``.
 
 There are two more repeating qualifiers.  The question mark character, ``?``,
 matches either once or zero times; you can think of it as marking something as
-being optional.  For example, ``home-?brew`` matches either ``homebrew`` or
-``home-brew``.
+being optional.  For example, ``home-?brew`` matches either ``'homebrew'`` or
+``'home-brew'``.
 
 The most complicated repeated qualifier is ``{m,n}``, where *m* and *n* are
 decimal integers.  This qualifier means there must be at least *m* repetitions,
-and at most *n*.  For example, ``a/{1,3}b`` will match ``a/b``, ``a//b``, and
-``a///b``.  It won't match ``ab``, which has no slashes, or ``a////b``, which
+and at most *n*.  For example, ``a/{1,3}b`` will match ``'a/b'``, ``'a//b'``, and
+``'a///b'``.  It won't match ``'ab'``, which has no slashes, or ``'a////b'``, which
 has four.
 
 You can omit either *m* or *n*; in that case, a reasonable value is assumed for
 the missing value.  Omitting *m* is interpreted as a lower limit of 0, while
-omitting *n* results in an upper bound of infinity --- actually, the upper bound
-is the 2-billion limit mentioned earlier, but that might as well be infinity.
+omitting *n* results in an upper bound of infinity.
 
 Readers of a reductionist bent may notice that the three other qualifiers can
 all be expressed using this notation.  ``{0,}`` is the same as ``*``, ``{1,}``
@@ -366,7 +362,7 @@ for a complete listing.
 |                  | returns them as an :term:`iterator`.          |
 +------------------+-----------------------------------------------+
 
-:meth:`~re.regex.match` and :meth:`~re.regex.search` return ``None`` if no match can be found.  If
+:meth:`~re.pattern.match` and :meth:`~re.pattern.search` return ``None`` if no match can be found.  If
 they're successful, a :ref:`match object <match-objects>` instance is returned,
 containing information about the match: where it starts and ends, the substring
 it matched, and more.
@@ -388,24 +384,24 @@ Python interpreter, import the :mod:`re` module, and compile a RE::
 
 Now, you can try matching various strings against the RE ``[a-z]+``.  An empty
 string shouldn't match at all, since ``+`` means 'one or more repetitions'.
-:meth:`match` should return ``None`` in this case, which will cause the
+:meth:`~re.pattern.match` should return ``None`` in this case, which will cause the
 interpreter to print no output.  You can explicitly print the result of
-:meth:`match` to make this clear. ::
+:meth:`!match` to make this clear. ::
 
    >>> p.match("")
    >>> print(p.match(""))
    None
 
 Now, let's try it on a string that it should match, such as ``tempo``.  In this
-case, :meth:`match` will return a :ref:`match object <match-objects>`, so you
+case, :meth:`~re.pattern.match` will return a :ref:`match object <match-objects>`, so you
 should store the result in a variable for later use. ::
 
    >>> m = p.match('tempo')
-   >>> m  #doctest: +ELLIPSIS
+   >>> m
    <_sre.SRE_Match object; span=(0, 5), match='tempo'>
 
 Now you can query the :ref:`match object <match-objects>` for information
-about the matching string.  :ref:`match object <match-objects>` instances
+about the matching string.  Match object instances
 also have several methods and attributes; the most important ones are:
 
 +------------------+--------------------------------------------+
@@ -432,15 +428,15 @@ Trying these methods will soon clarify their meaning::
 
 :meth:`~re.match.group` returns the substring that was matched by the RE.  :meth:`~re.match.start`
 and :meth:`~re.match.end` return the starting and ending index of the match. :meth:`~re.match.span`
-returns both start and end indexes in a single tuple.  Since the :meth:`match`
-method only checks if the RE matches at the start of a string, :meth:`start`
-will always be zero.  However, the :meth:`search` method of patterns
+returns both start and end indexes in a single tuple.  Since the :meth:`~re.pattern.match`
+method only checks if the RE matches at the start of a string, :meth:`!start`
+will always be zero.  However, the :meth:`~re.pattern.search` method of patterns
 scans through the string, so  the match may not start at zero in that
 case. ::
 
    >>> print(p.match('::: message'))
    None
-   >>> m = p.search('::: message'); print(m)  #doctest: +ELLIPSIS
+   >>> m = p.search('::: message'); print(m)
    <_sre.SRE_Match object; span=(4, 11), match='message'>
    >>> m.group()
    'message'
@@ -459,14 +455,14 @@ In actual programs, the most common style is to store the
        print('No match')
 
 Two pattern methods return all of the matches for a pattern.
-:meth:`~re.regex.findall` returns a list of matching strings::
+:meth:`~re.pattern.findall` returns a list of matching strings::
 
    >>> p = re.compile('\d+')
    >>> p.findall('12 drummers drumming, 11 pipers piping, 10 lords a-leaping')
    ['12', '11', '10']
 
-:meth:`findall` has to create the entire list before it can be returned as the
-result.  The :meth:`~re.regex.finditer` method returns a sequence of
+:meth:`~re.pattern.findall` has to create the entire list before it can be returned as the
+result.  The :meth:`~re.pattern.finditer` method returns a sequence of
 :ref:`match object <match-objects>` instances as an :term:`iterator`::
 
    >>> iterator = p.finditer('12 drummers drumming, 11 ... 10 ...')
@@ -529,14 +525,14 @@ of each one.
 |                                 | characters with the respective property.   |
 +---------------------------------+--------------------------------------------+
 | :const:`DOTALL`, :const:`S`     | Make ``.`` match any character, including  |
-|                                 | newlines                                   |
+|                                 | newlines.                                  |
 +---------------------------------+--------------------------------------------+
-| :const:`IGNORECASE`, :const:`I` | Do case-insensitive matches                |
+| :const:`IGNORECASE`, :const:`I` | Do case-insensitive matches.               |
 +---------------------------------+--------------------------------------------+
-| :const:`LOCALE`, :const:`L`     | Do a locale-aware match                    |
+| :const:`LOCALE`, :const:`L`     | Do a locale-aware match.                   |
 +---------------------------------+--------------------------------------------+
 | :const:`MULTILINE`, :const:`M`  | Multi-line matching, affecting ``^`` and   |
-|                                 | ``$``                                      |
+|                                 | ``$``.                                     |
 +---------------------------------+--------------------------------------------+
 | :const:`VERBOSE`, :const:`X`    | Enable verbose REs, which can be organized |
 | (for 'extended')                | more cleanly and understandably.           |
@@ -549,27 +545,41 @@ of each one.
 
    Perform case-insensitive matching; character class and literal strings will
    match letters by ignoring case.  For example, ``[A-Z]`` will match lowercase
-   letters, too, and ``Spam`` will match ``Spam``, ``spam``, or ``spAM``. This
-   lowercasing doesn't take the current locale into account; it will if you also
-   set the :const:`LOCALE` flag.
+   letters, too. Full Unicode matching also works unless the :const:`ASCII`
+   flag is used to disable non-ASCII matches.  When the Unicode patterns
+   ``[a-z]`` or ``[A-Z]`` are used in combination with the :const:`IGNORECASE`
+   flag, they will match the 52 ASCII letters and 4 additional non-ASCII
+   letters: '?' (U+0130, Latin capital letter I with dot above), '?' (U+0131,
+   Latin small letter dotless i), '?' (U+017F, Latin small letter long s) and
+   '?' (U+212A, Kelvin sign).  ``Spam`` will match ``'Spam'``, ``'spam'``,
+   ``'spAM'``, or ``'?pam'`` (the latter is matched only in Unicode mode).
+   This lowercasing doesn't take the current locale into account;
+   it will if you also set the :const:`LOCALE` flag.
 
 
 .. data:: L
           LOCALE
    :noindex:
 
-   Make ``\w``, ``\W``, ``\b``, and ``\B``, dependent on the current locale
-   instead of the Unicode database.
-
-   Locales are a feature of the C library intended to help in writing programs that
-   take account of language differences.  For example, if you're processing French
-   text, you'd want to be able to write ``\w+`` to match words, but ``\w`` only
-   matches the character class ``[A-Za-z]``; it won't match ``'?'`` or ``'?'``.  If
-   your system is configured properly and a French locale is selected, certain C
-   functions will tell the program that ``'?'`` should also be considered a letter.
+   Make ``\w``, ``\W``, ``\b``, ``\B`` and case-insensitive matching dependent
+   on the current locale instead of the Unicode database.
+
+   Locales are a feature of the C library intended to help in writing programs
+   that take account of language differences.  For example, if you're
+   processing encoded French text, you'd want to be able to write ``\w+`` to
+   match words, but ``\w`` only matches the character class ``[A-Za-z]`` in
+   bytes patterns; it won't match bytes corresponding to ``?`` or ``?``.
+   If your system is configured properly and a French locale is selected,
+   certain C functions will tell the program that the byte corresponding to
+   ``?`` should also be considered a letter.
    Setting the :const:`LOCALE` flag when compiling a regular expression will cause
    the resulting compiled object to use these C functions for ``\w``; this is
    slower, but also enables ``\w+`` to match French words as you'd expect.
+   The use of this flag is discouraged in Python 3 as the locale mechanism
+   is very unreliable, it only handles one "culture" at a time, and it only
+   works with 8-bit locales.  Unicode matching is already enabled by default
+   in Python 3 for Unicode (str) patterns, and it is able to handle different
+   locales/languages.
 
 
 .. data:: M
@@ -667,11 +677,11 @@ zero-width assertions should never be repeated, because if they match once at a
 given location, they can obviously be matched an infinite number of times.
 
 ``|``
-   Alternation, or the "or" operator.   If A and B are regular expressions,
-   ``A|B`` will match any string that matches either ``A`` or ``B``. ``|`` has very
+   Alternation, or the "or" operator.   If *A* and *B* are regular expressions,
+   ``A|B`` will match any string that matches either *A* or *B*. ``|`` has very
    low precedence in order to make it work reasonably when you're alternating
-   multi-character strings. ``Crow|Servo`` will match either ``Crow`` or ``Servo``,
-   not ``Cro``, a ``'w'`` or an ``'S'``, and ``ervo``.
+   multi-character strings. ``Crow|Servo`` will match either ``'Crow'`` or ``'Servo'``,
+   not ``'Cro'``, a ``'w'`` or an ``'S'``, and ``'ervo'``.
 
    To match a literal ``'|'``, use ``\|``, or enclose it inside a character class,
    as in ``[|]``.
@@ -689,8 +699,7 @@ given location, they can obviously be matched an infinite number of times.
       >>> print(re.search('^From', 'Reciting From Memory'))
       None
 
-   .. To match a literal \character{\^}, use \regexp{\e\^} or enclose it
-   .. inside a character class, as in \regexp{[{\e}\^]}.
+   To match a literal ``'^'``, use ``\^``.
 
 ``$``
    Matches at the end of a line, which is defined as either the end of the string,
@@ -725,7 +734,7 @@ given location, they can obviously be matched an infinite number of times.
    match when it's contained inside another word. ::
 
       >>> p = re.compile(r'\bclass\b')
-      >>> print(p.search('no class at all'))  #doctest: +ELLIPSIS
+      >>> print(p.search('no class at all'))
       <_sre.SRE_Match object; span=(3, 8), match='class'>
       >>> print(p.search('the declassified algorithm'))
       None
@@ -743,7 +752,7 @@ given location, they can obviously be matched an infinite number of times.
       >>> p = re.compile('\bclass\b')
       >>> print(p.search('no class at all'))
       None
-      >>> print(p.search('\b' + 'class' + '\b'))  #doctest: +ELLIPSIS
+      >>> print(p.search('\b' + 'class' + '\b'))
       <_sre.SRE_Match object; span=(0, 7), match='\x08class\x08'>
 
    Second, inside a character class, where there's no use for this assertion,
@@ -786,7 +795,8 @@ of a group with a repeating qualifier, such as ``*``, ``+``, ``?``, or
 
 Groups indicated with ``'('``, ``')'`` also capture the starting and ending
 index of the text that they match; this can be retrieved by passing an argument
-to :meth:`group`, :meth:`start`, :meth:`end`, and :meth:`span`.  Groups are
+to :meth:`~re.match.group`, :meth:`~re.match.start`, :meth:`~re.match.end`, and
+:meth:`~re.match.span`.  Groups are
 numbered starting with 0.  Group 0 is always present; it's the whole RE, so
 :ref:`match object <match-objects>` methods all have group 0 as their default
 argument.  Later we'll see how to express groups that don't capture the span
@@ -812,13 +822,13 @@ from left to right. ::
    >>> m.group(2)
    'b'
 
-:meth:`group` can be passed multiple group numbers at a time, in which case it
+:meth:`~re.match.group` can be passed multiple group numbers at a time, in which case it
 will return a tuple containing the corresponding values for those groups. ::
 
    >>> m.group(2,1,2)
    ('b', 'abc', 'b')
 
-The :meth:`groups` method returns a tuple containing the strings for all the
+The :meth:`~re.match.groups` method returns a tuple containing the strings for all the
 subgroups, from 1 up to however many there are. ::
 
    >>> m.groups()
@@ -1034,7 +1044,7 @@ using the following pattern methods:
 | ``sub()``        | Find all substrings where the RE matches, and |
 |                  | replace them with a different string          |
 +------------------+-----------------------------------------------+
-| ``subn()``       | Does the same thing as :meth:`sub`,  but      |
+| ``subn()``       | Does the same thing as :meth:`!sub`,  but     |
 |                  | returns the new string and the number of      |
 |                  | replacements                                  |
 +------------------+-----------------------------------------------+
@@ -1043,10 +1053,10 @@ using the following pattern methods:
 Splitting Strings
 -----------------
 
-The :meth:`split` method of a pattern splits a string apart
+The :meth:`~re.pattern.split` method of a pattern splits a string apart
 wherever the RE matches, returning a list of the pieces. It's similar to the
-:meth:`split` method of strings but provides much more generality in the
-delimiters that you can split by; string :meth:`split` only supports splitting by
+:meth:`~str.split` method of strings but provides much more generality in the
+delimiters that you can split by; string :meth:`!split` only supports splitting by
 whitespace or by a fixed string.  As you'd expect, there's a module-level
 :func:`re.split` function, too.
 
@@ -1098,7 +1108,7 @@ Search and Replace
 ------------------
 
 Another common task is to find all the matches for a pattern, and replace them
-with a different string.  The :meth:`sub` method takes a replacement value,
+with a different string.  The :meth:`~re.pattern.sub` method takes a replacement value,
 which can be either a string or a function, and the string to be processed.
 
 .. method:: .sub(replacement, string[, count=0])
@@ -1112,7 +1122,7 @@ which can be either a string or a function, and the string to be processed.
    replaced; *count* must be a non-negative integer.  The default value of 0 means
    to replace all occurrences.
 
-Here's a simple example of using the :meth:`sub` method.  It replaces colour
+Here's a simple example of using the :meth:`~re.pattern.sub` method.  It replaces colour
 names with the word ``colour``::
 
    >>> p = re.compile('(blue|white|red)')
@@ -1121,7 +1131,7 @@ names with the word ``colour``::
    >>> p.sub('colour', 'blue socks and red shoes', count=1)
    'colour socks and red shoes'
 
-The :meth:`subn` method does the same work, but returns a 2-tuple containing the
+The :meth:`~re.pattern.subn` method does the same work, but returns a 2-tuple containing the
 new string value and the number of replacements  that were performed::
 
    >>> p = re.compile('(blue|white|red)')
@@ -1206,24 +1216,24 @@ Use String Methods
 
 Sometimes using the :mod:`re` module is a mistake.  If you're matching a fixed
 string, or a single character class, and you're not using any :mod:`re` features
-such as the :const:`IGNORECASE` flag, then the full power of regular expressions
+such as the :const:`~re.IGNORECASE` flag, then the full power of regular expressions
 may not be required. Strings have several methods for performing operations with
 fixed strings and they're usually much faster, because the implementation is a
 single small C loop that's been optimized for the purpose, instead of the large,
 more generalized regular expression engine.
 
 One example might be replacing a single fixed string with another one; for
-example, you might replace ``word`` with ``deed``.  ``re.sub()`` seems like the
-function to use for this, but consider the :meth:`replace` method.  Note that
-:func:`replace` will also replace ``word`` inside words, turning ``swordfish``
+example, you might replace ``word`` with ``deed``.  :func:`re.sub` seems like the
+function to use for this, but consider the :meth:`~str.replace` method.  Note that
+:meth:`!replace` will also replace ``word`` inside words, turning ``swordfish``
 into ``sdeedfish``, but the  naive RE ``word`` would have done that, too.  (To
 avoid performing the substitution on parts of words, the pattern would have to
 be ``\bword\b``, in order to require that ``word`` have a word boundary on
-either side.  This takes the job beyond  :meth:`replace`'s abilities.)
+either side.  This takes the job beyond  :meth:`!replace`'s abilities.)
 
 Another common task is deleting every occurrence of a single character from a
 string or replacing it with another single character.  You might do this with
-something like ``re.sub('\n', ' ', S)``, but :meth:`translate` is capable of
+something like ``re.sub('\n', ' ', S)``, but :meth:`~str.translate` is capable of
 doing both tasks and will be faster than any regular expression operation can
 be.
 
@@ -1234,18 +1244,18 @@ can be solved with a faster and simpler string method.
 match() versus search()
 -----------------------
 
-The :func:`match` function only checks if the RE matches at the beginning of the
-string while :func:`search` will scan forward through the string for a match.
-It's important to keep this distinction in mind.  Remember,  :func:`match` will
+The :func:`~re.match` function only checks if the RE matches at the beginning of the
+string while :func:`~re.search` will scan forward through the string for a match.
+It's important to keep this distinction in mind.  Remember,  :func:`!match` will
 only report a successful match which will start at 0; if the match wouldn't
-start at zero,  :func:`match` will *not* report it. ::
+start at zero,  :func:`!match` will *not* report it. ::
 
    >>> print(re.match('super', 'superstition').span())
    (0, 5)
    >>> print(re.match('super', 'insuperable'))
    None
 
-On the other hand, :func:`search` will scan forward through the string,
+On the other hand, :func:`~re.search` will scan forward through the string,
 reporting the first match it finds. ::
 
    >>> print(re.search('super', 'superstition').span())
@@ -1284,12 +1294,12 @@ doesn't work because of the greedy nature of ``.*``. ::
    >>> print(re.match('<.*>', s).group())
    <html><head><title>Title</title>
 
-The RE matches the ``'<'`` in ``<html>``, and the ``.*`` consumes the rest of
+The RE matches the ``'<'`` in ``'<html>'``, and the ``.*`` consumes the rest of
 the string.  There's still more left in the RE, though, and the ``>`` can't
 match at the end of the string, so the regular expression engine has to
 backtrack character by character until it finds a match for the ``>``.   The
-final match extends from the ``'<'`` in ``<html>`` to the ``'>'`` in
-``</title>``, which isn't what you want.
+final match extends from the ``'<'`` in ``'<html>'`` to the ``'>'`` in
+``'</title>'``, which isn't what you want.
 
 In this case, the solution is to use the non-greedy qualifiers ``*?``, ``+?``,
 ``??``, or ``{m,n}?``, which match as *little* text as possible.  In the above
@@ -1315,7 +1325,7 @@ notation, but they're not terribly readable.  REs of moderate complexity can
 become lengthy collections of backslashes, parentheses, and metacharacters,
 making them difficult to read and understand.
 
-For such REs, specifying the ``re.VERBOSE`` flag when compiling the regular
+For such REs, specifying the :const:`re.VERBOSE` flag when compiling the regular
 expression can be helpful, because it allows you to format the regular
 expression more clearly.
 
@@ -1354,5 +1364,5 @@ Friedl's Mastering Regular Expressions, published by O'Reilly.  Unfortunately,
 it exclusively concentrates on Perl and Java's flavours of regular expressions,
 and doesn't contain any Python material at all, so it won't be useful as a
 reference for programming in Python.  (The first edition covered Python's
-now-removed :mod:`regex` module, which won't help you much.)  Consider checking
+now-removed :mod:`!regex` module, which won't help you much.)  Consider checking
 it out from your library.
diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index 56fc4ed2c94..a4fe6d50707 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -14,8 +14,9 @@
 This module provides regular expression matching operations similar to
 those found in Perl.
 
-Both patterns and strings to be searched can be Unicode strings as well as
-8-bit strings. However, Unicode strings and 8-bit strings cannot be mixed:
+Both patterns and strings to be searched can be Unicode strings (:class:`str`)
+as well as 8-bit strings (:class:`bytes`).
+However, Unicode strings and 8-bit strings cannot be mixed:
 that is, you cannot match a Unicode string with a byte pattern or
 vice-versa; similarly, when asking for a substitution, the replacement
 string must be of the same type as both the pattern and the search string.
@@ -81,9 +82,7 @@ strings to be matched ``'in single quotes'``.)
 
 Some characters, like ``'|'`` or ``'('``, are special. Special
 characters either stand for classes of ordinary characters, or affect
-how the regular expressions around them are interpreted. Regular
-expression pattern strings may not contain null bytes, but can specify
-the null byte using a ``\number`` notation such as ``'\x00'``.
+how the regular expressions around them are interpreted.
 
 Repetition qualifiers (``*``, ``+``, ``?``, ``{m,n}``, etc) cannot be
 directly nested. This avoids ambiguity with the non-greedy modifier suffix
@@ -94,16 +93,16 @@ the expression ``(?:a{6})*`` matches any multiple of six ``'a'`` characters.
 
 The special characters are:
 
-``'.'``
+``.``
    (Dot.)  In the default mode, this matches any character except a newline.  If
    the :const:`DOTALL` flag has been specified, this matches any character
    including a newline.
 
-``'^'``
+``^``
    (Caret.)  Matches the start of the string, and in :const:`MULTILINE` mode also
    matches immediately after each newline.
 
-``'$'``
+``$``
    Matches the end of the string or just before the newline at the end of the
    string, and in :const:`MULTILINE` mode also matches before a newline.  ``foo``
    matches both 'foo' and 'foobar', while the regular expression ``foo$`` matches
@@ -112,28 +111,28 @@ The special characters are:
    a single ``$`` in ``'foo\n'`` will find two (empty) matches: one just before
    the newline, and one at the end of the string.
 
-``'*'``
+``*``
    Causes the resulting RE to match 0 or more repetitions of the preceding RE, as
    many repetitions as are possible.  ``ab*`` will match 'a', 'ab', or 'a' followed
    by any number of 'b's.
 
-``'+'``
+``+``
    Causes the resulting RE to match 1 or more repetitions of the preceding RE.
    ``ab+`` will match 'a' followed by any non-zero number of 'b's; it will not
    match just 'a'.
 
-``'?'``
+``?``
    Causes the resulting RE to match 0 or 1 repetitions of the preceding RE.
    ``ab?`` will match either 'a' or 'ab'.
 
 ``*?``, ``+?``, ``??``
    The ``'*'``, ``'+'``, and ``'?'`` qualifiers are all :dfn:`greedy`; they match
    as much text as possible.  Sometimes this behaviour isn't desired; if the RE
-   ``<.*>`` is matched against ``<a> b <c>``, it will match the entire
-   string, and not just ``<a>``.  Adding ``?`` after the qualifier makes it
+   ``<.*>`` is matched against ``'<a> b <c>'``, it will match the entire
+   string, and not just ``'<a>'``.  Adding ``?`` after the qualifier makes it
    perform the match in :dfn:`non-greedy` or :dfn:`minimal` fashion; as *few*
    characters as possible will be matched.  Using the RE ``<.*?>`` will match
-   only ``<a>``.
+   only ``'<a>'``.
 
 ``{m}``
    Specifies that exactly *m* copies of the previous RE should be matched; fewer
@@ -145,8 +144,8 @@ The special characters are:
    RE, attempting to match as many repetitions as possible.  For example,
    ``a{3,5}`` will match from 3 to 5 ``'a'`` characters.  Omitting *m* specifies a
    lower bound of zero,  and omitting *n* specifies an infinite upper bound.  As an
-   example, ``a{4,}b`` will match ``aaaab`` or a thousand ``'a'`` characters
-   followed by a ``b``, but not ``aaab``. The comma may not be omitted or the
+   example, ``a{4,}b`` will match ``'aaaab'`` or a thousand ``'a'`` characters
+   followed by a ``'b'``, but not ``'aaab'``. The comma may not be omitted or the
    modifier would be confused with the previously described form.
 
 ``{m,n}?``
@@ -156,7 +155,7 @@ The special characters are:
    6-character string ``'aaaaaa'``, ``a{3,5}`` will match 5 ``'a'`` characters,
    while ``a{3,5}?`` will only match 3 characters.
 
-``'\'``
+``\``
    Either escapes special characters (permitting you to match characters like
    ``'*'``, ``'?'``, and so forth), or signals a special sequence; special
    sequences are discussed below.
@@ -179,8 +178,8 @@ The special characters are:
      them by a ``'-'``, for example ``[a-z]`` will match any lowercase ASCII letter,
      ``[0-5][0-9]`` will match all the two-digits numbers from ``00`` to ``59``, and
      ``[0-9A-Fa-f]`` will match any hexadecimal digit.  If ``-`` is escaped (e.g.
-     ``[a\-z]``) or if it's placed as the first or last character (e.g. ``[a-]``),
-     it will match a literal ``'-'``.
+     ``[a\-z]``) or if it's placed as the first or last character
+     (e.g. ``[-a]`` or ``[a-]``), it will match a literal ``'-'``.
 
    * Special characters lose their special meaning inside sets.  For example,
      ``[(+*)]`` will match any of the literal characters ``'('``, ``'+'``,
@@ -201,13 +200,13 @@ The special characters are:
      place it at the beginning of the set.  For example, both ``[()[\]{}]`` and
      ``[]()[{}]`` will both match a parenthesis.
 
-``'|'``
-   ``A|B``, where A and B can be arbitrary REs, creates a regular expression that
-   will match either A or B.  An arbitrary number of REs can be separated by the
+``|``
+   ``A|B``, where *A* and *B* can be arbitrary REs, creates a regular expression that
+   will match either *A* or *B*.  An arbitrary number of REs can be separated by the
    ``'|'`` in this way.  This can be used inside groups (see below) as well.  As
    the target string is scanned, REs separated by ``'|'`` are tried from left to
    right. When one pattern completely matches, that branch is accepted. This means
-   that once ``A`` matches, ``B`` will not be tested further, even if it would
+   that once *A* matches, *B* will not be tested further, even if it would
    produce a longer overall match.  In other words, the ``'|'`` operator is never
    greedy.  To match a literal ``'|'``, use ``\|``, or enclose it inside a
    character class, as in ``[|]``.
@@ -217,7 +216,7 @@ The special characters are:
    start and end of a group; the contents of a group can be retrieved after a match
    has been performed, and can be matched later in the string with the ``\number``
    special sequence, described below.  To match the literals ``'('`` or ``')'``,
-   use ``\(`` or ``\)``, or enclose them inside a character class: ``[(] [)]``.
+   use ``\(`` or ``\)``, or enclose them inside a character class: ``[(]``, ``[)]``.
 
 ``(?...)``
    This is an extension notation (a ``'?'`` following a ``'('`` is not meaningful
@@ -232,10 +231,11 @@ The special characters are:
    letters set the corresponding flags: :const:`re.A` (ASCII-only matching),
    :const:`re.I` (ignore case), :const:`re.L` (locale dependent),
    :const:`re.M` (multi-line), :const:`re.S` (dot matches all),
-   and :const:`re.X` (verbose), for the entire regular expression. (The
-   flags are described in :ref:`contents-of-module-re`.) This
-   is useful if you wish to include the flags as part of the regular
-   expression, instead of passing a *flag* argument to the
+   :const:`re.U` (Unicode matching), and :const:`re.X` (verbose),
+   for the entire regular expression.
+   (The flags are described in :ref:`contents-of-module-re`.)
+   This is useful if you wish to include the flags as part of the
+   regular expression, instead of passing a *flag* argument to the
    :func:`re.compile` function.  Flags should be used first in the
    expression string.
 
@@ -272,10 +272,10 @@ The special characters are:
    | in the same pattern itself            | * ``(?P=quote)`` (as shown)      |
    |                                       | * ``\1``                         |
    +---------------------------------------+----------------------------------+
-   | when processing match object ``m``    | * ``m.group('quote')``           |
+   | when processing match object *m*      | * ``m.group('quote')``           |
    |                                       | * ``m.end('quote')`` (etc.)      |
    +---------------------------------------+----------------------------------+
-   | in a string passed to the ``repl``    | * ``\g<quote>``                  |
+   | in a string passed to the *repl*      | * ``\g<quote>``                  |
    | argument of ``re.sub()``              | * ``\g<1>``                      |
    |                                       | * ``\1``                         |
    +---------------------------------------+----------------------------------+
@@ -289,18 +289,18 @@ The special characters are:
 
 ``(?=...)``
    Matches if ``...`` matches next, but doesn't consume any of the string.  This is
-   called a lookahead assertion.  For example, ``Isaac (?=Asimov)`` will match
+   called a :dfn:`lookahead assertion`.  For example, ``Isaac (?=Asimov)`` will match
    ``'Isaac '`` only if it's followed by ``'Asimov'``.
 
 ``(?!...)``
-   Matches if ``...`` doesn't match next.  This is a negative lookahead assertion.
+   Matches if ``...`` doesn't match next.  This is a :dfn:`negative lookahead assertion`.
    For example, ``Isaac (?!Asimov)`` will match ``'Isaac '`` only if it's *not*
    followed by ``'Asimov'``.
 
 ``(?<=...)``
    Matches if the current position in the string is preceded by a match for ``...``
    that ends at the current position.  This is called a :dfn:`positive lookbehind
-   assertion`. ``(?<=abc)def`` will find a match in ``abcdef``, since the
+   assertion`. ``(?<=abc)def`` will find a match in ``'abcdef'``, since the
    lookbehind will back up 3 characters and check if the contained pattern matches.
    The contained pattern must only match strings of some fixed length, meaning that
    ``abc`` or ``a|b`` are allowed, but ``a*`` and ``a{3,4}`` are not.  Note that
@@ -358,26 +358,26 @@ character ``'$'``.
 
 ``\b``
    Matches the empty string, but only at the beginning or end of a word.
-   A word is defined as a sequence of Unicode alphanumeric or underscore
-   characters, so the end of a word is indicated by whitespace or a
-   non-alphanumeric, non-underscore Unicode character.  Note that formally,
+   A word is defined as a sequence of word characters.  Note that formally,
    ``\b`` is defined as the boundary between a ``\w`` and a ``\W`` character
    (or vice versa), or between ``\w`` and the beginning/end of the string.
    This means that ``r'\bfoo\b'`` matches ``'foo'``, ``'foo.'``, ``'(foo)'``,
    ``'bar foo baz'`` but not ``'foobar'`` or ``'foo3'``.
 
-   By default Unicode alphanumerics are the ones used, but this can  be changed
-   by using the :const:`ASCII` flag.  Inside a character range, ``\b``
-   represents the backspace character, for compatibility with Python's string
-   literals.
+   By default Unicode alphanumerics are the ones used in Unicode patterns, but
+   this can be changed by using the :const:`ASCII` flag.  Word boundaries are
+   determined by the current locale if the :const:`LOCALE` flag is used.
+   Inside a character range, ``\b`` represents the backspace character, for
+   compatibility with Python's string literals.
 
 ``\B``
    Matches the empty string, but only when it is *not* at the beginning or end
    of a word.  This means that ``r'py\B'`` matches ``'python'``, ``'py3'``,
    ``'py2'``, but not ``'py'``, ``'py.'``, or ``'py!'``.
-   ``\B`` is just the opposite of ``\b``, so word characters are
-   Unicode alphanumerics or the underscore, although this can be changed
-   by using the :const:`ASCII` flag.
+   ``\B`` is just the opposite of ``\b``, so word characters in Unicode
+   patterns are Unicode alphanumerics or the underscore, although this can
+   be changed by using the :const:`ASCII` flag.  Word boundaries are
+   determined by the current locale if the :const:`LOCALE` flag is used.
 
 ``\d``
    For Unicode (str) patterns:
@@ -387,11 +387,12 @@ character ``'$'``.
       used only ``[0-9]`` is matched (but the flag affects the entire
       regular expression, so in such cases using an explicit ``[0-9]``
       may be a better choice).
+
    For 8-bit (bytes) patterns:
       Matches any decimal digit; this is equivalent to ``[0-9]``.
 
 ``\D``
-   Matches any character which is not a Unicode decimal digit. This is
+   Matches any character which is not a decimal digit. This is
    the opposite of ``\d``. If the :const:`ASCII` flag is used this
    becomes the equivalent of ``[^0-9]`` (but the flag affects the entire
    regular expression, so in such cases using an explicit ``[^0-9]`` may
@@ -412,7 +413,7 @@ character ``'$'``.
       this is equivalent to ``[ \t\n\r\f\v]``.
 
 ``\S``
-   Matches any character which is not a Unicode whitespace character. This is
+   Matches any character which is not a whitespace character. This is
    the opposite of ``\s``. If the :const:`ASCII` flag is used this
    becomes the equivalent of ``[^ \t\n\r\f\v]`` (but the flag affects the entire
    regular expression, so in such cases using an explicit ``[^ \t\n\r\f\v]`` may
@@ -426,16 +427,21 @@ character ``'$'``.
       ``[a-zA-Z0-9_]`` is matched (but the flag affects the entire
       regular expression, so in such cases using an explicit
       ``[a-zA-Z0-9_]`` may be a better choice).
+
    For 8-bit (bytes) patterns:
       Matches characters considered alphanumeric in the ASCII character set;
-      this is equivalent to ``[a-zA-Z0-9_]``.
+      this is equivalent to ``[a-zA-Z0-9_]``.  If the :const:`LOCALE` flag is
+      used, matches characters considered alphanumeric in the current locale
+      and the underscore.
 
 ``\W``
-   Matches any character which is not a Unicode word character. This is
+   Matches any character which is not a word character. This is
    the opposite of ``\w``. If the :const:`ASCII` flag is used this
    becomes the equivalent of ``[^a-zA-Z0-9_]`` (but the flag affects the
    entire regular expression, so in such cases using an explicit
-   ``[^a-zA-Z0-9_]`` may be a better choice).
+   ``[^a-zA-Z0-9_]`` may be a better choice).  If the :const:`LOCALE` flag is
+   used, matches characters considered alphanumeric in the current locale
+   and the underscore.
 
 ``\Z``
    Matches only at the end of the string.
@@ -451,7 +457,7 @@ accepted by the regular expression parser::
 only inside character classes.)
 
 ``'\u'`` and ``'\U'`` escape sequences are only recognized in Unicode
-patterns.  In bytes patterns they are not treated specially.
+patterns.  In bytes patterns they are errors.
 
 Octal escapes are included in a limited form.  If the first digit is a 0, or if
 there are three octal digits, it is considered an octal escape. Otherwise, it is
@@ -526,6 +532,7 @@ form.
    Make ``\w``, ``\W``, ``\b``, ``\B``, ``\d``, ``\D``, ``\s`` and ``\S``
    perform ASCII-only matching instead of full Unicode matching.  This is only
    meaningful for Unicode patterns, and is ignored for byte patterns.
+   Corresponds to the inline flag ``(?a)``.
 
    Note that for backward compatibility, the :const:`re.U` flag still
    exists (as well as its synonym :const:`re.UNICODE` and its embedded
@@ -537,26 +544,40 @@ form.
 .. data:: DEBUG
 
    Display debug information about compiled expression.
+   No corresponding inline flag.
 
 
 .. data:: I
           IGNORECASE
 
    Perform case-insensitive matching; expressions like ``[A-Z]`` will also
-   match lowercase letters.  The current locale does not change the effect of
-   this flag.  Full Unicode matching (such as ``?`` matching ``?``) also
-   works unless the :const:`re.ASCII` flag is also used to disable non-ASCII
-   matches.
-
+   match lowercase letters.  Full Unicode matching (such as ``?`` matching
+   ``?``) also works unless the :const:`re.ASCII` flag is used to disable
+   non-ASCII matches.  The current locale does not change the effect of this
+   flag unless the :const:`re.LOCALE` flag is also used.
+   Corresponds to the inline flag ``(?i)``.
+
+   Note that when the Unicode patterns ``[a-z]`` or ``[A-Z]`` are used in
+   combination with the :const:`IGNORECASE` flag, they will match the 52 ASCII
+   letters and 4 additional non-ASCII letters: '?' (U+0130, Latin capital
+   letter I with dot above), '?' (U+0131, Latin small letter dotless i),
+   '?' (U+017F, Latin small letter long s) and '?' (U+212A, Kelvin sign).
+   If the :const:`ASCII` flag is used, only letters 'a' to 'z'
+   and 'A' to 'Z' are matched (but the flag affects the entire regular
+   expression, so in such cases using an explicit ``(?-i:[a-zA-Z])`` may be
+   a better choice).
 
 .. data:: L
           LOCALE
 
-   Make ``\w``, ``\W``, ``\b``, ``\B``, ``\s`` and ``\S`` dependent on the
-   current locale. The use of this flag is discouraged as the locale mechanism
-   is very unreliable, and it only handles one "culture" at a time anyway;
-   you should use Unicode matching instead, which is the default in Python 3
-   for Unicode (str) patterns. This flag can be used only with bytes patterns.
+   Make ``\w``, ``\W``, ``\b``, ``\B`` and case-insensitive matching
+   dependent on the current locale.  This flag can be used only with bytes
+   patterns.  The use of this flag is discouraged as the locale mechanism
+   is very unreliable, it only handles one "culture" at a time, and it only
+   works with 8-bit locales.  Unicode matching is already enabled by default
+   in Python 3 for Unicode (str) patterns, and it is able to handle different
+   locales/languages.
+   Corresponds to the inline flag ``(?L)``.
 
    .. versionchanged:: 3.6
       :const:`re.LOCALE` can be used only with bytes patterns and is
@@ -572,6 +593,7 @@ form.
    end of each line (immediately preceding each newline).  By default, ``'^'``
    matches only at the beginning of the string, and ``'$'`` only at the end of the
    string and immediately before the newline (if any) at the end of the string.
+   Corresponds to the inline flag ``(?m)``.
 
 
 .. data:: S
@@ -579,6 +601,7 @@ form.
 
    Make the ``'.'`` special character match any character at all, including a
    newline; without this flag, ``'.'`` will match anything *except* a newline.
+   Corresponds to the inline flag ``(?s)``.
 
 
 .. data:: X
@@ -600,7 +623,7 @@ form.
                          \d *  # some fractional digits""", re.X)
       b = re.compile(r"\d+\.\d*")
 
-
+   Corresponds to the inline flag ``(?x)``.
 
 
 .. function:: search(pattern, string, flags=0)
@@ -655,7 +678,7 @@ form.
 
    If there are capturing groups in the separator and it matches at the start of
    the string, the result will start with an empty string.  The same holds for
-   the end of the string:
+   the end of the string::
 
       >>> re.split('(\W+)', '...words, words...')
       ['', '...', 'words', ', ', 'words', '...', '']
@@ -666,7 +689,7 @@ form.
    .. note::
 
       :func:`split` doesn't currently split a string on an empty pattern match.
-      For example:
+      For example::
 
          >>> re.split('x*', 'axbc')
          ['a', 'bc']
@@ -723,7 +746,7 @@ form.
    converted to a single newline character, ``\r`` is converted to a carriage return, and
    so forth.  Unknown escapes such as ``\&`` are left alone.  Backreferences, such
    as ``\6``, are replaced with the substring matched by group 6 in the pattern.
-   For example:
+   For example::
 
       >>> re.sub(r'def\s+([a-zA-Z_][a-zA-Z_0-9]*)\s*\(\s*\):',
       ...        r'static PyObject*\npy_\1(void)\n{',
@@ -731,8 +754,8 @@ form.
       'static PyObject*\npy_myfunc(void)\n{'
 
    If *repl* is a function, it is called for every non-overlapping occurrence of
-   *pattern*.  The function takes a single match object argument, and returns the
-   replacement string.  For example:
+   *pattern*.  The function takes a single :ref:`match object <match-objects>`
+   argument, and returns the replacement string.  For example::
 
       >>> def dashrepl(matchobj):
       ...     if matchobj.group(0) == '-': return ' '
@@ -742,7 +765,7 @@ form.
       >>> re.sub(r'\sAND\s', ' & ', 'Baked Beans And Spam', flags=re.IGNORECASE)
       'Baked Beans & Spam'
 
-   The pattern may be a string or an RE object.
+   The pattern may be a string or a :ref:`pattern object <re-objects>`.
 
    The optional argument *count* is the maximum number of pattern occurrences to be
    replaced; *count* must be a non-negative integer.  If omitted or zero, all
@@ -804,6 +827,14 @@ form.
       >>> print('|'.join(map(re.escape, sorted(operators, reverse=True))))
       \/|\-|\+|\*\*|\*
 
+   This functions must not be used for the replacement string in :func:`sub`
+   and :func:`subn`, only backslashes should be escaped.  For example::
+
+      >>> digits_re = r'\d+'
+      >>> sample = '/usr/sbin/sendmail - 0 errors, 12 warnings'
+      >>> print(re.sub(digits_re, digits_re.replace('\\', r'\\'), sample))
+      /usr/sbin/sendmail - \d+ errors, \d+ warnings
+
    .. versionchanged:: 3.3
       The ``'_'`` character is no longer escaped.
 
@@ -871,12 +902,12 @@ attributes:
    from *pos* to ``endpos - 1`` will be searched for a match.  If *endpos* is less
    than *pos*, no match will be found; otherwise, if *rx* is a compiled regular
    expression object, ``rx.search(string, 0, 50)`` is equivalent to
-   ``rx.search(string[:50], 0)``.
+   ``rx.search(string[:50], 0)``. ::
 
-   >>> pattern = re.compile("d")
-   >>> pattern.search("dog")     # Match at index 0
-   <_sre.SRE_Match object; span=(0, 1), match='d'>
-   >>> pattern.search("dog", 1)  # No match; search doesn't include the "d"
+      >>> pattern = re.compile("d")
+      >>> pattern.search("dog")     # Match at index 0
+      <_sre.SRE_Match object; span=(0, 1), match='d'>
+      >>> pattern.search("dog", 1)  # No match; search doesn't include the "d"
 
 
 .. method:: regex.match(string[, pos[, endpos]])
@@ -887,12 +918,12 @@ attributes:
    different from a zero-length match.
 
    The optional *pos* and *endpos* parameters have the same meaning as for the
-   :meth:`~regex.search` method.
+   :meth:`~regex.search` method. ::
 
-   >>> pattern = re.compile("o")
-   >>> pattern.match("dog")      # No match as "o" is not at the start of "dog".
-   >>> pattern.match("dog", 1)   # Match as "o" is the 2nd character of "dog".
-   <_sre.SRE_Match object; span=(1, 2), match='o'>
+      >>> pattern = re.compile("o")
+      >>> pattern.match("dog")      # No match as "o" is not at the start of "dog".
+      >>> pattern.match("dog", 1)   # Match as "o" is the 2nd character of "dog".
+      <_sre.SRE_Match object; span=(1, 2), match='o'>
 
    If you want to locate a match anywhere in *string*, use
    :meth:`~regex.search` instead (see also :ref:`search-vs-match`).
@@ -905,13 +936,13 @@ attributes:
    match the pattern; note that this is different from a zero-length match.
 
    The optional *pos* and *endpos* parameters have the same meaning as for the
-   :meth:`~regex.search` method.
+   :meth:`~regex.search` method. ::
 
-   >>> pattern = re.compile("o[gh]")
-   >>> pattern.fullmatch("dog")      # No match as "o" is not at the start of "dog".
-   >>> pattern.fullmatch("ogre")     # No match as not the full string matches.
-   >>> pattern.fullmatch("doggie", 1, 3)   # Matches within given limits.
-   <_sre.SRE_Match object; span=(1, 3), match='og'>
+      >>> pattern = re.compile("o[gh]")
+      >>> pattern.fullmatch("dog")      # No match as "o" is not at the start of "dog".
+      >>> pattern.fullmatch("ogre")     # No match as not the full string matches.
+      >>> pattern.fullmatch("doggie", 1, 3)   # Matches within given limits.
+      <_sre.SRE_Match object; span=(1, 3), match='og'>
 
    .. versionadded:: 3.4
 
@@ -925,14 +956,14 @@ attributes:
 
    Similar to the :func:`findall` function, using the compiled pattern, but
    also accepts optional *pos* and *endpos* parameters that limit the search
-   region like for :meth:`match`.
+   region like for :meth:`search`.
 
 
 .. method:: regex.finditer(string[, pos[, endpos]])
 
    Similar to the :func:`finditer` function, using the compiled pattern, but
    also accepts optional *pos* and *endpos* parameters that limit the search
-   region like for :meth:`match`.
+   region like for :meth:`search`.
 
 
 .. method:: regex.sub(repl, string, count=0)
@@ -1010,7 +1041,7 @@ Match objects support the following methods and attributes:
    pattern, an :exc:`IndexError` exception is raised. If a group is contained in a
    part of the pattern that did not match, the corresponding result is ``None``.
    If a group is contained in a part of the pattern that matched multiple times,
-   the last match is returned.
+   the last match is returned. ::
 
       >>> m = re.match(r"(\w+) (\w+)", "Isaac Newton, physicist")
       >>> m.group(0)       # The entire match
@@ -1027,7 +1058,7 @@ Match objects support the following methods and attributes:
    string argument is not used as a group name in the pattern, an :exc:`IndexError`
    exception is raised.
 
-   A moderately complicated example:
+   A moderately complicated example::
 
       >>> m = re.match(r"(?P<first_name>\w+) (?P<last_name>\w+)", "Malcolm Reynolds")
       >>> m.group('first_name')
@@ -1035,14 +1066,14 @@ Match objects support the following methods and attributes:
       >>> m.group('last_name')
       'Reynolds'
 
-   Named groups can also be referred to by their index:
+   Named groups can also be referred to by their index::
 
       >>> m.group(1)
       'Malcolm'
       >>> m.group(2)
       'Reynolds'
 
-   If a group matches multiple times, only the last match is accessible:
+   If a group matches multiple times, only the last match is accessible::
 
       >>> m = re.match(r"(..)+", "a1b2c3")  # Matches 3 times.
       >>> m.group(1)                        # Returns only the last match.
@@ -1052,7 +1083,7 @@ Match objects support the following methods and attributes:
 .. method:: match.__getitem__(g)
 
    This is identical to ``m.group(g)``.  This allows easier access to
-   an individual group from a match:
+   an individual group from a match::
 
       >>> m = re.match(r"(\w+) (\w+)", "Isaac Newton, physicist")
       >>> m[0]       # The entire match
@@ -1071,7 +1102,7 @@ Match objects support the following methods and attributes:
    many groups are in the pattern.  The *default* argument is used for groups that
    did not participate in the match; it defaults to ``None``.
 
-   For example:
+   For example::
 
       >>> m = re.match(r"(\d+)\.(\d+)", "24.1632")
       >>> m.groups()
@@ -1079,7 +1110,7 @@ Match objects support the following methods and attributes:
 
    If we make the decimal place and everything after it optional, not all groups
    might participate in the match.  These groups will default to ``None`` unless
-   the *default* argument is given:
+   the *default* argument is given::
 
       >>> m = re.match(r"(\d+)\.?(\d+)?", "24")
       >>> m.groups()      # Second group defaults to None.
@@ -1092,7 +1123,7 @@ Match objects support the following methods and attributes:
 
    Return a dictionary containing all the *named* subgroups of the match, keyed by
    the subgroup name.  The *default* argument is used for groups that did not
-   participate in the match; it defaults to ``None``.  For example:
+   participate in the match; it defaults to ``None``.  For example::
 
       >>> m = re.match(r"(?P<first_name>\w+) (?P<last_name>\w+)", "Malcolm Reynolds")
       >>> m.groupdict()
@@ -1115,7 +1146,7 @@ Match objects support the following methods and attributes:
    ``m.start(0)`` is 1, ``m.end(0)`` is 2, ``m.start(1)`` and ``m.end(1)`` are both
    2, and ``m.start(2)`` raises an :exc:`IndexError` exception.
 
-   An example that will remove *remove_this* from email addresses:
+   An example that will remove *remove_this* from email addresses::
 
       >>> email = "tony at tiremove_thisger.net"
       >>> m = re.search("remove_this", email)
@@ -1161,7 +1192,7 @@ Match objects support the following methods and attributes:
 
 .. attribute:: match.re
 
-   The regular expression object whose :meth:`~regex.match` or
+   The :ref:`regular expression object <re-objects>` whose :meth:`~regex.match` or
    :meth:`~regex.search` method produced this match instance.
 
 
@@ -1194,7 +1225,7 @@ a 5-character string with each character representing a card, "a" for ace, "k"
 for king, "q" for queen, "j" for jack, "t" for 10, and "2" through "9"
 representing the card with that value.
 
-To see if a given string is a valid hand, one could do the following:
+To see if a given string is a valid hand, one could do the following::
 
    >>> valid = re.compile(r"^[a2-9tjqk]{5}$")
    >>> displaymatch(valid.match("akt5q"))  # Valid.
@@ -1205,7 +1236,7 @@ To see if a given string is a valid hand, one could do the following:
    "<Match: '727ak', groups=()>"
 
 That last hand, ``"727ak"``, contained a pair, or two of the same valued cards.
-To match this with a regular expression, one could use backreferences as such:
+To match this with a regular expression, one could use backreferences as such::
 
    >>> pair = re.compile(r".*(.).*\1")
    >>> displaymatch(pair.match("717ak"))     # Pair of 7s.
@@ -1307,7 +1338,7 @@ restrict the match at the beginning of the string::
 
 Note however that in :const:`MULTILINE` mode :func:`match` only matches at the
 beginning of the string, whereas using :func:`search` with a regular expression
-beginning with ``'^'`` will match at the beginning of each line.
+beginning with ``'^'`` will match at the beginning of each line. ::
 
    >>> re.match('X', 'A\nB\nX', re.MULTILINE)  # No match
    >>> re.search('^X', 'A\nB\nX', re.MULTILINE)  # Match
@@ -1323,7 +1354,7 @@ easily read and modified by Python as demonstrated in the following example that
 creates a phonebook.
 
 First, here is the input.  Normally it may come from a file, here we are using
-triple-quoted string syntax:
+triple-quoted string syntax::
 
    >>> text = """Ross McFluff: 834.345.1254 155 Elm Street
    ...
@@ -1398,7 +1429,7 @@ Finding all Adverbs
 :func:`findall` matches *all* occurrences of a pattern, not just the first
 one as :func:`search` does.  For example, if one was a writer and wanted to
 find all of the adverbs in some text, he or she might use :func:`findall` in
-the following manner:
+the following manner::
 
    >>> text = "He was carefully disguised but captured quickly by police."
    >>> re.findall(r"\w+ly", text)
@@ -1412,7 +1443,7 @@ If one wants more information about all matches of a pattern than the matched
 text, :func:`finditer` is useful as it provides :ref:`match objects
 <match-objects>` instead of strings.  Continuing with the previous example, if
 one was a writer who wanted to find all of the adverbs *and their positions* in
-some text, he or she would use :func:`finditer` in the following manner:
+some text, he or she would use :func:`finditer` in the following manner::
 
    >>> text = "He was carefully disguised but captured quickly by police."
    >>> for m in re.finditer(r"\w+ly", text):
@@ -1427,7 +1458,7 @@ Raw String Notation
 Raw string notation (``r"text"``) keeps regular expressions sane.  Without it,
 every backslash (``'\'``) in a regular expression would have to be prefixed with
 another one to escape it.  For example, the two following lines of code are
-functionally identical:
+functionally identical::
 
    >>> re.match(r"\W(.)\1\W", " ff ")
    <_sre.SRE_Match object; span=(0, 4), match=' ff '>
@@ -1437,7 +1468,7 @@ functionally identical:
 When one wants to match a literal backslash, it must be escaped in the regular
 expression.  With raw string notation, this means ``r"\\"``.  Without raw string
 notation, one must use ``"\\\\"``, making the following lines of code
-functionally identical:
+functionally identical::
 
    >>> re.match(r"\\", r"\\")
    <_sre.SRE_Match object; span=(0, 1), match='\\'>


From webhook-mailer at python.org  Sat Oct 14 08:22:46 2017
From: webhook-mailer at python.org (INADA Naoki)
Date: Sat, 14 Oct 2017 12:22:46 -0000
Subject: [Python-checkins] bpo-31672: doc: Remove one sentence from
 library/string.rst (GH-3990)
Message-ID: <mailman.49.1507983768.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/073150db39408c1800e4b9e895ad0b0e195f1056
commit: 073150db39408c1800e4b9e895ad0b0e195f1056
branch: master
author: INADA Naoki <methane at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-10-14T21:22:41+09:00
summary:

bpo-31672: doc: Remove one sentence from library/string.rst (GH-3990)

This sentence is removed while backporting to 3.6 branch.
See https://github.com/python/cpython/pull/3982#discussion_r144555768

files:
M Doc/library/string.rst

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 1076cdb2346..5b254285257 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -765,7 +765,7 @@ attributes:
 
      While *flags* is kept to ``re.IGNORECASE`` for backward compatibility,
      you can override it to ``0`` or ``re.IGNORECASE | re.ASCII`` when
-     subclassing.  It's simple way to avoid unexpected match like above example.
+     subclassing.
 
   .. versionchanged:: 3.7
      *braceidpattern* can be used to define separate patterns used inside and


From webhook-mailer at python.org  Sat Oct 14 10:36:12 2017
From: webhook-mailer at python.org (Raymond Hettinger)
Date: Sat, 14 Oct 2017 14:36:12 -0000
Subject: [Python-checkins] bpo-31757: Make Fibonacci examples consistent
 (#3991)
Message-ID: <mailman.50.1507991774.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/8c26a34f93db7ae96b42bcce6b557437436c7721
commit: 8c26a34f93db7ae96b42bcce6b557437436c7721
branch: master
author: Raymond Hettinger <rhettinger at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-10-14T07:36:08-07:00
summary:

bpo-31757: Make Fibonacci examples consistent (#3991)

files:
M Doc/tutorial/introduction.rst
M Doc/tutorial/modules.rst

diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
index 8956aa5a261..2fa894a533f 100644
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -458,16 +458,18 @@ First Steps Towards Programming
 ===============================
 
 Of course, we can use Python for more complicated tasks than adding two and two
-together.  For instance, we can write an initial sub-sequence of the *Fibonacci*
-series as follows::
+together.  For instance, we can write an initial sub-sequence of the
+`Fibonacci series <https://en.wikipedia.org/wiki/Fibonacci_number>`_
+as follows::
 
    >>> # Fibonacci series:
    ... # the sum of two elements defines the next
    ... a, b = 0, 1
-   >>> while b < 10:
-   ...     print(b)
+   >>> while a < 10:
+   ...     print(a)
    ...     a, b = b, a+b
    ...
+   0
    1
    1
    2
@@ -483,7 +485,7 @@ This example introduces several new features.
   first before any of the assignments take place.  The right-hand side expressions
   are evaluated  from the left to the right.
 
-* The :keyword:`while` loop executes as long as the condition (here: ``b < 10``)
+* The :keyword:`while` loop executes as long as the condition (here: ``a < 10``)
   remains true.  In Python, like in C, any non-zero integer value is true; zero is
   false.  The condition may also be a string or list value, in fact any sequence;
   anything with a non-zero length is true, empty sequences are false.  The test
@@ -516,11 +518,11 @@ This example introduces several new features.
   or end the output with a different string::
 
      >>> a, b = 0, 1
-     >>> while b < 1000:
-     ...     print(b, end=',')
+     >>> while a < 1000:
+     ...     print(a, end=',')
      ...     a, b = b, a+b
      ...
-     1,1,2,3,5,8,13,21,34,55,89,144,233,377,610,987,
+     0,1,1,2,3,5,8,13,21,34,55,89,144,233,377,610,987,
 
 
 .. rubric:: Footnotes
diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
index 1e3d5c01a47..2be03ac6ae3 100644
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -29,16 +29,16 @@ called :file:`fibo.py` in the current directory with the following contents::
 
    def fib(n):    # write Fibonacci series up to n
        a, b = 0, 1
-       while b < n:
-           print(b, end=' ')
+       while a < n:
+           print(a, end=' ')
            a, b = b, a+b
        print()
 
    def fib2(n):   # return Fibonacci series up to n
        result = []
        a, b = 0, 1
-       while b < n:
-           result.append(b)
+       while a < n:
+           result.append(a)
            a, b = b, a+b
        return result
 
@@ -52,9 +52,9 @@ the current symbol table; it only enters the module name ``fibo`` there. Using
 the module name you can access the functions::
 
    >>> fibo.fib(1000)
-   1 1 2 3 5 8 13 21 34 55 89 144 233 377 610 987
+   0 1 1 2 3 5 8 13 21 34 55 89 144 233 377 610 987
    >>> fibo.fib2(100)
-   [1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89]
+   [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89]
    >>> fibo.__name__
    'fibo'
 
@@ -62,7 +62,7 @@ If you intend to use a function often you can assign it to a local name::
 
    >>> fib = fibo.fib
    >>> fib(500)
-   1 1 2 3 5 8 13 21 34 55 89 144 233 377
+   0 1 1 2 3 5 8 13 21 34 55 89 144 233 377
 
 
 .. _tut-moremodules:
@@ -92,7 +92,7 @@ module directly into the importing module's symbol table.  For example::
 
    >>> from fibo import fib, fib2
    >>> fib(500)
-   1 1 2 3 5 8 13 21 34 55 89 144 233 377
+   0 1 1 2 3 5 8 13 21 34 55 89 144 233 377
 
 This does not introduce the module name from which the imports are taken in the
 local symbol table (so in the example, ``fibo`` is not defined).
@@ -101,7 +101,7 @@ There is even a variant to import all names that a module defines::
 
    >>> from fibo import *
    >>> fib(500)
-   1 1 2 3 5 8 13 21 34 55 89 144 233 377
+   0 1 1 2 3 5 8 13 21 34 55 89 144 233 377
 
 This imports all names except those beginning with an underscore (``_``).
 In most cases Python programmers do not use this facility since it introduces
@@ -145,7 +145,7 @@ executed as the "main" file:
 .. code-block:: shell-session
 
    $ python fibo.py 50
-   1 1 2 3 5 8 13 21 34
+   0 1 1 2 3 5 8 13 21 34
 
 If the module is imported, the code is not run::
 


From webhook-mailer at python.org  Sat Oct 14 21:31:18 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 15 Oct 2017 01:31:18 -0000
Subject: [Python-checkins] bpo-25588: Document autotest in
 idle_test/README.txt. (#4000)
Message-ID: <mailman.51.1508031078.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/620f70eed615efde35517d7ae86354de3b2a0d03
commit: 620f70eed615efde35517d7ae86354de3b2a0d03
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-10-14T21:31:14-04:00
summary:

bpo-25588: Document autotest in idle_test/README.txt. (#4000)

Follow-up to Victor's patch that enabled autotest to run in IDLE's Shell.

files:
M Lib/idlelib/idle_test/README.txt

diff --git a/Lib/idlelib/idle_test/README.txt b/Lib/idlelib/idle_test/README.txt
index c580fb9e793..5f3678fc7e1 100644
--- a/Lib/idlelib/idle_test/README.txt
+++ b/Lib/idlelib/idle_test/README.txt
@@ -144,9 +144,18 @@ green. Idle tests must not disturb the environment in a way that makes
 other tests fail (issue 18081).
 
 To run an individual Testcase or test method, extend the dotted name
-given to unittest on the command line.
+given to unittest on the command line or use the test -m option.  The
+latter allows use of other regrtest options.  When using the latter,
+all components of the pattern must be present, but any can be replaced
+by '*'.
 
 python -m unittest -v idlelib.idle_test.test_xyz.Test_case.test_meth
+python -m test -m idlelib.idle_test.text_xyz.Test_case.test_meth test_idle
+
+The test suite can be run in an IDLE user process from Shell.
+>>> import test.autotest  # Issue 25588, 2017/10/13, 3.6.4, 3.7.0a2.
+There are currently failures not usually present, and this does not
+work when run from the editor.
 
 
 4. Human-mediated Tests


From webhook-mailer at python.org  Sat Oct 14 23:17:00 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 15 Oct 2017 03:17:00 -0000
Subject: [Python-checkins] [3.6] bpo-25588: Document autotest in
 idle_test/README.txt. (GH-4000) (#4001)
Message-ID: <mailman.52.1508037423.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/0fee56c86344386bde8486ab803f564cb8a5203b
commit: 0fee56c86344386bde8486ab803f564cb8a5203b
branch: 3.6
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-10-14T23:16:57-04:00
summary:

[3.6] bpo-25588: Document autotest in idle_test/README.txt. (GH-4000) (#4001)

Follow-up to Victor's patch that enabled autotest to run in IDLE's Shell.
(cherry picked from commit 620f70e)

files:
M Lib/idlelib/idle_test/README.txt

diff --git a/Lib/idlelib/idle_test/README.txt b/Lib/idlelib/idle_test/README.txt
index c580fb9e793..5f3678fc7e1 100644
--- a/Lib/idlelib/idle_test/README.txt
+++ b/Lib/idlelib/idle_test/README.txt
@@ -144,9 +144,18 @@ green. Idle tests must not disturb the environment in a way that makes
 other tests fail (issue 18081).
 
 To run an individual Testcase or test method, extend the dotted name
-given to unittest on the command line.
+given to unittest on the command line or use the test -m option.  The
+latter allows use of other regrtest options.  When using the latter,
+all components of the pattern must be present, but any can be replaced
+by '*'.
 
 python -m unittest -v idlelib.idle_test.test_xyz.Test_case.test_meth
+python -m test -m idlelib.idle_test.text_xyz.Test_case.test_meth test_idle
+
+The test suite can be run in an IDLE user process from Shell.
+>>> import test.autotest  # Issue 25588, 2017/10/13, 3.6.4, 3.7.0a2.
+There are currently failures not usually present, and this does not
+work when run from the editor.
 
 
 4. Human-mediated Tests


From webhook-mailer at python.org  Sat Oct 14 23:41:16 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 15 Oct 2017 03:41:16 -0000
Subject: [Python-checkins] bpo-31780: Fix incorrect error message for ', x',
 ', b', ', o' specs (#4002)
Message-ID: <mailman.53.1508038877.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/28773ca7a7aa58a28e42a9eb0066acf71b5a8dc4
commit: 28773ca7a7aa58a28e42a9eb0066acf71b5a8dc4
branch: master
author: Dargor <Pablogsal at gmail.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-10-14T23:41:13-04:00
summary:

bpo-31780: Fix incorrect error message for ',x', ',b', ',o' specs (#4002)

Patch by Pablo.

files:
M Python/formatter_unicode.c

diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
index 2df749493bf..397ae7faafc 100644
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -32,11 +32,11 @@ invalid_comma_type(Py_UCS4 presentation_type)
 {
     if (presentation_type > 32 && presentation_type < 128)
         PyErr_Format(PyExc_ValueError,
-                     "Cannot specify ',' or '_' with '%c'.",
+                     "Cannot specify ',' with '%c'.",
                      (char)presentation_type);
     else
         PyErr_Format(PyExc_ValueError,
-                     "Cannot specify ',' or '_' with '\\x%x'.",
+                     "Cannot specify ',' with '\\x%x'.",
                      (unsigned int)presentation_type);
 }
 


From webhook-mailer at python.org  Sun Oct 15 00:01:31 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 15 Oct 2017 04:01:31 -0000
Subject: [Python-checkins] [3.6] bpo-31780: Fix incorrect error message for
 ', x', ', b', ', o' specs (GH-4002) (#4004)
Message-ID: <mailman.54.1508040093.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/59b5c139d2ae95b1d1da63f81c3d777932215533
commit: 59b5c139d2ae95b1d1da63f81c3d777932215533
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-10-15T00:01:28-04:00
summary:

[3.6] bpo-31780: Fix incorrect error message for ',x', ',b', ',o' specs (GH-4002) (#4004)

Patch by Pablo.
(cherry picked from commit 28773ca7a7aa58a28e42a9eb0066acf71b5a8dc4)

files:
M Python/formatter_unicode.c

diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
index 9192bfd6a67..d2be76f1e1a 100644
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -32,11 +32,11 @@ invalid_comma_type(Py_UCS4 presentation_type)
 {
     if (presentation_type > 32 && presentation_type < 128)
         PyErr_Format(PyExc_ValueError,
-                     "Cannot specify ',' or '_' with '%c'.",
+                     "Cannot specify ',' with '%c'.",
                      (char)presentation_type);
     else
         PyErr_Format(PyExc_ValueError,
-                     "Cannot specify ',' or '_' with '\\x%x'.",
+                     "Cannot specify ',' with '\\x%x'.",
                      (unsigned int)presentation_type);
 }
 


From webhook-mailer at python.org  Sun Oct 15 03:31:39 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Sun, 15 Oct 2017 07:31:39 -0000
Subject: [Python-checkins] bpo-31754: Fix type of 'itemsize' in
 PyBuffer_FillContiguousStrides (GH-3993)
Message-ID: <mailman.55.1508052700.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/1b9e76ed3a055a53ca67397e928e1b408461900b
commit: 1b9e76ed3a055a53ca67397e928e1b408461900b
branch: master
author: vyas45 <vyas45 at gmail.com>
committer: Berker Peksag <berker.peksag at gmail.com>
date: 2017-10-15T10:31:36+03:00
summary:

bpo-31754: Fix type of 'itemsize' in PyBuffer_FillContiguousStrides (GH-3993)

files:
M Doc/c-api/buffer.rst

diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
index 3d851b7c39c..8c2de9691f3 100644
--- a/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@ -473,7 +473,7 @@ Buffer-related functions
    (*order* is ``'A'``).  Return ``0`` otherwise.
 
 
-.. c:function:: void PyBuffer_FillContiguousStrides(int ndim, Py_ssize_t *shape, Py_ssize_t *strides, Py_ssize_t itemsize, char order)
+.. c:function:: void PyBuffer_FillContiguousStrides(int ndims, Py_ssize_t *shape, Py_ssize_t *strides, int itemsize, char order)
 
    Fill the *strides* array with byte-strides of a :term:`contiguous` (C-style if
    *order* is ``'C'`` or Fortran-style if *order* is ``'F'``) array of the


From webhook-mailer at python.org  Sun Oct 15 03:37:10 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Sun, 15 Oct 2017 07:37:10 -0000
Subject: [Python-checkins] [3.6] bpo-31754: Fix type of 'itemsize' in
 PyBuffer_FillContiguousStrides (GH-3993)
Message-ID: <mailman.56.1508053032.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/e881302b70ab36bafcf37e3917be118bbec97763
commit: e881302b70ab36bafcf37e3917be118bbec97763
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Berker Peksag <berker.peksag at gmail.com>
date: 2017-10-15T10:37:07+03:00
summary:

[3.6] bpo-31754: Fix type of 'itemsize' in PyBuffer_FillContiguousStrides (GH-3993)

(cherry picked from commit 1b9e76ed3a055a53ca67397e928e1b408461900b)

files:
M Doc/c-api/buffer.rst

diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
index 3d851b7c39c..8c2de9691f3 100644
--- a/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@ -473,7 +473,7 @@ Buffer-related functions
    (*order* is ``'A'``).  Return ``0`` otherwise.
 
 
-.. c:function:: void PyBuffer_FillContiguousStrides(int ndim, Py_ssize_t *shape, Py_ssize_t *strides, Py_ssize_t itemsize, char order)
+.. c:function:: void PyBuffer_FillContiguousStrides(int ndims, Py_ssize_t *shape, Py_ssize_t *strides, int itemsize, char order)
 
    Fill the *strides* array with byte-strides of a :term:`contiguous` (C-style if
    *order* is ``'C'`` or Fortran-style if *order* is ``'F'``) array of the


From solipsis at pitrou.net  Sun Oct 15 05:06:10 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 15 Oct 2017 09:06:10 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=14
Message-ID: <20171015090609.130327.2B63208CE3008C3E@psf.io>

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

test_asyncio leaked [3, 0, 0] memory blocks, sum=3
test_collections leaked [0, 7, 0] 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/reflog64h47X', '--timeout', '7200']

From webhook-mailer at python.org  Sun Oct 15 15:28:34 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Sun, 15 Oct 2017 19:28:34 -0000
Subject: [Python-checkins] completly -> completely (#3999) (closes bpo-31788)
Message-ID: <mailman.57.1508095716.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/1295e11d397c6138427296d5f9653a9e7dd69062
commit: 1295e11d397c6138427296d5f9653a9e7dd69062
branch: master
author: Semen Zhydenko <simeon.zhidenko at gmail.com>
committer: Benjamin Peterson <benjamin at python.org>
date: 2017-10-15T12:28:31-07:00
summary:

completly -> completely (#3999) (closes bpo-31788)

files:
M Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 73abad3dcf1..380dd1b72db 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -2798,7 +2798,7 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)
 #endif
     SSL_CTX_set_options(self->ctx, options);
 
-    /* A bare minimum cipher list without completly broken cipher suites.
+    /* A bare minimum cipher list without completely broken cipher suites.
      * It's far from perfect but gives users a better head start. */
     if (proto_version != PY_SSL_VERSION_SSL2) {
         result = SSL_CTX_set_cipher_list(ctx, "HIGH:!aNULL:!eNULL:!MD5");


From webhook-mailer at python.org  Sun Oct 15 15:48:54 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Sun, 15 Oct 2017 19:48:54 -0000
Subject: [Python-checkins] [3.6] completly -> completely (GH-3999) (closes
 bpo-31788) (#4008)
Message-ID: <mailman.58.1508096934.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/cfc604722ff5ad64de96ddeb944661f1e94d8cd0
commit: cfc604722ff5ad64de96ddeb944661f1e94d8cd0
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Benjamin Peterson <benjamin at python.org>
date: 2017-10-15T12:48:50-07:00
summary:

[3.6] completly -> completely (GH-3999) (closes bpo-31788) (#4008)

(cherry picked from commit 1295e11d397c6138427296d5f9653a9e7dd69062)

files:
M Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index a32fce47ef6..df8c6a7d96d 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -2736,7 +2736,7 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)
 #endif
     SSL_CTX_set_options(self->ctx, options);
 
-    /* A bare minimum cipher list without completly broken cipher suites.
+    /* A bare minimum cipher list without completely broken cipher suites.
      * It's far from perfect but gives users a better head start. */
     if (proto_version != PY_SSL_VERSION_SSL2) {
         result = SSL_CTX_set_cipher_list(ctx, "HIGH:!aNULL:!eNULL:!MD5");


From webhook-mailer at python.org  Mon Oct 16 03:38:17 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Mon, 16 Oct 2017 07:38:17 -0000
Subject: [Python-checkins] bpo-31792: Restore os.environ in test_buffer when
 import numpy. (#4007)
Message-ID: <mailman.59.1508139499.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/676db4bbf2e7c18dc7c35add17dd3bbdc2d3eeb3
commit: 676db4bbf2e7c18dc7c35add17dd3bbdc2d3eeb3
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-16T10:38:14+03:00
summary:

bpo-31792: Restore os.environ in test_buffer when import numpy. (#4007)

files:
M Lib/test/test_buffer.py

diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py
index b83f2f107c1..f302da415d3 100644
--- a/Lib/test/test_buffer.py
+++ b/Lib/test/test_buffer.py
@@ -17,7 +17,7 @@
 from itertools import permutations, product
 from random import randrange, sample, choice
 import warnings
-import sys, array, io
+import sys, array, io, os
 from decimal import Decimal
 from fractions import Fraction
 
@@ -37,7 +37,8 @@
     ctypes = None
 
 try:
-    with warnings.catch_warnings():
+    with support.EnvironmentVarGuard() as os.environ, \
+         warnings.catch_warnings():
         from numpy import ndarray as numpy_array
 except ImportError:
     numpy_array = None


From webhook-mailer at python.org  Mon Oct 16 04:21:36 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Mon, 16 Oct 2017 08:21:36 -0000
Subject: [Python-checkins] [3.6] bpo-31792: Restore os.environ in
 test_buffer when import numpy. (GH-4007) (#4009)
Message-ID: <mailman.60.1508142099.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/06949585d292d1a9dbf2d0d0fa8fc8fe1dee3ccf
commit: 06949585d292d1a9dbf2d0d0fa8fc8fe1dee3ccf
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-16T11:21:30+03:00
summary:

[3.6] bpo-31792: Restore os.environ in test_buffer when import numpy. (GH-4007) (#4009)

(cherry picked from commit 676db4bbf2e7c18dc7c35add17dd3bbdc2d3eeb3)

files:
M Lib/test/test_buffer.py

diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py
index b83f2f107c1..f302da415d3 100644
--- a/Lib/test/test_buffer.py
+++ b/Lib/test/test_buffer.py
@@ -17,7 +17,7 @@
 from itertools import permutations, product
 from random import randrange, sample, choice
 import warnings
-import sys, array, io
+import sys, array, io, os
 from decimal import Decimal
 from fractions import Fraction
 
@@ -37,7 +37,8 @@
     ctypes = None
 
 try:
-    with warnings.catch_warnings():
+    with support.EnvironmentVarGuard() as os.environ, \
+         warnings.catch_warnings():
         from numpy import ndarray as numpy_array
 except ImportError:
     numpy_array = None


From webhook-mailer at python.org  Mon Oct 16 04:24:25 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Mon, 16 Oct 2017 08:24:25 -0000
Subject: [Python-checkins] bpo-31776: Missing "raise from None" in
 Lib/xml/etree/ElementPath.py (#3978)
Message-ID: <mailman.61.1508142267.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/0df19055c92a0b0728659807978e4ca4d6c8e1bc
commit: 0df19055c92a0b0728659807978e4ca4d6c8e1bc
branch: master
author: Pablo Galindo <Pablogsal at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-16T11:24:22+03:00
summary:

bpo-31776: Missing "raise from None" in Lib/xml/etree/ElementPath.py (#3978)

files:
M Lib/xml/etree/ElementPath.py

diff --git a/Lib/xml/etree/ElementPath.py b/Lib/xml/etree/ElementPath.py
index c9d6ef345b9..ef32917b14d 100644
--- a/Lib/xml/etree/ElementPath.py
+++ b/Lib/xml/etree/ElementPath.py
@@ -285,7 +285,7 @@ def iterfind(elem, path, namespaces=None):
             try:
                 selector.append(ops[token[0]](next, token))
             except StopIteration:
-                raise SyntaxError("invalid path")
+                raise SyntaxError("invalid path") from None
             try:
                 token = next()
                 if token[0] == "/":


From solipsis at pitrou.net  Mon Oct 16 05:07:41 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 16 Oct 2017 09:07:41 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=11
Message-ID: <20171016090705.129429.9350DE44545AB38A@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/reflogwsehFJ', '--timeout', '7200']

From webhook-mailer at python.org  Mon Oct 16 11:44:39 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 16 Oct 2017 15:44:39 -0000
Subject: [Python-checkins] bpo-31773: _PyTime_GetPerfCounter() uses
 _PyTime_t (GH-3983)
Message-ID: <mailman.62.1508168681.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/bdaeb7d237462a629e6c85001317faa85f94a0c6
commit: bdaeb7d237462a629e6c85001317faa85f94a0c6
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-16T08:44:31-07:00
summary:

bpo-31773: _PyTime_GetPerfCounter() uses _PyTime_t (GH-3983)

* Rewrite win_perf_counter() to only use integers internally.
* Add _PyTime_MulDiv() which compute "ticks * mul / div"
  in two parts (int part and remaining) to prevent integer overflow.
* Clock frequency is checked at initialization for integer overflow.
* Enhance also pymonotonic() to reduce the precision loss on macOS
  (mach_absolute_time() clock).

files:
M Include/pytime.h
M Modules/timemodule.c
M Python/import.c
M Python/pytime.c

diff --git a/Include/pytime.h b/Include/pytime.h
index fd95045519d..488fdc439b9 100644
--- a/Include/pytime.h
+++ b/Include/pytime.h
@@ -197,7 +197,7 @@ PyAPI_FUNC(int) _PyTime_gmtime(time_t t, struct tm *tm);
 
    The function cannot fail. _PyTime_Init() ensures that the system clock
    works. */
-PyAPI_FUNC(double) _PyTime_GetPerfCounterDouble(void);
+PyAPI_FUNC(_PyTime_t) _PyTime_GetPerfCounter(void);
 
 /* Get the performance counter: clock with the highest available resolution to
    measure a short duration.
@@ -205,8 +205,8 @@ PyAPI_FUNC(double) _PyTime_GetPerfCounterDouble(void);
    Fill info (if set) with information of the function used to get the time.
 
    Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int) _PyTime_GetPerfCounterDoubleWithInfo(
-    double *t,
+PyAPI_FUNC(int) _PyTime_GetPerfCounterWithInfo(
+    _PyTime_t *t,
     _Py_clock_info_t *info);
 
 #ifdef __cplusplus
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 3cb1b4ec0b6..6af9a90e58a 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -91,11 +91,12 @@ floatclock(_Py_clock_info_t *info)
 static PyObject*
 perf_counter(_Py_clock_info_t *info)
 {
-    double t;
-    if (_PyTime_GetPerfCounterDoubleWithInfo(&t, info) < 0) {
+    _PyTime_t t;
+    if (_PyTime_GetPerfCounterWithInfo(&t, info) < 0) {
         return NULL;
     }
-    return PyFloat_FromDouble(t);
+    double d = _PyTime_AsSecondsDouble(t);
+    return PyFloat_FromDouble(d);
 }
 
 #if defined(MS_WINDOWS) || defined(HAVE_CLOCK)
diff --git a/Python/import.c b/Python/import.c
index 76aa912dc86..d396b4de793 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1669,10 +1669,10 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals,
     else {
         static int ximporttime = 0;
         static int import_level;
-        static double accumulated;
+        static _PyTime_t accumulated;
         _Py_IDENTIFIER(importtime);
 
-        double t1 = 0, accumulated_copy = accumulated;
+        _PyTime_t t1 = 0, accumulated_copy = accumulated;
 
         Py_XDECREF(mod);
 
@@ -1695,7 +1695,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals,
 
         if (ximporttime) {
             import_level++;
-            t1 = _PyTime_GetPerfCounterDouble();
+            t1 = _PyTime_GetPerfCounter();
             accumulated = 0;
         }
 
@@ -1711,12 +1711,12 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals,
                                            mod != NULL);
 
         if (ximporttime) {
-            double cum = _PyTime_GetPerfCounterDouble() - t1;
+            _PyTime_t cum = _PyTime_GetPerfCounter() - t1;
 
             import_level--;
             fprintf(stderr, "import time: %9ld | %10ld | %*s%s\n",
-                    (long)ceil((cum - accumulated) * 1e6),
-                    (long)ceil(cum * 1e6),
+                    (long)_PyTime_AsMicroseconds(cum - accumulated, _PyTime_ROUND_CEILING),
+                    (long)_PyTime_AsMicroseconds(cum, _PyTime_ROUND_CEILING),
                     import_level*2, "", PyUnicode_AsUTF8(abs_name));
 
             accumulated = accumulated_copy + cum;
diff --git a/Python/pytime.c b/Python/pytime.c
index 7fd2a90f3bd..7b55b10d108 100644
--- a/Python/pytime.c
+++ b/Python/pytime.c
@@ -42,6 +42,27 @@ _PyTime_overflow(void)
                     "timestamp too large to convert to C _PyTime_t");
 }
 
+
+#if defined(MS_WINDOWS) || defined(__APPLE__)
+Py_LOCAL_INLINE(_PyTime_t)
+_PyTime_MulDiv(_PyTime_t ticks, _PyTime_t mul, _PyTime_t div)
+{
+    _PyTime_t intpart, remaining;
+    /* Compute (ticks * mul / div) in two parts to prevent integer overflow:
+       compute integer part, and then the remaining part.
+
+       (ticks * mul) / div == (ticks / div) * mul + (ticks % div) * mul / div
+
+       The caller must ensure that "(div - 1) * mul" cannot overflow. */
+    intpart = ticks / div;
+    ticks %= div;
+    remaining = ticks * mul;
+    remaining /= div;
+    return intpart * mul + remaining;
+}
+#endif   /* defined(MS_WINDOWS) || defined(__APPLE__) */
+
+
 time_t
 _PyLong_AsTime_t(PyObject *obj)
 {
@@ -700,29 +721,62 @@ pymonotonic(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
 
 #elif defined(__APPLE__)
     static mach_timebase_info_data_t timebase;
-    uint64_t time;
+    static uint64_t t0 = 0;
+    uint64_t ticks;
 
     if (timebase.denom == 0) {
         /* According to the Technical Q&A QA1398, mach_timebase_info() cannot
            fail: https://developer.apple.com/library/mac/#qa/qa1398/ */
         (void)mach_timebase_info(&timebase);
-    }
 
-    time = mach_absolute_time();
+        /* Sanity check: should never occur in practice */
+        if (timebase.numer < 1 || timebase.denom < 1) {
+            PyErr_SetString(PyExc_RuntimeError,
+                            "invalid mach_timebase_info");
+            return -1;
+        }
+
+        /* Check that timebase.numer and timebase.denom can be casted to
+           _PyTime_t. In pratice, timebase uses uint32_t, so casting cannot
+           overflow. At the end, only make sure that the type is uint32_t
+           (_PyTime_t is 64-bit long). */
+        assert(sizeof(timebase.numer) < sizeof(_PyTime_t));
+        assert(sizeof(timebase.denom) < sizeof(_PyTime_t));
 
-    /* apply timebase factor */
-    time *= timebase.numer;
-    time /= timebase.denom;
+        /* Make sure that (ticks * timebase.numer) cannot overflow in
+           _PyTime_MulDiv(), with ticks < timebase.denom.
 
-    *tp = time;
+           Known time bases:
+
+           * always (1, 1) on Intel
+           * (1000000000, 33333335) or (1000000000, 25000000) on PowerPC
+
+           None of these time bases can overflow with 64-bit _PyTime_t, but
+           check for overflow, just in case. */
+        if ((_PyTime_t)timebase.numer > _PyTime_MAX / (_PyTime_t)timebase.denom) {
+            PyErr_SetString(PyExc_OverflowError,
+                            "mach_timebase_info is too large");
+            return -1;
+        }
+
+        t0 = mach_absolute_time();
+    }
 
     if (info) {
         info->implementation = "mach_absolute_time()";
-        info->resolution = (double)timebase.numer / timebase.denom * 1e-9;
+        info->resolution = (double)timebase.numer / (double)timebase.denom * 1e-9;
         info->monotonic = 1;
         info->adjustable = 0;
     }
 
+    ticks = mach_absolute_time();
+    /* Use a "time zero" to reduce precision loss when converting time
+       to floatting point number, as in time.monotonic(). */
+    ticks -= t0;
+    *tp = _PyTime_MulDiv(ticks,
+                         (_PyTime_t)timebase.numer,
+                         (_PyTime_t)timebase.denom);
+
 #elif defined(__hpux)
     hrtime_t time;
 
@@ -802,60 +856,93 @@ _PyTime_GetMonotonicClockWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
 
 #ifdef MS_WINDOWS
 static int
-win_perf_counter(double *tp, _Py_clock_info_t *info)
+win_perf_counter(_PyTime_t *tp, _Py_clock_info_t *info)
 {
-    static LONGLONG cpu_frequency = 0;
-    static LONGLONG ctrStart;
+    static LONGLONG frequency = 0;
+    static LONGLONG t0 = 0;
     LARGE_INTEGER now;
-    double diff;
+    LONGLONG ticksll;
+    _PyTime_t ticks;
 
-    if (cpu_frequency == 0) {
+    if (frequency == 0) {
         LARGE_INTEGER freq;
-        QueryPerformanceCounter(&now);
-        ctrStart = now.QuadPart;
-        if (!QueryPerformanceFrequency(&freq) || freq.QuadPart == 0) {
+        if (!QueryPerformanceFrequency(&freq)) {
             PyErr_SetFromWindowsErr(0);
             return -1;
         }
-        cpu_frequency = freq.QuadPart;
+        frequency = freq.QuadPart;
+
+        /* Sanity check: should never occur in practice */
+        if (frequency < 1) {
+            PyErr_SetString(PyExc_RuntimeError,
+                            "invalid QueryPerformanceFrequency");
+            return -1;
+        }
+
+        /* Check that frequency can be casted to _PyTime_t.
+
+           Make also sure that (ticks * SEC_TO_NS) cannot overflow in
+           _PyTime_MulDiv(), with ticks < frequency.
+
+           Known QueryPerformanceFrequency() values:
+
+           * 10,000,000 (10 MHz): 100 ns resolution
+           * 3,579,545 Hz (3.6 MHz): 279 ns resolution
+
+           None of these frequencies can overflow with 64-bit _PyTime_t, but
+           check for overflow, just in case. */
+        if (frequency > _PyTime_MAX
+            || frequency > (LONGLONG)_PyTime_MAX / (LONGLONG)SEC_TO_NS) {
+            PyErr_SetString(PyExc_OverflowError,
+                            "QueryPerformanceFrequency is too large");
+            return -1;
+        }
+
+        QueryPerformanceCounter(&now);
+        t0 = now.QuadPart;
     }
-    QueryPerformanceCounter(&now);
-    diff = (double)(now.QuadPart - ctrStart);
+
     if (info) {
         info->implementation = "QueryPerformanceCounter()";
-        info->resolution = 1.0 / (double)cpu_frequency;
+        info->resolution = 1.0 / (double)frequency;
         info->monotonic = 1;
         info->adjustable = 0;
     }
 
-    diff = diff / (double)cpu_frequency;
-    *tp = diff;
+    QueryPerformanceCounter(&now);
+    ticksll = now.QuadPart;
+
+    /* Use a "time zero" to reduce precision loss when converting time
+       to floatting point number, as in time.perf_counter(). */
+    ticksll -= t0;
+
+    /* Make sure that casting LONGLONG to _PyTime_t cannot overflow,
+       both types are signed */
+    Py_BUILD_ASSERT(sizeof(ticksll) <= sizeof(ticks));
+    ticks = (_PyTime_t)ticksll;
+
+    *tp = _PyTime_MulDiv(ticks, SEC_TO_NS, (_PyTime_t)frequency);
     return 0;
 }
 #endif
 
 
 int
-_PyTime_GetPerfCounterDoubleWithInfo(double *d, _Py_clock_info_t *info)
+_PyTime_GetPerfCounterWithInfo(_PyTime_t *t, _Py_clock_info_t *info)
 {
 #ifdef MS_WINDOWS
-    return win_perf_counter(d, info);
+    return win_perf_counter(t, info);
 #else
-    _PyTime_t t;
-    if (_PyTime_GetMonotonicClockWithInfo(&t, info) < 0) {
-        return -1;
-    }
-    *d = _PyTime_AsSecondsDouble(t);
-    return 0;
+    return _PyTime_GetMonotonicClockWithInfo(t, info);
 #endif
 }
 
 
-double
-_PyTime_GetPerfCounterDouble(void)
+_PyTime_t
+_PyTime_GetPerfCounter(void)
 {
-    double t;
-    if (_PyTime_GetPerfCounterDoubleWithInfo(&t, NULL)) {
+    _PyTime_t t;
+    if (_PyTime_GetPerfCounterWithInfo(&t, NULL)) {
         Py_UNREACHABLE();
     }
     return t;
@@ -869,14 +956,13 @@ _PyTime_Init(void)
        are working properly to not have to check for exceptions at runtime. If
        a clock works once, it cannot fail in next calls. */
     _PyTime_t t;
-    double d;
     if (_PyTime_GetSystemClockWithInfo(&t, NULL) < 0) {
         return -1;
     }
     if (_PyTime_GetMonotonicClockWithInfo(&t, NULL) < 0) {
         return -1;
     }
-    if (_PyTime_GetPerfCounterDoubleWithInfo(&d, NULL) < 0) {
+    if (_PyTime_GetPerfCounterWithInfo(&t, NULL) < 0) {
         return -1;
     }
     return 0;


From lp_benchmark_robot at intel.com  Mon Oct 16 13:15:06 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Mon, 16 Oct 2017 10:15:06 -0700
Subject: [Python-checkins] [1 down,
 64 flat] Results for Python (master branch) 2017-10-16
Message-ID: <b48244b4-6a16-45fb-af2e-9440cdd53f24@orsmsx152.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-16 03:03:09-07:00.
  - commit:		0df1905
  - previous commit:	b22273e
  - revision date:	2017-10-16 11:24:22+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.258% |  +0.384%   |  +5.916%   |  +7.415%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 0.352% |  +0.533%   |  +19.124%  |  +10.883%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 0.655% |  +0.165%   |  +20.200%  |  +8.540%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.519% |  +0.346%   |  +18.298%  |  +12.296%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.963% |  -0.600%   |  +6.425%   |  +6.022%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.627% |  +1.038%   |  +11.483%  |  +9.080%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.623% |  +0.424%   |  +7.455%   |  +10.433%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.701% |  +0.368%   |  +3.972%   |  +6.455%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 2.811% |  -5.022%   |  +4.869%   |  +21.731%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 3.206% |  -1.941%   |  +10.398%  |  +13.480%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.429% |  -0.155%   |  +4.941%   |  +5.665%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.587% |  +0.534%   |  +6.682%   |  +4.946%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.436% |  -0.189%   |  +2.402%   |  +7.850%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 0.798% |  +1.394%   |  +9.985%   |  +9.357%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.785% |  -0.375%   |  +7.493%   |  +9.330%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 1.181% |  +0.842%   |  +5.935%   |  +11.879%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.465% |  -0.467%   |  +8.903%   |  +11.694%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 2.895% |  -0.287%   |  +9.031%   |  +8.622%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.824% |  -0.551%   |  +4.106%   |  +8.374%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 4.334% |  -1.635%   |  +1.190%   |  +11.197%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.557% |  +0.240%   |  +9.472%   |  +9.580%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.446% |  -0.903%   |  +46.295%  |  +13.389%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.532% |  -0.368%   |  +9.713%   |  +10.868%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.380% |  -1.242%   |  +18.257%  |  +11.392%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 2.130% |  -0.759%   |  +8.539%   |  +9.629%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.238% |  -0.208%   |  +3.290%   |  +5.402%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.369% |  -0.606%   |  -1.219%   |  +4.092%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.584% |  +1.561%   |  +2.553%   |  +7.185%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.039% |  -0.572%   |  +6.500%   |  +8.298%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.406% |  -2.526%   |  +0.048%   |  +20.273%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.251% |  +1.388%   |  +3.178%   |  +20.497%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 1.009% |  +0.815%   |  +5.662%   |  +15.902%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.097% |  +0.450%   |  +11.643%  |  +10.362%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.156% |  -0.099%   |  +0.373%   |  +10.156%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.122% |  -0.298%   |  +11.133%  |  +5.095%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.086% |  -0.299%   |  +2.530%   |  +5.048%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.222% |  +1.271%   |  +10.244%  |  +11.734%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.986% |  +3.168%   |  +4.792%   |  +10.377%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( |               regex_dna| 0.849% |  -3.412%   |  -1.736%   |  +10.090%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 3.194% |  -2.469%   |  -2.386%   |  +5.775%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 2.150% |  +1.588%   |  +10.240%  |  +1.525%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.275% |  +0.586%   |  +6.842%   |  +14.419%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.506% |  +1.218%   |  +4.350%   |  -0.444%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.318% |  +0.794%   |  +27.620%  |  +6.840%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.059% |  -0.793%   |  +2.971%   |  +7.525%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 1.787% |  +0.223%   |  +14.116%  |  +8.836%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 1.502% |  -0.838%   |  +2.844%   |  -1.290%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 1.263% |  +1.313%   |  +7.344%   |  +1.062%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.539% |  -0.039%   |  +7.792%   |  +7.764%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.286% |  -0.439%   |  +6.000%   |  +5.705%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.129% |  -0.633%   |  +18.601%  |  +9.191%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.854% |  -1.654%   |  +11.658%  |  +9.262%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.704% |  +0.422%   |  +10.594%  |  +6.601%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.116% |  -0.704%   |  +11.081%  |  +10.056%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.514% |  +0.085%   |  +12.417%  |  +11.356%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 4.889% |  +1.170%   |  +23.607%  |  +9.440%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.049% |  +0.236%   |  +6.416%   |  +6.069%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.952% |  -0.009%   |  +1.758%   |  -1.190%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle|10.556% |  -5.104%   |  +7.389%   |  +21.671%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 2.315% |  -1.188%   |  -0.196%   |  +17.956%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 1.762% |  +0.018%   |  +7.985%   |  +6.284%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 0.977% |  -0.245%   |  +6.099%   |  +7.567%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.761% |  -0.450%   |  +1.328%   |  +7.386%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 4.174% |  -3.406%   |  -9.658%   |  +13.044%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 2.183% |  +0.004%   |  +5.918%   |  +7.783%   |
+-----+------------------------+--------+------------+------------+------------+

* 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-10-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 webhook-mailer at python.org  Mon Oct 16 14:23:47 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Mon, 16 Oct 2017 18:23:47 -0000
Subject: [Python-checkins] [2.7] bpo-31754: Fix type of 'itemsize' in
 PyBuffer_FillContiguousStrides (GH-3993)
Message-ID: <mailman.63.1508178229.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/50cef52372381a9e2f3d760497d8db76254cffef
commit: 50cef52372381a9e2f3d760497d8db76254cffef
branch: 2.7
author: vyas45 <vyas45 at gmail.com>
committer: Berker Peksag <berker.peksag at gmail.com>
date: 2017-10-16T21:23:43+03:00
summary:

[2.7] bpo-31754: Fix type of 'itemsize' in PyBuffer_FillContiguousStrides (GH-3993)

files:
M Doc/c-api/buffer.rst

diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
index 050db556cbf..4e5a04397a3 100644
--- a/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@ -278,7 +278,7 @@ Buffer related functions
    (*fortran* is ``'A'``).  Return ``0`` otherwise.
 
 
-.. c:function:: void PyBuffer_FillContiguousStrides(int ndim, Py_ssize_t *shape, Py_ssize_t *strides, Py_ssize_t itemsize, char fortran)
+.. c:function:: void PyBuffer_FillContiguousStrides(int ndims, Py_ssize_t *shape, Py_ssize_t *strides, int itemsize, char fortran)
 
    Fill the *strides* array with byte-strides of a contiguous (C-style if
    *fortran* is ``'C'`` or Fortran-style if *fortran* is ``'F'``) array of the


From webhook-mailer at python.org  Mon Oct 16 15:49:47 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Mon, 16 Oct 2017 19:49:47 -0000
Subject: [Python-checkins] bpo-31558: Add gc.freeze() (#3705)
Message-ID: <mailman.64.1508183392.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/c75edabbb65ca2bb29e51f8d1eb2c780e5890982
commit: c75edabbb65ca2bb29e51f8d1eb2c780e5890982
branch: master
author: brainfvck <li.zekun at gmail.com>
committer: ?ukasz Langa <lukasz at langa.pl>
date: 2017-10-16T12:49:41-07:00
summary:

bpo-31558: Add gc.freeze() (#3705)

Freeze all the objects tracked by gc - move them to a permanent generation
and ignore all the future collections. This can be used before a POSIX
fork() call to make the gc copy-on-write friendly or to speed up collection.

files:
M Doc/library/gc.rst
M Include/internal/mem.h
M Lib/test/test_gc.py
M Modules/clinic/gcmodule.c.h
M Modules/gcmodule.c

diff --git a/Doc/library/gc.rst b/Doc/library/gc.rst
index 87d682445ba..153d8fb7045 100644
--- a/Doc/library/gc.rst
+++ b/Doc/library/gc.rst
@@ -174,6 +174,33 @@ The :mod:`gc` module provides the following functions:
    .. versionadded:: 3.1
 
 
+.. function:: freeze()
+
+   Freeze all the objects tracked by gc - move them to a permanent generation
+   and ignore all the future collections. This can be used before a POSIX
+   fork() call to make the gc copy-on-write friendly or to speed up collection.
+   Also collection before a POSIX fork() call may free pages for future
+   allocation which can cause copy-on-write too so it's advised to disable gc
+   in master process and freeze before fork and enable gc in child process.
+
+   .. versionadded:: 3.7
+
+
+.. function:: unfreeze()
+
+   Unfreeze the objects in the permanent generation, put them back into the
+   oldest generation.
+
+   .. versionadded:: 3.7
+
+
+.. function:: get_freeze_count()
+
+   Return the number of objects in the permanent generation.
+
+   .. versionadded:: 3.7
+
+
 The following variables are provided for read-only access (you can mutate the
 values but should not rebind them):
 
diff --git a/Include/internal/mem.h b/Include/internal/mem.h
index f3a8f56e805..471cdf45df2 100644
--- a/Include/internal/mem.h
+++ b/Include/internal/mem.h
@@ -167,6 +167,8 @@ struct _gc_runtime_state {
     /* linked lists of container objects */
     struct gc_generation generations[NUM_GENERATIONS];
     PyGC_Head *generation0;
+    /* a permanent generation which won't be collected */
+    struct gc_generation permanent_generation;
     struct gc_generation_stats generation_stats[NUM_GENERATIONS];
     /* true if we are currently running the collector */
     int collecting;
diff --git a/Lib/test/test_gc.py b/Lib/test/test_gc.py
index 914efec3d3e..904fc7d88c0 100644
--- a/Lib/test/test_gc.py
+++ b/Lib/test/test_gc.py
@@ -734,6 +734,12 @@ def test_get_stats(self):
         self.assertEqual(new[1]["collections"], old[1]["collections"])
         self.assertEqual(new[2]["collections"], old[2]["collections"] + 1)
 
+    def test_freeze(self):
+        gc.freeze()
+        self.assertGreater(gc.get_freeze_count(), 0)
+        gc.unfreeze()
+        self.assertEqual(gc.get_freeze_count(), 0)
+
 
 class GCCallbackTests(unittest.TestCase):
     def setUp(self):
diff --git a/Modules/clinic/gcmodule.c.h b/Modules/clinic/gcmodule.c.h
index 771c57387bb..c31ef65eb06 100644
--- a/Modules/clinic/gcmodule.c.h
+++ b/Modules/clinic/gcmodule.c.h
@@ -255,4 +255,74 @@ PyDoc_STRVAR(gc_is_tracked__doc__,
 
 #define GC_IS_TRACKED_METHODDEF    \
     {"is_tracked", (PyCFunction)gc_is_tracked, METH_O, gc_is_tracked__doc__},
-/*[clinic end generated code: output=5a58583f00ab018e input=a9049054013a1b77]*/
+
+PyDoc_STRVAR(gc_freeze__doc__,
+"freeze($module, /)\n"
+"--\n"
+"\n"
+"Freeze all current tracked objects and ignore them for future collections.\n"
+"\n"
+"This can be used before a POSIX fork() call to make the gc copy-on-write friendly.\n"
+"Note: collection before a POSIX fork() call may free pages for future allocation\n"
+"which can cause copy-on-write.");
+
+#define GC_FREEZE_METHODDEF    \
+    {"freeze", (PyCFunction)gc_freeze, METH_NOARGS, gc_freeze__doc__},
+
+static PyObject *
+gc_freeze_impl(PyObject *module);
+
+static PyObject *
+gc_freeze(PyObject *module, PyObject *Py_UNUSED(ignored))
+{
+    return gc_freeze_impl(module);
+}
+
+PyDoc_STRVAR(gc_unfreeze__doc__,
+"unfreeze($module, /)\n"
+"--\n"
+"\n"
+"Unfreeze all objects in the permanent generation.\n"
+"\n"
+"Put all objects in the permanent generation back into oldest generation.");
+
+#define GC_UNFREEZE_METHODDEF    \
+    {"unfreeze", (PyCFunction)gc_unfreeze, METH_NOARGS, gc_unfreeze__doc__},
+
+static PyObject *
+gc_unfreeze_impl(PyObject *module);
+
+static PyObject *
+gc_unfreeze(PyObject *module, PyObject *Py_UNUSED(ignored))
+{
+    return gc_unfreeze_impl(module);
+}
+
+PyDoc_STRVAR(gc_get_freeze_count__doc__,
+"get_freeze_count($module, /)\n"
+"--\n"
+"\n"
+"Return the number of objects in the permanent generation.");
+
+#define GC_GET_FREEZE_COUNT_METHODDEF    \
+    {"get_freeze_count", (PyCFunction)gc_get_freeze_count, METH_NOARGS, gc_get_freeze_count__doc__},
+
+static int
+gc_get_freeze_count_impl(PyObject *module);
+
+static PyObject *
+gc_get_freeze_count(PyObject *module, PyObject *Py_UNUSED(ignored))
+{
+    PyObject *return_value = NULL;
+    int _return_value;
+
+    _return_value = gc_get_freeze_count_impl(module);
+    if ((_return_value == -1) && PyErr_Occurred()) {
+        goto exit;
+    }
+    return_value = PyLong_FromLong((long)_return_value);
+
+exit:
+    return return_value;
+}
+/*[clinic end generated code: output=4f41ec4588154f2b input=a9049054013a1b77]*/
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index 832e27ebe66..6e26c7a68f6 100644
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -71,6 +71,10 @@ _PyGC_Initialize(struct _gc_runtime_state *state)
         state->generations[i] = generations[i];
     };
     state->generation0 = GEN_HEAD(0);
+    struct gc_generation permanent_generation = {
+          {{&state->permanent_generation.head, &state->permanent_generation.head, 0}}, 0, 0
+    };
+    state->permanent_generation = permanent_generation;
 }
 
 /*--------------------------------------------------------------------------
@@ -813,6 +817,8 @@ collect(int generation, Py_ssize_t *n_collected, Py_ssize_t *n_uncollectable,
         for (i = 0; i < NUM_GENERATIONS; i++)
             PySys_FormatStderr(" %zd",
                               gc_list_size(GEN_HEAD(i)));
+        PySys_WriteStderr("\ngc: objects in permanent generation: %zd",
+                         gc_list_size(&_PyRuntime.gc.permanent_generation.head));
         t1 = _PyTime_GetMonotonicClock();
 
         PySys_WriteStderr("\n");
@@ -1405,6 +1411,56 @@ gc_is_tracked(PyObject *module, PyObject *obj)
     return result;
 }
 
+/*[clinic input]
+gc.freeze
+
+Freeze all current tracked objects and ignore them for future collections.
+
+This can be used before a POSIX fork() call to make the gc copy-on-write friendly.
+Note: collection before a POSIX fork() call may free pages for future allocation
+which can cause copy-on-write.
+[clinic start generated code]*/
+
+static PyObject *
+gc_freeze_impl(PyObject *module)
+/*[clinic end generated code: output=502159d9cdc4c139 input=b602b16ac5febbe5]*/
+{
+    for (int i = 0; i < NUM_GENERATIONS; ++i) {
+        gc_list_merge(GEN_HEAD(i), &_PyRuntime.gc.permanent_generation.head);
+        _PyRuntime.gc.generations[i].count = 0;
+    }
+    Py_RETURN_NONE;
+}
+
+/*[clinic input]
+gc.unfreeze
+
+Unfreeze all objects in the permanent generation.
+
+Put all objects in the permanent generation back into oldest generation.
+[clinic start generated code]*/
+
+static PyObject *
+gc_unfreeze_impl(PyObject *module)
+/*[clinic end generated code: output=1c15f2043b25e169 input=2dd52b170f4cef6c]*/
+{
+    gc_list_merge(&_PyRuntime.gc.permanent_generation.head, GEN_HEAD(NUM_GENERATIONS-1));
+    Py_RETURN_NONE;
+}
+
+/*[clinic input]
+gc.get_freeze_count -> int
+
+Return the number of objects in the permanent generation.
+[clinic start generated code]*/
+
+static int
+gc_get_freeze_count_impl(PyObject *module)
+/*[clinic end generated code: output=e4e2ebcc77e5cbf3 input=4b759db880a3c6e4]*/
+{
+    return gc_list_size(&_PyRuntime.gc.permanent_generation.head);
+}
+
 
 PyDoc_STRVAR(gc__doc__,
 "This module provides access to the garbage collector for reference cycles.\n"
@@ -1422,7 +1478,10 @@ PyDoc_STRVAR(gc__doc__,
 "get_objects() -- Return a list of all objects tracked by the collector.\n"
 "is_tracked() -- Returns true if a given object is tracked.\n"
 "get_referrers() -- Return the list of objects that refer to an object.\n"
-"get_referents() -- Return the list of objects that an object refers to.\n");
+"get_referents() -- Return the list of objects that an object refers to.\n"
+"freeze() -- Freeze all tracked objects and ignore them for future collections.\n"
+"unfreeze() -- Unfreeze all objects in the permanent generation.\n"
+"get_freeze_count() -- Return the number of objects in the permanent generation.\n");
 
 static PyMethodDef GcMethods[] = {
     GC_ENABLE_METHODDEF
@@ -1441,6 +1500,9 @@ static PyMethodDef GcMethods[] = {
         gc_get_referrers__doc__},
     {"get_referents",  gc_get_referents, METH_VARARGS,
         gc_get_referents__doc__},
+    GC_FREEZE_METHODDEF
+    GC_UNFREEZE_METHODDEF
+    GC_GET_FREEZE_COUNT_METHODDEF
     {NULL,      NULL}           /* Sentinel */
 };
 


From webhook-mailer at python.org  Mon Oct 16 17:39:11 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Mon, 16 Oct 2017 21:39:11 -0000
Subject: [Python-checkins] bpo-31558: Update NEWS and ACKS (#4013)
Message-ID: <mailman.65.1508189954.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/c30b55b96c0967e3a8b3b86f25eb012a97f360a5
commit: c30b55b96c0967e3a8b3b86f25eb012a97f360a5
branch: master
author: ?ukasz Langa <lukasz at langa.pl>
committer: GitHub <noreply at github.com>
date: 2017-10-16T14:39:08-07:00
summary:

bpo-31558: Update NEWS and ACKS (#4013)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-16-14-27-25.bpo-31558.K-uRRm.rst
M Misc/ACKS

diff --git a/Misc/ACKS b/Misc/ACKS
index 0f6ac7d898a..38f68aca214 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -919,6 +919,7 @@ William Lewis
 Akira Li
 Robert Li
 Xuanji Li
+Zekun Li
 Robert van Liere
 Ross Light
 Shawn Ligocki
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-16-14-27-25.bpo-31558.K-uRRm.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-16-14-27-25.bpo-31558.K-uRRm.rst
new file mode 100644
index 00000000000..d502f15ad67
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-16-14-27-25.bpo-31558.K-uRRm.rst	
@@ -0,0 +1,5 @@
+``gc.freeze()`` is a new API that allows for moving all objects currently
+tracked by the garbage collector to a permanent generation, effectively
+removing them from future collection events. This can be used to protect
+those objects from having their PyGC_Head mutated. In effect, this enables
+great copy-on-write stability at fork().


From webhook-mailer at python.org  Tue Oct 17 02:12:15 2017
From: webhook-mailer at python.org (Ned Deily)
Date: Tue, 17 Oct 2017 06:12:15 -0000
Subject: [Python-checkins] Update NEWS and topics for 3.7.0a2
Message-ID: <mailman.66.1508220736.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/c730223d18fdee06bc3a8252fba82e0591788b4a
commit: c730223d18fdee06bc3a8252fba82e0591788b4a
branch: master
author: Ned Deily <nad at python.org>
committer: Ned Deily <nad at python.org>
date: 2017-10-16T23:41:55-04:00
summary:

Update NEWS and topics for 3.7.0a2

files:
A Misc/NEWS.d/3.7.0a2.rst
D Misc/NEWS.d/next/Build/2017-09-20-21-32-21.bpo-31536.KUDjno.rst
D Misc/NEWS.d/next/Build/2017-09-25-00-25-23.bpo-31569.TS49pM.rst
D Misc/NEWS.d/next/Build/2017-09-26-22-39-58.bpo-22140.ZRf7Wn.rst
D Misc/NEWS.d/next/Build/2017-09-28-20-54-52.bpo-31624.11w91_.rst
D Misc/NEWS.d/next/Build/2017-09-28-23-21-20.bpo-31625.Bb2NXr.rst
D Misc/NEWS.d/next/Build/2017-10-04-23-40-32.bpo-31696.Y3_aBV.rst
D Misc/NEWS.d/next/C API/2017-06-24-14-30-44.bpo-25658.vm8vGE.rst
D Misc/NEWS.d/next/C API/2017-09-20-21-59-52.bpo-31532.s9Cw9_.rst
D Misc/NEWS.d/next/C API/2017-09-30-19-41-44.bpo-28280.K_EjpO.rst
D Misc/NEWS.d/next/Core and Builtins/2017-07-20-22-03-44.bpo-30406._kr47t.rst
D Misc/NEWS.d/next/Core and Builtins/2017-08-27-21-18-30.bpo-31285.7lzaKV.rst
D Misc/NEWS.d/next/Core and Builtins/2017-08-28-17-51-42.bpo-31293.eMYZXj.rst
D Misc/NEWS.d/next/Core and Builtins/2017-08-31-17-52-56.bpo-31311.bNE2l-.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-01-00-40-58.bpo-31315.ZX20bl.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-04-12-46-25.bpo-17852.OxAtCg.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-05-14-19-02.bpo-31353.oGZUeJ.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-10-20-58-51.bpo-31410.wD_RbH.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-11-14-28-56.bpo-31415.GBdz7o.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-13-12-04-23.bpo-31336.gi2ahY.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-15-09-13-07.bpo-31478.o06iKD.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-16-22-49-16.bpo-31492.RtyteL.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-18-12-07-39.bpo-31505.VomaFa.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-19-10-29-36.bpo-31506.pRVTRB.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-24-09-57-04.bpo-31566.OxwINs.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-25-12-35-48.bpo-31574.5yX5r5.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-26-13-03-16.bpo-31588.wT9Iy7.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-26-16-05-04.bpo-31592.IFBZj9.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-27-09-30-03.bpo-31602.MtgLCn.rst
D Misc/NEWS.d/next/Core and Builtins/2017-09-29-20-32-24.bpo-31619.6gQ1kv.rst
D Misc/NEWS.d/next/Core and Builtins/2017-10-03-23-46-39.bpo-30404._9Yi5u.rst
D Misc/NEWS.d/next/Core and Builtins/2017-10-06-00-27-04.bpo-31709._PmU51.rst
D Misc/NEWS.d/next/Core and Builtins/2017-10-06-02-10-48.bpo-31708.66CCVU.rst
D Misc/NEWS.d/next/Core and Builtins/2017-10-08-10-00-55.bpo-31642.1IKqgs.rst
D Misc/NEWS.d/next/Core and Builtins/2017-10-16-14-27-25.bpo-31558.K-uRRm.rst
D Misc/NEWS.d/next/Documentation/2017-09-14-18-44-50.bpo-30085.0J9w-u.rst
D Misc/NEWS.d/next/Documentation/2017-10-08-23-02-14.bpo-31537.SiFNM8.rst
D Misc/NEWS.d/next/IDLE/2017-08-14-15-13-50.bpo-1612262.-x_Oyq.rst
D Misc/NEWS.d/next/IDLE/2017-09-18-10-43-03.bpo-31500.Y_YDxA.rst
D Misc/NEWS.d/next/IDLE/2017-09-22-20-26-23.bpo-31459.L0pnH9.rst
D Misc/NEWS.d/next/IDLE/2017-09-23-12-52-24.bpo-31559.ydckYX.rst
D Misc/NEWS.d/next/IDLE/2017-09-30-13-59-18.bpo-31649.LxN4Vb.rst
D Misc/NEWS.d/next/IDLE/2017-09-30-19-03-26.bpo-31460.HpveI6.rst
D Misc/NEWS.d/next/Library/2017-09-07-15-31-47.bpo-31389.jNFYqB.rst
D Misc/NEWS.d/next/Library/2017-09-17-15-24-25.bpo-31351.yQdKv-.rst
D Misc/NEWS.d/next/Library/2017-09-17-19-59-04.bpo-27541.cIMFJW.rst
D Misc/NEWS.d/next/Library/2017-09-19-13-29-29.bpo-26510.oncW6V.rst
D Misc/NEWS.d/next/Library/2017-09-19-18-48-21.bpo-31525.O2TIL2.rst
D Misc/NEWS.d/next/Library/2017-09-20-18-43-01.bpo-31516.23Yuq3.rst
D Misc/NEWS.d/next/Library/2017-09-22-16-02-00.bpo-31540.ybDHT5.rst
D Misc/NEWS.d/next/Library/2017-09-22-23-48-49.bpo-31556.9J0u5H.rst
D Misc/NEWS.d/next/Library/2017-09-24-13-08-46.bpo-30346.Csse77.rst
D Misc/NEWS.d/next/Library/2017-09-25-14-04-30.bpo-30347.B4--_D.rst
D Misc/NEWS.d/next/Library/2017-09-26-01-43-17.bpo-27494.37QnaT.rst
D Misc/NEWS.d/next/Library/2017-09-26-11-38-52.bpo-31596.50Eyel.rst
D Misc/NEWS.d/next/Library/2017-09-26-17-51-17.bpo-28293.UC5pm4.rst
D Misc/NEWS.d/next/Library/2017-09-28-13-17-33.bpo-20519.FteeQQ.rst
D Misc/NEWS.d/next/Library/2017-09-28-23-10-51.bpo-25351.2JmFpF.rst
D Misc/NEWS.d/next/Library/2017-09-29-07-14-28.bpo-31638.jElfhl.rst
D Misc/NEWS.d/next/Library/2017-09-29.bpo-30806.lP5GrH.rst
D Misc/NEWS.d/next/Library/2017-09-30-10-45-12.bpo-31648.Cai7ji.rst
D Misc/NEWS.d/next/Library/2017-10-03-14-37-46.bpo-31673.RFCrka.rst
D Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst
D Misc/NEWS.d/next/Library/2017-10-03-22-45-50.bpo-30397.e4F7Kr.rst
D Misc/NEWS.d/next/Library/2017-10-04-21-28-44.bpo-31671.E-zfc9.rst
D Misc/NEWS.d/next/Library/2017-10-08-23-28-30.bpo-31728.XrVMME.rst
D Misc/NEWS.d/next/Library/2017-10-09-17-42-30.bpo-31701.NRrVel.rst
D Misc/NEWS.d/next/Library/2017-10-12-02-47-16.bpo-31672.DaOkVd.rst
D Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst
M Lib/pydoc_data/topics.py

diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
index 8d64ad44c79..2c52b548409 100644
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Tue Sep 19 00:59:47 2017
+# Autogenerated by Sphinx on Mon Oct 16 23:39:41 2017
 topics = {'assert': 'The "assert" statement\n'
            '**********************\n'
            '\n'
@@ -936,6 +936,15 @@
               'about\n'
               'class and instance attributes applies as for regular '
               'assignments.\n',
+ 'await': 'Await expression\n'
+          '****************\n'
+          '\n'
+          'Suspend the execution of *coroutine* on an *awaitable* object. Can\n'
+          'only be used inside a *coroutine function*.\n'
+          '\n'
+          '   await_expr ::= "await" primary\n'
+          '\n'
+          'New in version 3.5.\n',
  'binary': 'Binary arithmetic operations\n'
            '****************************\n'
            '\n'
@@ -3408,14 +3417,18 @@
              'appears\n'
              '   as soon as the function is entered.\n'
              '\n'
-             'pdb.set_trace()\n'
+             'pdb.set_trace(*, header=None)\n'
              '\n'
              '   Enter the debugger at the calling stack frame.  This is '
              'useful to\n'
              '   hard-code a breakpoint at a given point in a program, even if '
              'the\n'
              '   code is not otherwise being debugged (e.g. when an assertion\n'
-             '   fails).\n'
+             '   fails).  If given, "header" is printed to the console just '
+             'before\n'
+             '   debugging begins.\n'
+             '\n'
+             '   New in version 3.7: The keyword-only argument "header".\n'
              '\n'
              'pdb.post_mortem(traceback=None)\n'
              '\n'
@@ -4511,12 +4524,6 @@
              '   3.14    10.    .001    1e100    3.14e-10    0e0    '
              '3.14_15_93\n'
              '\n'
-             'Note that numeric literals do not include a sign; a phrase like '
-             '"-1"\n'
-             'is actually an expression composed of the unary operator "-" and '
-             'the\n'
-             'literal "1".\n'
-             '\n'
              'Changed in version 3.6: Underscores are now allowed for '
              'grouping\n'
              'purposes in literals.\n',
@@ -5505,7 +5512,7 @@
            '\n'
            '**CPython implementation detail:** The current implementation does '
            'not\n'
-           'enforce some of these restriction, but programs should not abuse '
+           'enforce some of these restrictions, but programs should not abuse '
            'this\n'
            'freedom, as future implementations may enforce them or silently '
            'change\n'
@@ -10113,11 +10120,6 @@
             'or\n'
             'greater must be expressed with escapes.\n'
             '\n'
-            'As of Python 3.3 it is possible again to prefix string literals '
-            'with a\n'
-            '"u" prefix to simplify maintenance of dual 2.x and 3.x '
-            'codebases.\n'
-            '\n'
             'Both string and bytes literals may optionally be prefixed with a\n'
             'letter "\'r\'" or "\'R\'"; such strings are called *raw strings* '
             'and treat\n'
diff --git a/Misc/NEWS.d/3.7.0a2.rst b/Misc/NEWS.d/3.7.0a2.rst
new file mode 100644
index 00000000000..6df77153a09
--- /dev/null
+++ b/Misc/NEWS.d/3.7.0a2.rst
@@ -0,0 +1,683 @@
+.. bpo: 31558
+.. date: 2017-10-16-14-27-25
+.. nonce: K-uRRm
+.. release date: 2017-10-16
+.. section: Core and Builtins
+
+``gc.freeze()`` is a new API that allows for moving all objects currently
+tracked by the garbage collector to a permanent generation, effectively
+removing them from future collection events. This can be used to protect
+those objects from having their PyGC_Head mutated. In effect, this enables
+great copy-on-write stability at fork().
+
+..
+
+.. bpo: 31642
+.. date: 2017-10-08-10-00-55
+.. nonce: 1IKqgs
+.. section: Core and Builtins
+
+Restored blocking "from package import module" by setting
+sys.modules["package.module"] to None.
+
+..
+
+.. bpo: 31708
+.. date: 2017-10-06-02-10-48
+.. nonce: 66CCVU
+.. section: Core and Builtins
+
+Allow use of asynchronous generator expressions in synchronous functions.
+
+..
+
+.. bpo: 31709
+.. date: 2017-10-06-00-27-04
+.. nonce: _PmU51
+.. section: Core and Builtins
+
+Drop support of asynchronous __aiter__.
+
+..
+
+.. bpo: 30404
+.. date: 2017-10-03-23-46-39
+.. nonce: _9Yi5u
+.. section: Core and Builtins
+
+The -u option now makes the stdout and stderr streams unbuffered rather than
+line-buffered.
+
+..
+
+.. bpo: 31619
+.. date: 2017-09-29-20-32-24
+.. nonce: 6gQ1kv
+.. section: Core and Builtins
+
+Fixed a ValueError when convert a string with large number of underscores to
+integer with binary base.
+
+..
+
+.. bpo: 31602
+.. date: 2017-09-27-09-30-03
+.. nonce: MtgLCn
+.. section: Core and Builtins
+
+Fix an assertion failure in `zipimporter.get_source()` in case of a bad
+`zlib.decompress()`. Patch by Oren Milman.
+
+..
+
+.. bpo: 31592
+.. date: 2017-09-26-16-05-04
+.. nonce: IFBZj9
+.. section: Core and Builtins
+
+Fixed an assertion failure in Python parser in case of a bad
+`unicodedata.normalize()`. Patch by Oren Milman.
+
+..
+
+.. bpo: 31588
+.. date: 2017-09-26-13-03-16
+.. nonce: wT9Iy7
+.. section: Core and Builtins
+
+Raise a `TypeError` with a helpful error message when class creation fails
+due to a metaclass with a bad ``__prepare__()`` method. Patch by Oren
+Milman.
+
+..
+
+.. bpo: 31574
+.. date: 2017-09-25-12-35-48
+.. nonce: 5yX5r5
+.. section: Core and Builtins
+
+Importlib was instrumented with two dtrace probes to profile import timing.
+
+..
+
+.. bpo: 31566
+.. date: 2017-09-24-09-57-04
+.. nonce: OxwINs
+.. section: Core and Builtins
+
+Fix an assertion failure in `_warnings.warn()` in case of a bad ``__name__``
+global. Patch by Oren Milman.
+
+..
+
+.. bpo: 31506
+.. date: 2017-09-19-10-29-36
+.. nonce: pRVTRB
+.. section: Core and Builtins
+
+Improved the error message logic for object.__new__ and object.__init__.
+
+..
+
+.. bpo: 31505
+.. date: 2017-09-18-12-07-39
+.. nonce: VomaFa
+.. section: Core and Builtins
+
+Fix an assertion failure in `json`, in case `_json.make_encoder()` received
+a bad `encoder()` argument. Patch by Oren Milman.
+
+..
+
+.. bpo: 31492
+.. date: 2017-09-16-22-49-16
+.. nonce: RtyteL
+.. section: Core and Builtins
+
+Fix assertion failures in case of failing to import from a module with a bad
+``__name__`` attribute, and in case of failing to access an attribute of
+such a module. Patch by Oren Milman.
+
+..
+
+.. bpo: 31478
+.. date: 2017-09-15-09-13-07
+.. nonce: o06iKD
+.. section: Core and Builtins
+
+Fix an assertion failure in `_random.Random.seed()` in case the argument has
+a bad ``__abs__()`` method. Patch by Oren Milman.
+
+..
+
+.. bpo: 31336
+.. date: 2017-09-13-12-04-23
+.. nonce: gi2ahY
+.. section: Core and Builtins
+
+Speed up class creation by 10-20% by reducing the overhead in the necessary
+special method lookups.  Patch by Stefan Behnel.
+
+..
+
+.. bpo: 31415
+.. date: 2017-09-11-14-28-56
+.. nonce: GBdz7o
+.. section: Core and Builtins
+
+Add ``-X importtime`` option to show how long each import takes. It can be
+used to optimize application's startup time.
+
+..
+
+.. bpo: 31410
+.. date: 2017-09-10-20-58-51
+.. nonce: wD_RbH
+.. section: Core and Builtins
+
+Optimized calling wrapper and classmethod descriptors.
+
+..
+
+.. bpo: 31353
+.. date: 2017-09-05-14-19-02
+.. nonce: oGZUeJ
+.. section: Core and Builtins
+
+:pep:`553` - Add a new built-in called ``breakpoint()`` which calls
+``sys.breakpointhook()``.  By default this imports ``pdb`` and calls
+``pdb.set_trace()``, but users may override ``sys.breakpointhook()`` to call
+whatever debugger they want.  The original value of the hook is saved in
+``sys.__breakpointhook__``.
+
+..
+
+.. bpo: 17852
+.. date: 2017-09-04-12-46-25
+.. nonce: OxAtCg
+.. section: Core and Builtins
+
+Maintain a list of open buffered files, flush them before exiting the
+interpreter.  Based on a patch from Armin Rigo.
+
+..
+
+.. bpo: 31315
+.. date: 2017-09-01-00-40-58
+.. nonce: ZX20bl
+.. section: Core and Builtins
+
+Fix an assertion failure in imp.create_dynamic(), when spec.name is not a
+string. Patch by Oren Milman.
+
+..
+
+.. bpo: 31311
+.. date: 2017-08-31-17-52-56
+.. nonce: bNE2l-
+.. section: Core and Builtins
+
+Fix a crash in the ``__setstate__()`` method of `ctypes._CData`, in case of
+a bad ``__dict__``. Patch by Oren Milman.
+
+..
+
+.. bpo: 31293
+.. date: 2017-08-28-17-51-42
+.. nonce: eMYZXj
+.. section: Core and Builtins
+
+Fix crashes in true division and multiplication of a timedelta object by a
+float with a bad as_integer_ratio() method. Patch by Oren Milman.
+
+..
+
+.. bpo: 31285
+.. date: 2017-08-27-21-18-30
+.. nonce: 7lzaKV
+.. section: Core and Builtins
+
+Fix an assertion failure in `warnings.warn_explicit`, when the return value
+of the received loader's get_source() has a bad splitlines() method. Patch
+by Oren Milman.
+
+..
+
+.. bpo: 30406
+.. date: 2017-07-20-22-03-44
+.. nonce: _kr47t
+.. section: Core and Builtins
+
+Make ``async`` and ``await`` proper keywords, as specified in PEP 492.
+
+..
+
+.. bpo: 30058
+.. date: 2017-10-12-19-00-53
+.. nonce: cENtry
+.. section: Library
+
+Fixed buffer overflow in select.kqueue.control().
+
+..
+
+.. bpo: 31672
+.. date: 2017-10-12-02-47-16
+.. nonce: DaOkVd
+.. section: Library
+
+``idpattern`` in ``string.Template`` matched some non-ASCII characters. Now
+it uses ``-i`` regular expression local flag to avoid non-ASCII characters.
+
+..
+
+.. bpo: 31701
+.. date: 2017-10-09-17-42-30
+.. nonce: NRrVel
+.. section: Library
+
+On Windows, faulthandler.enable() now ignores MSC and COM exceptions.
+
+..
+
+.. bpo: 31728
+.. date: 2017-10-08-23-28-30
+.. nonce: XrVMME
+.. section: Library
+
+Prevent crashes in `_elementtree` due to unsafe cleanup of `Element.text`
+and `Element.tail`. Patch by Oren Milman.
+
+..
+
+.. bpo: 31671
+.. date: 2017-10-04-21-28-44
+.. nonce: E-zfc9
+.. section: Library
+
+Now ``re.compile()`` converts passed RegexFlag to normal int object before
+compiling. bm_regex_compile benchmark shows 14% performance improvements.
+
+..
+
+.. bpo: 30397
+.. date: 2017-10-03-22-45-50
+.. nonce: e4F7Kr
+.. section: Library
+
+The types of compiled regular objects and match objects are now exposed as
+`re.Pattern` and `re.Match`.  This adds information in pydoc output for the
+re module.
+
+..
+
+.. bpo: 31675
+.. date: 2017-10-03-15-06-24
+.. nonce: Nh7jJ3
+.. section: Library
+
+Fixed memory leaks in Tkinter's methods splitlist() and split() when pass a
+string larger than 2 GiB.
+
+..
+
+.. bpo: 31673
+.. date: 2017-10-03-14-37-46
+.. nonce: RFCrka
+.. section: Library
+
+Fixed typo in the name of Tkinter's method adderrorinfo().
+
+..
+
+.. bpo: 31648
+.. date: 2017-09-30-10-45-12
+.. nonce: Cai7ji
+.. section: Library
+
+Improvements to path predicates in ElementTree:
+
+* Allow whitespace around predicate parts, i.e. "[a = 'text']" instead of requiring the less readable "[a='text']".
+* Add support for text comparison of the current node, like "[.='text']".
+
+Patch by Stefan Behnel.
+
+..
+
+.. bpo: 30806
+.. date: 2017-09-29
+.. nonce: lP5GrH
+.. section: Library
+
+Fix the string representation of a netrc object.
+
+..
+
+.. bpo: 31638
+.. date: 2017-09-29-07-14-28
+.. nonce: jElfhl
+.. section: Library
+
+Add optional argument ``compressed`` to ``zipapp.create_archive``, and add
+option ``--compress`` to the command line interface of ``zipapp``.
+
+..
+
+.. bpo: 25351
+.. date: 2017-09-28-23-10-51
+.. nonce: 2JmFpF
+.. section: Library
+
+Avoid venv activate failures with undefined variables
+
+..
+
+.. bpo: 20519
+.. date: 2017-09-28-13-17-33
+.. nonce: FteeQQ
+.. section: Library
+
+Avoid ctypes use (if possible) and improve import time for uuid.
+
+..
+
+.. bpo: 28293
+.. date: 2017-09-26-17-51-17
+.. nonce: UC5pm4
+.. section: Library
+
+The regular expression cache is no longer completely dumped when it is full.
+
+..
+
+.. bpo: 31596
+.. date: 2017-09-26-11-38-52
+.. nonce: 50Eyel
+.. section: Library
+
+Added pthread_getcpuclockid() to the time module
+
+..
+
+.. bpo: 27494
+.. date: 2017-09-26-01-43-17
+.. nonce: 37QnaT
+.. section: Library
+
+Make 2to3 accept a trailing comma in generator expressions. For example,
+``set(x for x in [],)`` is now allowed.
+
+..
+
+.. bpo: 30347
+.. date: 2017-09-25-14-04-30
+.. nonce: B4--_D
+.. section: Library
+
+Stop crashes when concurrently iterate over itertools.groupby() iterators.
+
+..
+
+.. bpo: 30346
+.. date: 2017-09-24-13-08-46
+.. nonce: Csse77
+.. section: Library
+
+An iterator produced by itertools.groupby() iterator now becames exhausted
+after advancing the groupby iterator.
+
+..
+
+.. bpo: 31556
+.. date: 2017-09-22-23-48-49
+.. nonce: 9J0u5H
+.. section: Library
+
+Cancel asyncio.wait_for future faster if timeout <= 0
+
+..
+
+.. bpo: 31540
+.. date: 2017-09-22-16-02-00
+.. nonce: ybDHT5
+.. section: Library
+
+Allow passing a context object in
+:class:`concurrent.futures.ProcessPoolExecutor` constructor. Also, free job
+ressources in :class:`concurrent.futures.ProcessPoolExecutor` earlier to
+improve memory usage when a worker waits for new jobs.
+
+..
+
+.. bpo: 31516
+.. date: 2017-09-20-18-43-01
+.. nonce: 23Yuq3
+.. section: Library
+
+``threading.current_thread()`` should not return a dummy thread at shutdown.
+
+..
+
+.. bpo: 31525
+.. date: 2017-09-19-18-48-21
+.. nonce: O2TIL2
+.. section: Library
+
+In the sqlite module, require the sqlite3_prepare_v2 API. Thus, the sqlite
+module now requires sqlite version at least 3.3.9.
+
+..
+
+.. bpo: 26510
+.. date: 2017-09-19-13-29-29
+.. nonce: oncW6V
+.. section: Library
+
+argparse subparsers are now required by default.  This matches behaviour in
+Python 2. For optional subparsers, use the new parameter
+``add_subparsers(required=False)``. Patch by Anthony Sottile.
+
+..
+
+.. bpo: 27541
+.. date: 2017-09-17-19-59-04
+.. nonce: cIMFJW
+.. section: Library
+
+Reprs of subclasses of some collection and iterator classes (`bytearray`,
+`array.array`, `collections.deque`, `collections.defaultdict`,
+`itertools.count`, `itertools.repeat`) now contain actual type name insteads
+of hardcoded name of the base class.
+
+..
+
+.. bpo: 31351
+.. date: 2017-09-17-15-24-25
+.. nonce: yQdKv-
+.. section: Library
+
+python -m ensurepip now exits with non-zero exit code if pip bootstrapping
+has failed.
+
+..
+
+.. bpo: 31389
+.. date: 2017-09-07-15-31-47
+.. nonce: jNFYqB
+.. section: Library
+
+``pdb.set_trace()`` now takes an optional keyword-only argument ``header``.
+If given, this is printed to the console just before debugging begins.
+
+..
+
+.. bpo: 31537
+.. date: 2017-10-08-23-02-14
+.. nonce: SiFNM8
+.. section: Documentation
+
+Fix incorrect usage of ``get_history_length`` in readline documentation
+example code. Patch by Brad Smith.
+
+..
+
+.. bpo: 30085
+.. date: 2017-09-14-18-44-50
+.. nonce: 0J9w-u
+.. section: Documentation
+
+The operator functions without double underscores are preferred for clarity.
+The one with underscores are only kept for back-compatibility.
+
+..
+
+.. bpo: 31696
+.. date: 2017-10-04-23-40-32
+.. nonce: Y3_aBV
+.. section: Build
+
+Improve compiler version information in :data:`sys.version` when Python is
+built with Clang.
+
+..
+
+.. bpo: 31625
+.. date: 2017-09-28-23-21-20
+.. nonce: Bb2NXr
+.. section: Build
+
+Stop using ranlib on static libraries. Instead, we assume ar supports the
+'s' flag.
+
+..
+
+.. bpo: 31624
+.. date: 2017-09-28-20-54-52
+.. nonce: 11w91_
+.. section: Build
+
+Remove support for BSD/OS.
+
+..
+
+.. bpo: 22140
+.. date: 2017-09-26-22-39-58
+.. nonce: ZRf7Wn
+.. section: Build
+
+Prevent double substitution of prefix in python-config.sh.
+
+..
+
+.. bpo: 31569
+.. date: 2017-09-25-00-25-23
+.. nonce: TS49pM
+.. section: Build
+
+Correct PCBuild/ case to PCbuild/ in build scripts and documentation.
+
+..
+
+.. bpo: 31536
+.. date: 2017-09-20-21-32-21
+.. nonce: KUDjno
+.. section: Build
+
+Avoid wholesale rebuild after `make regen-all` if nothing changed.
+
+..
+
+.. bpo: 31460
+.. date: 2017-09-30-19-03-26
+.. nonce: HpveI6
+.. section: IDLE
+
+Simplify the API of IDLE's Module Browser.
+
+Passing a widget instead of an flist with a root widget opens the option of
+creating a browser frame that is only part of a window.  Passing a full file
+name instead of pieces assumed to come from a .py file opens the possibility
+of browsing python files that do not end in .py.
+
+..
+
+.. bpo: 31649
+.. date: 2017-09-30-13-59-18
+.. nonce: LxN4Vb
+.. section: IDLE
+
+IDLE - Make _htest, _utest parameters keyword only.
+
+..
+
+.. bpo: 31559
+.. date: 2017-09-23-12-52-24
+.. nonce: ydckYX
+.. section: IDLE
+
+Remove test order dependence in idle_test.test_browser.
+
+..
+
+.. bpo: 31459
+.. date: 2017-09-22-20-26-23
+.. nonce: L0pnH9
+.. section: IDLE
+
+Rename IDLE's module browser from Class Browser to Module Browser. The
+original module-level class and method browser became a module browser, with
+the addition of module-level functions, years ago. Nested classes and
+functions were added yesterday.  For back- compatibility, the virtual event
+<<open-class-browser>>, which appears on the Keys tab of the Settings
+dialog, is not changed. Patch by Cheryl Sabella.
+
+..
+
+.. bpo: 31500
+.. date: 2017-09-18-10-43-03
+.. nonce: Y_YDxA
+.. section: IDLE
+
+Default fonts now are scaled on HiDPI displays.
+
+..
+
+.. bpo: 1612262
+.. date: 2017-08-14-15-13-50
+.. nonce: -x_Oyq
+.. section: IDLE
+
+IDLE module browser now shows nested classes and functions. Original patches
+for code and tests by Guilherme Polo and Cheryl Sabella, respectively.
+
+..
+
+.. bpo: 28280
+.. date: 2017-09-30-19-41-44
+.. nonce: K_EjpO
+.. section: C API
+
+Make `PyMapping_Keys()`, `PyMapping_Values()` and `PyMapping_Items()` always
+return a `list` (rather than a `list` or a `tuple`). Patch by Oren Milman.
+
+..
+
+.. bpo: 31532
+.. date: 2017-09-20-21-59-52
+.. nonce: s9Cw9_
+.. section: C API
+
+Fix memory corruption due to allocator mix in getpath.c between Py_GetPath()
+and Py_SetPath()
+
+..
+
+.. bpo: 25658
+.. date: 2017-06-24-14-30-44
+.. nonce: vm8vGE
+.. section: C API
+
+Implement PEP 539 for Thread Specific Stroage (TSS) API: it is a new Thread
+Local Storage (TLS) API to CPython which would supersede use of the existing
+TLS API within the CPython interpreter, while deprecating the existing API.
+PEP written by Erik M. Bray, patch by Masayuki Yamamoto.
diff --git a/Misc/NEWS.d/next/Build/2017-09-20-21-32-21.bpo-31536.KUDjno.rst b/Misc/NEWS.d/next/Build/2017-09-20-21-32-21.bpo-31536.KUDjno.rst
deleted file mode 100644
index 414f1a45eab..00000000000
--- a/Misc/NEWS.d/next/Build/2017-09-20-21-32-21.bpo-31536.KUDjno.rst
+++ /dev/null
@@ -1 +0,0 @@
-Avoid wholesale rebuild after `make regen-all` if nothing changed.
diff --git a/Misc/NEWS.d/next/Build/2017-09-25-00-25-23.bpo-31569.TS49pM.rst b/Misc/NEWS.d/next/Build/2017-09-25-00-25-23.bpo-31569.TS49pM.rst
deleted file mode 100644
index a6345dbbbdb..00000000000
--- a/Misc/NEWS.d/next/Build/2017-09-25-00-25-23.bpo-31569.TS49pM.rst
+++ /dev/null
@@ -1 +0,0 @@
-Correct PCBuild/ case to PCbuild/ in build scripts and documentation.
diff --git a/Misc/NEWS.d/next/Build/2017-09-26-22-39-58.bpo-22140.ZRf7Wn.rst b/Misc/NEWS.d/next/Build/2017-09-26-22-39-58.bpo-22140.ZRf7Wn.rst
deleted file mode 100644
index e20c0942f6c..00000000000
--- a/Misc/NEWS.d/next/Build/2017-09-26-22-39-58.bpo-22140.ZRf7Wn.rst
+++ /dev/null
@@ -1 +0,0 @@
-Prevent double substitution of prefix in python-config.sh.
diff --git a/Misc/NEWS.d/next/Build/2017-09-28-20-54-52.bpo-31624.11w91_.rst b/Misc/NEWS.d/next/Build/2017-09-28-20-54-52.bpo-31624.11w91_.rst
deleted file mode 100644
index c329b43c4df..00000000000
--- a/Misc/NEWS.d/next/Build/2017-09-28-20-54-52.bpo-31624.11w91_.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove support for BSD/OS.
diff --git a/Misc/NEWS.d/next/Build/2017-09-28-23-21-20.bpo-31625.Bb2NXr.rst b/Misc/NEWS.d/next/Build/2017-09-28-23-21-20.bpo-31625.Bb2NXr.rst
deleted file mode 100644
index dbd078f0030..00000000000
--- a/Misc/NEWS.d/next/Build/2017-09-28-23-21-20.bpo-31625.Bb2NXr.rst
+++ /dev/null
@@ -1 +0,0 @@
-Stop using ranlib on static libraries. Instead, we assume ar supports the 's' flag.
diff --git a/Misc/NEWS.d/next/Build/2017-10-04-23-40-32.bpo-31696.Y3_aBV.rst b/Misc/NEWS.d/next/Build/2017-10-04-23-40-32.bpo-31696.Y3_aBV.rst
deleted file mode 100644
index 00aae0b8ae1..00000000000
--- a/Misc/NEWS.d/next/Build/2017-10-04-23-40-32.bpo-31696.Y3_aBV.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Improve compiler version information in :data:`sys.version` when Python is
-built with Clang.
diff --git a/Misc/NEWS.d/next/C API/2017-06-24-14-30-44.bpo-25658.vm8vGE.rst b/Misc/NEWS.d/next/C API/2017-06-24-14-30-44.bpo-25658.vm8vGE.rst
deleted file mode 100644
index d4bb19acc4b..00000000000
--- a/Misc/NEWS.d/next/C API/2017-06-24-14-30-44.bpo-25658.vm8vGE.rst	
+++ /dev/null
@@ -1,4 +0,0 @@
-Implement PEP 539 for Thread Specific Stroage (TSS) API: it is a new Thread
-Local Storage (TLS) API to CPython which would supersede use of the existing
-TLS API within the CPython interpreter, while deprecating the existing API.
-PEP written by Erik M. Bray, patch by Masayuki Yamamoto.
diff --git a/Misc/NEWS.d/next/C API/2017-09-20-21-59-52.bpo-31532.s9Cw9_.rst b/Misc/NEWS.d/next/C API/2017-09-20-21-59-52.bpo-31532.s9Cw9_.rst
deleted file mode 100644
index 7451986846e..00000000000
--- a/Misc/NEWS.d/next/C API/2017-09-20-21-59-52.bpo-31532.s9Cw9_.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix memory corruption due to allocator mix in getpath.c between Py_GetPath()
-and Py_SetPath()
diff --git a/Misc/NEWS.d/next/C API/2017-09-30-19-41-44.bpo-28280.K_EjpO.rst b/Misc/NEWS.d/next/C API/2017-09-30-19-41-44.bpo-28280.K_EjpO.rst
deleted file mode 100644
index 76990f79cb0..00000000000
--- a/Misc/NEWS.d/next/C API/2017-09-30-19-41-44.bpo-28280.K_EjpO.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Make `PyMapping_Keys()`, `PyMapping_Values()` and `PyMapping_Items()` always
-return a `list` (rather than a `list` or a `tuple`). Patch by Oren Milman.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-07-20-22-03-44.bpo-30406._kr47t.rst b/Misc/NEWS.d/next/Core and Builtins/2017-07-20-22-03-44.bpo-30406._kr47t.rst
deleted file mode 100644
index caf56f03783..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-07-20-22-03-44.bpo-30406._kr47t.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Make ``async`` and ``await`` proper keywords, as specified in PEP 492.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-27-21-18-30.bpo-31285.7lzaKV.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-27-21-18-30.bpo-31285.7lzaKV.rst
deleted file mode 100644
index 61f2c4eff65..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-08-27-21-18-30.bpo-31285.7lzaKV.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix an assertion failure in `warnings.warn_explicit`, when the return value
-of the received loader's get_source() has a bad splitlines() method. Patch
-by Oren Milman.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-28-17-51-42.bpo-31293.eMYZXj.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-28-17-51-42.bpo-31293.eMYZXj.rst
deleted file mode 100644
index 28b7bfb2ef3..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-08-28-17-51-42.bpo-31293.eMYZXj.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix crashes in true division and multiplication of a timedelta object by a
-float with a bad as_integer_ratio() method. Patch by Oren Milman.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-31-17-52-56.bpo-31311.bNE2l-.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-31-17-52-56.bpo-31311.bNE2l-.rst
deleted file mode 100644
index db51cd2d586..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-08-31-17-52-56.bpo-31311.bNE2l-.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix a crash in the ``__setstate__()`` method of `ctypes._CData`, in case of
-a bad ``__dict__``. Patch by Oren Milman.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-01-00-40-58.bpo-31315.ZX20bl.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-01-00-40-58.bpo-31315.ZX20bl.rst
deleted file mode 100644
index d13badbb358..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-01-00-40-58.bpo-31315.ZX20bl.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix an assertion failure in imp.create_dynamic(), when spec.name is not a
-string. Patch by Oren Milman.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-04-12-46-25.bpo-17852.OxAtCg.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-04-12-46-25.bpo-17852.OxAtCg.rst
deleted file mode 100644
index 185664c747d..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-04-12-46-25.bpo-17852.OxAtCg.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Maintain a list of open buffered files, flush them before exiting the
-interpreter.  Based on a patch from Armin Rigo.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-05-14-19-02.bpo-31353.oGZUeJ.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-05-14-19-02.bpo-31353.oGZUeJ.rst
deleted file mode 100644
index 55f81cde8a5..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-05-14-19-02.bpo-31353.oGZUeJ.rst	
+++ /dev/null
@@ -1,5 +0,0 @@
-:pep:`553` - Add a new built-in called ``breakpoint()`` which calls
-``sys.breakpointhook()``.  By default this imports ``pdb`` and calls
-``pdb.set_trace()``, but users may override ``sys.breakpointhook()`` to call
-whatever debugger they want.  The original value of the hook is saved in
-``sys.__breakpointhook__``.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-10-20-58-51.bpo-31410.wD_RbH.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-10-20-58-51.bpo-31410.wD_RbH.rst
deleted file mode 100644
index e3a660f14fa..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-10-20-58-51.bpo-31410.wD_RbH.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Optimized calling wrapper and classmethod descriptors.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-11-14-28-56.bpo-31415.GBdz7o.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-11-14-28-56.bpo-31415.GBdz7o.rst
deleted file mode 100644
index 52aa16a972b..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-11-14-28-56.bpo-31415.GBdz7o.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Add ``-X importtime`` option to show how long each import takes. It can
-be used to optimize application's startup time.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-13-12-04-23.bpo-31336.gi2ahY.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-13-12-04-23.bpo-31336.gi2ahY.rst
deleted file mode 100644
index e62b065af17..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-13-12-04-23.bpo-31336.gi2ahY.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Speed up class creation by 10-20% by reducing the overhead in the
-necessary special method lookups.  Patch by Stefan Behnel.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-15-09-13-07.bpo-31478.o06iKD.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-15-09-13-07.bpo-31478.o06iKD.rst
deleted file mode 100644
index bbeb810ebaa..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-15-09-13-07.bpo-31478.o06iKD.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix an assertion failure in `_random.Random.seed()` in case the argument has a
-bad ``__abs__()`` method. Patch by Oren Milman.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-16-22-49-16.bpo-31492.RtyteL.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-16-22-49-16.bpo-31492.RtyteL.rst
deleted file mode 100644
index a8704738d1a..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-16-22-49-16.bpo-31492.RtyteL.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix assertion failures in case of failing to import from a module with a bad
-``__name__`` attribute, and in case of failing to access an attribute of such
-a module. Patch by Oren Milman.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-18-12-07-39.bpo-31505.VomaFa.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-18-12-07-39.bpo-31505.VomaFa.rst
deleted file mode 100644
index bad9e51aaf6..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-18-12-07-39.bpo-31505.VomaFa.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix an assertion failure in `json`, in case `_json.make_encoder()` received
-a bad `encoder()` argument. Patch by Oren Milman.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-19-10-29-36.bpo-31506.pRVTRB.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-19-10-29-36.bpo-31506.pRVTRB.rst
deleted file mode 100644
index 3bafd8332f9..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-19-10-29-36.bpo-31506.pRVTRB.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Improved the error message logic for object.__new__ and object.__init__.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-24-09-57-04.bpo-31566.OxwINs.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-24-09-57-04.bpo-31566.OxwINs.rst
deleted file mode 100644
index d3ccfd7a242..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-24-09-57-04.bpo-31566.OxwINs.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix an assertion failure in `_warnings.warn()` in case of a bad
-``__name__`` global. Patch by Oren Milman.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-25-12-35-48.bpo-31574.5yX5r5.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-25-12-35-48.bpo-31574.5yX5r5.rst
deleted file mode 100644
index e5c8ae28542..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-25-12-35-48.bpo-31574.5yX5r5.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Importlib was instrumented with two dtrace probes to profile import timing.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-26-13-03-16.bpo-31588.wT9Iy7.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-26-13-03-16.bpo-31588.wT9Iy7.rst
deleted file mode 100644
index 44a7aba9d7f..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-26-13-03-16.bpo-31588.wT9Iy7.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Raise a `TypeError` with a helpful error message when class creation fails
-due to a metaclass with a bad ``__prepare__()`` method. Patch by Oren Milman.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-26-16-05-04.bpo-31592.IFBZj9.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-26-16-05-04.bpo-31592.IFBZj9.rst
deleted file mode 100644
index 29f3461921e..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-26-16-05-04.bpo-31592.IFBZj9.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed an assertion failure in Python parser in case of a bad `unicodedata.normalize()`.
-Patch by Oren Milman.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-27-09-30-03.bpo-31602.MtgLCn.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-27-09-30-03.bpo-31602.MtgLCn.rst
deleted file mode 100644
index 3a6320911e1..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-27-09-30-03.bpo-31602.MtgLCn.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix an assertion failure in `zipimporter.get_source()` in case of a bad
-`zlib.decompress()`. Patch by Oren Milman.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-29-20-32-24.bpo-31619.6gQ1kv.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-29-20-32-24.bpo-31619.6gQ1kv.rst
deleted file mode 100644
index 3efcc9d134d..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-09-29-20-32-24.bpo-31619.6gQ1kv.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed a ValueError when convert a string with large number of underscores
-to integer with binary base.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-03-23-46-39.bpo-30404._9Yi5u.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-03-23-46-39.bpo-30404._9Yi5u.rst
deleted file mode 100644
index 6c2802077f0..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-10-03-23-46-39.bpo-30404._9Yi5u.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-The -u option now makes the stdout and stderr streams unbuffered rather than
-line-buffered.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-06-00-27-04.bpo-31709._PmU51.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-06-00-27-04.bpo-31709._PmU51.rst
deleted file mode 100644
index 6c342eacae3..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-10-06-00-27-04.bpo-31709._PmU51.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Drop support of asynchronous __aiter__.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-06-02-10-48.bpo-31708.66CCVU.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-06-02-10-48.bpo-31708.66CCVU.rst
deleted file mode 100644
index f732fee755e..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-10-06-02-10-48.bpo-31708.66CCVU.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Allow use of asynchronous generator expressions in synchronous functions.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-08-10-00-55.bpo-31642.1IKqgs.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-08-10-00-55.bpo-31642.1IKqgs.rst
deleted file mode 100644
index 0cb540fa50a..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-10-08-10-00-55.bpo-31642.1IKqgs.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Restored blocking "from package import module" by setting
-sys.modules["package.module"] to None.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-16-14-27-25.bpo-31558.K-uRRm.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-16-14-27-25.bpo-31558.K-uRRm.rst
deleted file mode 100644
index d502f15ad67..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2017-10-16-14-27-25.bpo-31558.K-uRRm.rst	
+++ /dev/null
@@ -1,5 +0,0 @@
-``gc.freeze()`` is a new API that allows for moving all objects currently
-tracked by the garbage collector to a permanent generation, effectively
-removing them from future collection events. This can be used to protect
-those objects from having their PyGC_Head mutated. In effect, this enables
-great copy-on-write stability at fork().
diff --git a/Misc/NEWS.d/next/Documentation/2017-09-14-18-44-50.bpo-30085.0J9w-u.rst b/Misc/NEWS.d/next/Documentation/2017-09-14-18-44-50.bpo-30085.0J9w-u.rst
deleted file mode 100644
index c8be050009c..00000000000
--- a/Misc/NEWS.d/next/Documentation/2017-09-14-18-44-50.bpo-30085.0J9w-u.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-The operator functions without double underscores are preferred for clarity.
-The one with underscores are only kept for back-compatibility.
diff --git a/Misc/NEWS.d/next/Documentation/2017-10-08-23-02-14.bpo-31537.SiFNM8.rst b/Misc/NEWS.d/next/Documentation/2017-10-08-23-02-14.bpo-31537.SiFNM8.rst
deleted file mode 100644
index 9244d7ee627..00000000000
--- a/Misc/NEWS.d/next/Documentation/2017-10-08-23-02-14.bpo-31537.SiFNM8.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix incorrect usage of ``get_history_length`` in readline documentation
-example code. Patch by Brad Smith.
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-14-15-13-50.bpo-1612262.-x_Oyq.rst b/Misc/NEWS.d/next/IDLE/2017-08-14-15-13-50.bpo-1612262.-x_Oyq.rst
deleted file mode 100644
index 0d4494c16a7..00000000000
--- a/Misc/NEWS.d/next/IDLE/2017-08-14-15-13-50.bpo-1612262.-x_Oyq.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-IDLE module browser now shows nested classes and functions.
-Original patches for code and tests by Guilherme Polo and
-Cheryl Sabella, respectively.
diff --git a/Misc/NEWS.d/next/IDLE/2017-09-18-10-43-03.bpo-31500.Y_YDxA.rst b/Misc/NEWS.d/next/IDLE/2017-09-18-10-43-03.bpo-31500.Y_YDxA.rst
deleted file mode 100644
index 68d68cb1c86..00000000000
--- a/Misc/NEWS.d/next/IDLE/2017-09-18-10-43-03.bpo-31500.Y_YDxA.rst
+++ /dev/null
@@ -1 +0,0 @@
-Default fonts now are scaled on HiDPI displays.
diff --git a/Misc/NEWS.d/next/IDLE/2017-09-22-20-26-23.bpo-31459.L0pnH9.rst b/Misc/NEWS.d/next/IDLE/2017-09-22-20-26-23.bpo-31459.L0pnH9.rst
deleted file mode 100644
index b53c009dfcd..00000000000
--- a/Misc/NEWS.d/next/IDLE/2017-09-22-20-26-23.bpo-31459.L0pnH9.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Rename IDLE's module browser from Class Browser to Module Browser.
-The original module-level class and method browser became a module
-browser, with the addition of module-level functions, years ago.
-Nested classes and functions were added yesterday.  For back-
-compatibility, the virtual event <<open-class-browser>>, which
-appears on the Keys tab of the Settings dialog, is not changed.
-Patch by Cheryl Sabella.
diff --git a/Misc/NEWS.d/next/IDLE/2017-09-23-12-52-24.bpo-31559.ydckYX.rst b/Misc/NEWS.d/next/IDLE/2017-09-23-12-52-24.bpo-31559.ydckYX.rst
deleted file mode 100644
index 424da7a3f17..00000000000
--- a/Misc/NEWS.d/next/IDLE/2017-09-23-12-52-24.bpo-31559.ydckYX.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove test order dependence in idle_test.test_browser.
diff --git a/Misc/NEWS.d/next/IDLE/2017-09-30-13-59-18.bpo-31649.LxN4Vb.rst b/Misc/NEWS.d/next/IDLE/2017-09-30-13-59-18.bpo-31649.LxN4Vb.rst
deleted file mode 100644
index cc995862372..00000000000
--- a/Misc/NEWS.d/next/IDLE/2017-09-30-13-59-18.bpo-31649.LxN4Vb.rst
+++ /dev/null
@@ -1 +0,0 @@
-IDLE - Make _htest, _utest parameters keyword only.
diff --git a/Misc/NEWS.d/next/IDLE/2017-09-30-19-03-26.bpo-31460.HpveI6.rst b/Misc/NEWS.d/next/IDLE/2017-09-30-19-03-26.bpo-31460.HpveI6.rst
deleted file mode 100644
index 6492115260a..00000000000
--- a/Misc/NEWS.d/next/IDLE/2017-09-30-19-03-26.bpo-31460.HpveI6.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Simplify the API of IDLE's Module Browser.
-
-Passing a widget instead of an flist with a root widget opens the option of
-creating a browser frame that is only part of a window.  Passing a full file
-name instead of pieces assumed to come from a .py file opens the possibility
-of browsing python files that do not end in .py.
diff --git a/Misc/NEWS.d/next/Library/2017-09-07-15-31-47.bpo-31389.jNFYqB.rst b/Misc/NEWS.d/next/Library/2017-09-07-15-31-47.bpo-31389.jNFYqB.rst
deleted file mode 100644
index 7f459680967..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-07-15-31-47.bpo-31389.jNFYqB.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-``pdb.set_trace()`` now takes an optional keyword-only argument ``header``.
-If given, this is printed to the console just before debugging begins.
diff --git a/Misc/NEWS.d/next/Library/2017-09-17-15-24-25.bpo-31351.yQdKv-.rst b/Misc/NEWS.d/next/Library/2017-09-17-15-24-25.bpo-31351.yQdKv-.rst
deleted file mode 100644
index 20f2c1bdc11..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-17-15-24-25.bpo-31351.yQdKv-.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-python -m ensurepip now exits with non-zero exit code if pip bootstrapping
-has failed.
diff --git a/Misc/NEWS.d/next/Library/2017-09-17-19-59-04.bpo-27541.cIMFJW.rst b/Misc/NEWS.d/next/Library/2017-09-17-19-59-04.bpo-27541.cIMFJW.rst
deleted file mode 100644
index c5c058c3b9b..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-17-19-59-04.bpo-27541.cIMFJW.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Reprs of subclasses of some collection and iterator classes (`bytearray`,
-`array.array`, `collections.deque`, `collections.defaultdict`,
-`itertools.count`, `itertools.repeat`) now contain actual type name insteads
-of hardcoded name of the base class.
diff --git a/Misc/NEWS.d/next/Library/2017-09-19-13-29-29.bpo-26510.oncW6V.rst b/Misc/NEWS.d/next/Library/2017-09-19-13-29-29.bpo-26510.oncW6V.rst
deleted file mode 100644
index 26a6b4b0ee8..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-19-13-29-29.bpo-26510.oncW6V.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-argparse subparsers are now required by default.  This matches behaviour in Python 2.
-For optional subparsers, use the new parameter ``add_subparsers(required=False)``.
-Patch by Anthony Sottile.
diff --git a/Misc/NEWS.d/next/Library/2017-09-19-18-48-21.bpo-31525.O2TIL2.rst b/Misc/NEWS.d/next/Library/2017-09-19-18-48-21.bpo-31525.O2TIL2.rst
deleted file mode 100644
index 7f09e57d9d1..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-19-18-48-21.bpo-31525.O2TIL2.rst
+++ /dev/null
@@ -1 +0,0 @@
-In the sqlite module, require the sqlite3_prepare_v2 API. Thus, the sqlite module now requires sqlite version at least 3.3.9.
diff --git a/Misc/NEWS.d/next/Library/2017-09-20-18-43-01.bpo-31516.23Yuq3.rst b/Misc/NEWS.d/next/Library/2017-09-20-18-43-01.bpo-31516.23Yuq3.rst
deleted file mode 100644
index af48d159fef..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-20-18-43-01.bpo-31516.23Yuq3.rst
+++ /dev/null
@@ -1 +0,0 @@
-``threading.current_thread()`` should not return a dummy thread at shutdown.
diff --git a/Misc/NEWS.d/next/Library/2017-09-22-16-02-00.bpo-31540.ybDHT5.rst b/Misc/NEWS.d/next/Library/2017-09-22-16-02-00.bpo-31540.ybDHT5.rst
deleted file mode 100644
index 0b4259f8847..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-22-16-02-00.bpo-31540.ybDHT5.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Allow passing a context object in
-:class:`concurrent.futures.ProcessPoolExecutor` constructor.
-Also, free job ressources in :class:`concurrent.futures.ProcessPoolExecutor`
-earlier to improve memory usage when a worker waits for new jobs.
diff --git a/Misc/NEWS.d/next/Library/2017-09-22-23-48-49.bpo-31556.9J0u5H.rst b/Misc/NEWS.d/next/Library/2017-09-22-23-48-49.bpo-31556.9J0u5H.rst
deleted file mode 100644
index 2e6b0284696..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-22-23-48-49.bpo-31556.9J0u5H.rst
+++ /dev/null
@@ -1 +0,0 @@
-Cancel asyncio.wait_for future faster if timeout <= 0
diff --git a/Misc/NEWS.d/next/Library/2017-09-24-13-08-46.bpo-30346.Csse77.rst b/Misc/NEWS.d/next/Library/2017-09-24-13-08-46.bpo-30346.Csse77.rst
deleted file mode 100644
index 81ad0534fc1..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-24-13-08-46.bpo-30346.Csse77.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-An iterator produced by itertools.groupby() iterator now becames exhausted
-after advancing the groupby iterator.
diff --git a/Misc/NEWS.d/next/Library/2017-09-25-14-04-30.bpo-30347.B4--_D.rst b/Misc/NEWS.d/next/Library/2017-09-25-14-04-30.bpo-30347.B4--_D.rst
deleted file mode 100644
index 859c6415529..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-25-14-04-30.bpo-30347.B4--_D.rst
+++ /dev/null
@@ -1 +0,0 @@
-Stop crashes when concurrently iterate over itertools.groupby() iterators.
diff --git a/Misc/NEWS.d/next/Library/2017-09-26-01-43-17.bpo-27494.37QnaT.rst b/Misc/NEWS.d/next/Library/2017-09-26-01-43-17.bpo-27494.37QnaT.rst
deleted file mode 100644
index 5b5362a41c5..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-26-01-43-17.bpo-27494.37QnaT.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Make 2to3 accept a trailing comma in generator expressions. For example, ``set(x
-for x in [],)`` is now allowed.
diff --git a/Misc/NEWS.d/next/Library/2017-09-26-11-38-52.bpo-31596.50Eyel.rst b/Misc/NEWS.d/next/Library/2017-09-26-11-38-52.bpo-31596.50Eyel.rst
deleted file mode 100644
index 85b1e1a8cad..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-26-11-38-52.bpo-31596.50Eyel.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added pthread_getcpuclockid() to the time module
diff --git a/Misc/NEWS.d/next/Library/2017-09-26-17-51-17.bpo-28293.UC5pm4.rst b/Misc/NEWS.d/next/Library/2017-09-26-17-51-17.bpo-28293.UC5pm4.rst
deleted file mode 100644
index 16b92b05dbf..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-26-17-51-17.bpo-28293.UC5pm4.rst
+++ /dev/null
@@ -1 +0,0 @@
-The regular expression cache is no longer completely dumped when it is full.
diff --git a/Misc/NEWS.d/next/Library/2017-09-28-13-17-33.bpo-20519.FteeQQ.rst b/Misc/NEWS.d/next/Library/2017-09-28-13-17-33.bpo-20519.FteeQQ.rst
deleted file mode 100644
index ef86c47f26a..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-28-13-17-33.bpo-20519.FteeQQ.rst
+++ /dev/null
@@ -1 +0,0 @@
-Avoid ctypes use (if possible) and improve import time for uuid.
diff --git a/Misc/NEWS.d/next/Library/2017-09-28-23-10-51.bpo-25351.2JmFpF.rst b/Misc/NEWS.d/next/Library/2017-09-28-23-10-51.bpo-25351.2JmFpF.rst
deleted file mode 100644
index f7afc2570aa..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-28-23-10-51.bpo-25351.2JmFpF.rst
+++ /dev/null
@@ -1 +0,0 @@
-Avoid venv activate failures with undefined variables
diff --git a/Misc/NEWS.d/next/Library/2017-09-29-07-14-28.bpo-31638.jElfhl.rst b/Misc/NEWS.d/next/Library/2017-09-29-07-14-28.bpo-31638.jElfhl.rst
deleted file mode 100644
index 29e504e9a2c..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-29-07-14-28.bpo-31638.jElfhl.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Add optional argument ``compressed`` to ``zipapp.create_archive``, and add
-option ``--compress`` to the command line interface of ``zipapp``.
diff --git a/Misc/NEWS.d/next/Library/2017-09-29.bpo-30806.lP5GrH.rst b/Misc/NEWS.d/next/Library/2017-09-29.bpo-30806.lP5GrH.rst
deleted file mode 100644
index afad1b2fb26..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-29.bpo-30806.lP5GrH.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix the string representation of a netrc object.
diff --git a/Misc/NEWS.d/next/Library/2017-09-30-10-45-12.bpo-31648.Cai7ji.rst b/Misc/NEWS.d/next/Library/2017-09-30-10-45-12.bpo-31648.Cai7ji.rst
deleted file mode 100644
index 8b39ce92fee..00000000000
--- a/Misc/NEWS.d/next/Library/2017-09-30-10-45-12.bpo-31648.Cai7ji.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Improvements to path predicates in ElementTree:
-
-* Allow whitespace around predicate parts, i.e. "[a = 'text']" instead of requiring the less readable "[a='text']".
-* Add support for text comparison of the current node, like "[.='text']".
-
-Patch by Stefan Behnel.
diff --git a/Misc/NEWS.d/next/Library/2017-10-03-14-37-46.bpo-31673.RFCrka.rst b/Misc/NEWS.d/next/Library/2017-10-03-14-37-46.bpo-31673.RFCrka.rst
deleted file mode 100644
index 8fce050c041..00000000000
--- a/Misc/NEWS.d/next/Library/2017-10-03-14-37-46.bpo-31673.RFCrka.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed typo in the name of Tkinter's method adderrorinfo().
diff --git a/Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst b/Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst
deleted file mode 100644
index 4e4430773af..00000000000
--- a/Misc/NEWS.d/next/Library/2017-10-03-15-06-24.bpo-31675.Nh7jJ3.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed memory leaks in Tkinter's methods splitlist() and split() when pass a
-string larger than 2 GiB.
diff --git a/Misc/NEWS.d/next/Library/2017-10-03-22-45-50.bpo-30397.e4F7Kr.rst b/Misc/NEWS.d/next/Library/2017-10-03-22-45-50.bpo-30397.e4F7Kr.rst
deleted file mode 100644
index 2f1f762d6ff..00000000000
--- a/Misc/NEWS.d/next/Library/2017-10-03-22-45-50.bpo-30397.e4F7Kr.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-The types of compiled regular objects and match objects are now exposed as
-`re.Pattern` and `re.Match`.  This adds information in pydoc output for the
-re module.
diff --git a/Misc/NEWS.d/next/Library/2017-10-04-21-28-44.bpo-31671.E-zfc9.rst b/Misc/NEWS.d/next/Library/2017-10-04-21-28-44.bpo-31671.E-zfc9.rst
deleted file mode 100644
index b84dedd63ed..00000000000
--- a/Misc/NEWS.d/next/Library/2017-10-04-21-28-44.bpo-31671.E-zfc9.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Now ``re.compile()`` converts passed RegexFlag to normal int object before
-compiling. bm_regex_compile benchmark shows 14% performance improvements.
diff --git a/Misc/NEWS.d/next/Library/2017-10-08-23-28-30.bpo-31728.XrVMME.rst b/Misc/NEWS.d/next/Library/2017-10-08-23-28-30.bpo-31728.XrVMME.rst
deleted file mode 100644
index b317d9f210b..00000000000
--- a/Misc/NEWS.d/next/Library/2017-10-08-23-28-30.bpo-31728.XrVMME.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Prevent crashes in `_elementtree` due to unsafe cleanup of `Element.text`
-and `Element.tail`. Patch by Oren Milman.
diff --git a/Misc/NEWS.d/next/Library/2017-10-09-17-42-30.bpo-31701.NRrVel.rst b/Misc/NEWS.d/next/Library/2017-10-09-17-42-30.bpo-31701.NRrVel.rst
deleted file mode 100644
index 129b74e5ce2..00000000000
--- a/Misc/NEWS.d/next/Library/2017-10-09-17-42-30.bpo-31701.NRrVel.rst
+++ /dev/null
@@ -1 +0,0 @@
-On Windows, faulthandler.enable() now ignores MSC and COM exceptions.
diff --git a/Misc/NEWS.d/next/Library/2017-10-12-02-47-16.bpo-31672.DaOkVd.rst b/Misc/NEWS.d/next/Library/2017-10-12-02-47-16.bpo-31672.DaOkVd.rst
deleted file mode 100644
index b8de1f3b1db..00000000000
--- a/Misc/NEWS.d/next/Library/2017-10-12-02-47-16.bpo-31672.DaOkVd.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-``idpattern`` in ``string.Template`` matched some non-ASCII characters. Now
-it uses ``-i`` regular expression local flag to avoid non-ASCII characters.
diff --git a/Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst b/Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst
deleted file mode 100644
index fa1c8f4e74f..00000000000
--- a/Misc/NEWS.d/next/Library/2017-10-12-19-00-53.bpo-30058.cENtry.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed buffer overflow in select.kqueue.control().


From webhook-mailer at python.org  Tue Oct 17 04:35:25 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 17 Oct 2017 08:35:25 -0000
Subject: [Python-checkins] bpo-31733: Add PYTHONSHOWREFCOUNT env var
 (GH-3932)
Message-ID: <mailman.67.1508229329.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/3c082a7fdb472f02bcac7a7f8fe1e3a34a11b70b
commit: 3c082a7fdb472f02bcac7a7f8fe1e3a34a11b70b
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-17T01:35:19-07:00
summary:

bpo-31733: Add PYTHONSHOWREFCOUNT env var (GH-3932)

Add a new PYTHONSHOWREFCOUNT environment variable. In debug mode,
Python now only print the total reference count if PYTHONSHOWREFCOUNT
is set.

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-09-15-46-37.bpo-31733.pIf17N.rst
M Doc/using/cmdline.rst
M Python/pythonrun.c

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index f00f7f6026a..65988bc32c1 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -663,3 +663,10 @@ if Python was configured with the ``--with-pydebug`` build option.
 
    If set, Python will print memory allocation statistics every time a new
    object arena is created, and on shutdown.
+
+.. envvar:: PYTHONSHOWREFCOUNT
+
+   If set, Python will print the total reference count when the program
+   finishes or after each statement in the interactive interpreter.
+
+   .. versionadded:: 2.7.15
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-09-15-46-37.bpo-31733.pIf17N.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-09-15-46-37.bpo-31733.pIf17N.rst
new file mode 100644
index 00000000000..08f02053a51
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-09-15-46-37.bpo-31733.pIf17N.rst	
@@ -0,0 +1,2 @@
+Add a new PYTHONSHOWREFCOUNT environment variable. In debug mode, Python now
+only print the total reference count if PYTHONSHOWREFCOUNT is set.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 2ffecc722dc..677f6e48111 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -37,14 +37,6 @@
 #include "windows.h"
 #endif
 
-#ifndef Py_REF_DEBUG
-#define PRINT_TOTAL_REFS()
-#else /* Py_REF_DEBUG */
-#define PRINT_TOTAL_REFS() fprintf(stderr,                              \
-                   "[%" PY_FORMAT_SIZE_T "d refs]\n",                   \
-                   _Py_GetRefTotal())
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -104,6 +96,21 @@ PyModule_GetWarningsModule(void)
     return PyImport_ImportModule("warnings");
 }
 
+static void
+_PyDebug_PrintTotalRefs(void)
+{
+#ifdef Py_REF_DEBUG
+    Py_ssize_t total;
+
+    if (!Py_GETENV("PYTHONSHOWREFCOUNT")) {
+        return;
+    }
+
+    total = _Py_GetRefTotal();
+    fprintf(stderr, "[%" PY_FORMAT_SIZE_T "d refs]\n", total);
+#endif
+}
+
 static int initialized = 0;
 
 /* API to access the initialized flag -- useful for esoteric use */
@@ -484,7 +491,7 @@ Py_Finalize(void)
     dump_counts(stdout);
 #endif
 
-    PRINT_TOTAL_REFS();
+    _PyDebug_PrintTotalRefs();
 
 #ifdef Py_TRACE_REFS
     /* Display all objects still alive -- this can invoke arbitrary
@@ -775,7 +782,7 @@ PyRun_InteractiveLoopFlags(FILE *fp, const char *filename, PyCompilerFlags *flag
     }
     for (;;) {
         ret = PyRun_InteractiveOneFlags(fp, filename, flags);
-        PRINT_TOTAL_REFS();
+        _PyDebug_PrintTotalRefs();
         if (ret == E_EOF)
             return 0;
         /*


From solipsis at pitrou.net  Tue Oct 17 05:05:58 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 17 Oct 2017 09:05:58 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=10
Message-ID: <20171017090557.21131.BECC98EA9E53A303@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
test_multiprocessing_forkserver leaked [0, -1, 2] memory blocks, sum=1
test_multiprocessing_spawn leaked [2, 0, 0] memory blocks, sum=2


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

From webhook-mailer at python.org  Tue Oct 17 05:25:28 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 17 Oct 2017 09:25:28 -0000
Subject: [Python-checkins] [2.7] bpo-31692: Add PYTHONSHOWALLOCCOUNT env var
 (GH-3927)
Message-ID: <mailman.68.1508232331.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/7b4ba62e388474e811268322b47f80d464933541
commit: 7b4ba62e388474e811268322b47f80d464933541
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-17T02:25:23-07:00
summary:

[2.7] bpo-31692: Add PYTHONSHOWALLOCCOUNT env var (GH-3927)

bpo-31692, bpo-19527:

* Add a new PYTHONSHOWALLOCCOUNT environment variable, similar to
  the Python 3 "-X showalloccount" option
* When Python is compiled with COUNT_ALLOCS, the new
  PYTHONSHOWALLOCCOUNT environment variable now has to be set to dump
  allocation counts into stderr on shutdown. Moreover, allocations
  statistics are now dumped into stderr rather than stdout.
* Add @test.support.requires_type_collecting decorator: skip test if
  COUNT_ALLOCS is defined
* Fix tests for COUNT_ALLOCS: decorate some methods with
  @requires_type_collecting
* test_sys.test_objecttypes(): update object type when COUNT_ALLOCS
  is defined

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-09-11-03-13.bpo-31692.5-bpdk.rst
M Doc/c-api/typeobj.rst
M Doc/using/cmdline.rst
M Lib/test/support/__init__.py
M Lib/test/test_abc.py
M Lib/test/test_gc.py
M Lib/test/test_regrtest.py
M Lib/test/test_sys.py
M Lib/test/test_weakref.py
M Python/pythonrun.c

diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
index 18edcdd7e5a..f0ccf2ea5fe 100644
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -1101,7 +1101,7 @@ The next fields, up to and including :c:member:`~PyTypeObject.tp_weaklist`, only
 The remaining fields are only defined if the feature test macro
 :const:`COUNT_ALLOCS` is defined, and are for internal use only. They are
 documented here for completeness.  None of these fields are inherited by
-subtypes.
+subtypes. See the :envvar:`PYTHONSHOWALLOCCOUNT` environment variable.
 
 
 .. c:member:: Py_ssize_t PyTypeObject.tp_allocs
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 65988bc32c1..c35bb34f934 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -664,6 +664,13 @@ if Python was configured with the ``--with-pydebug`` build option.
    If set, Python will print memory allocation statistics every time a new
    object arena is created, and on shutdown.
 
+.. envvar:: PYTHONSHOWALLOCCOUNT
+
+   If set and Python was compiled with ``COUNT_ALLOCS`` defined, Python will
+   dump allocations counts into stderr on shutdown.
+
+   .. versionadded:: 2.7.15
+
 .. envvar:: PYTHONSHOWREFCOUNT
 
    If set, Python will print the total reference count when the program
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 25df3ed0c41..d14a6620b5d 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -1795,6 +1795,9 @@ def py3k_bytes(b):
         except TypeError:
             return bytes(b)
 
+requires_type_collecting = unittest.skipIf(hasattr(sys, 'getcounts'),
+                        'types are immortal if COUNT_ALLOCS is defined')
+
 def args_from_interpreter_flags():
     """Return a list of command-line arguments reproducing the current
     settings in sys.flags."""
diff --git a/Lib/test/test_abc.py b/Lib/test/test_abc.py
index 6a8c3a13274..dbba37cdb6f 100644
--- a/Lib/test/test_abc.py
+++ b/Lib/test/test_abc.py
@@ -208,6 +208,7 @@ class C(A, B):
         C()
         self.assertEqual(B.counter, 1)
 
+    @test_support.requires_type_collecting
     def test_cache_leak(self):
         # See issue #2521.
         class A(object):
diff --git a/Lib/test/test_gc.py b/Lib/test/test_gc.py
index ed01c9802fc..7e47b2d3a27 100644
--- a/Lib/test/test_gc.py
+++ b/Lib/test/test_gc.py
@@ -1,5 +1,6 @@
 import unittest
-from test.test_support import verbose, run_unittest, start_threads
+from test.support import (verbose, run_unittest, start_threads,
+                          requires_type_collecting)
 import sys
 import time
 import gc
@@ -90,6 +91,7 @@ class A:
         del a
         self.assertNotEqual(gc.collect(), 0)
 
+    @requires_type_collecting
     def test_newinstance(self):
         class A(object):
             pass
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
index aae274384c7..988a72c1099 100644
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -493,6 +493,7 @@ def check_leak(self, code, what):
             self.assertIn(line2, reflog)
 
     @unittest.skipUnless(Py_DEBUG, 'need a debug build')
+    @support.requires_type_collecting
     def test_huntrleaks(self):
         # test --huntrleaks
         code = textwrap.dedent("""
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 5baaa352c0b..9342716272a 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -748,7 +748,10 @@ def delx(self): del self.__x
         # tupleiterator
         check(iter(()), size('lP'))
         # type
-        s = vsize('P2P15Pl4PP9PP11PI'   # PyTypeObject
+        fmt = 'P2P15Pl4PP9PP11PI'
+        if hasattr(sys, 'getcounts'):
+            fmt += '3P2P'
+        s = vsize(fmt +                 # PyTypeObject
                   '39P'                 # PyNumberMethods
                   '3P'                  # PyMappingMethods
                   '10P'                 # PySequenceMethods
diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
index 415d5ebbd72..418481dadd8 100644
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -601,6 +601,7 @@ class D:
         del c1, c2, C, D
         gc.collect()
 
+    @test_support.requires_type_collecting
     def test_callback_in_cycle_resurrection(self):
         import gc
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-09-11-03-13.bpo-31692.5-bpdk.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-09-11-03-13.bpo-31692.5-bpdk.rst
new file mode 100644
index 00000000000..f32548c67bd
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-09-11-03-13.bpo-31692.5-bpdk.rst	
@@ -0,0 +1,4 @@
+Add a new PYTHONSHOWALLOCCOUNT environment variable. When Python is compiled
+with COUNT_ALLOCS, PYTHONSHOWALLOCCOUNT now has to be set to dump allocation
+counts into stderr on shutdown. Moreover, allocations statistics are now dumped
+into stderr rather than stdout.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 677f6e48111..44fe13d2f7d 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -488,7 +488,9 @@ Py_Finalize(void)
 
     /* Debugging stuff */
 #ifdef COUNT_ALLOCS
-    dump_counts(stdout);
+    if (Py_GETENV("PYTHONSHOWALLOCCOUNT")) {
+        dump_counts(stderr);
+    }
 #endif
 
     _PyDebug_PrintTotalRefs();


From webhook-mailer at python.org  Tue Oct 17 07:35:15 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 17 Oct 2017 11:35:15 -0000
Subject: [Python-checkins] bpo-30541: Add new method to seal mocks (GH61923)
Message-ID: <mailman.69.1508240116.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/552be9d7e64f91b8e4ba5b29cd5dcc442d56f92c
commit: 552be9d7e64f91b8e4ba5b29cd5dcc442d56f92c
branch: master
author: Mario Corchero <mariocj89 at gmail.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-10-17T04:35:11-07:00
summary:

bpo-30541: Add new method to seal mocks (GH61923)

The new method allows the developer to control when to stop the
feature of mocks that automagically creates new mocks when accessing
an attribute that was not declared before

Signed-off-by: Mario Corchero <mariocj89 at gmail.com>

files:
A Lib/unittest/test/testmock/testsealable.py
A Misc/NEWS.d/next/Library/2017-10-17-12-04-37.bpo-30541.q3BM6C.rst
M Doc/library/unittest.mock.rst
M Doc/whatsnew/3.7.rst
M Lib/unittest/mock.py

diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst
index 9e8bf11a92d..6fdfdc4fa1c 100644
--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -2365,3 +2365,23 @@ alternative object as the *autospec* argument:
    a mocked class to create a mock instance *does not* create a real instance.
    It is only attribute lookups - along with calls to :func:`dir` - that are done.
 
+Sealing mocks
+~~~~~~~~~~~~~
+
+.. function:: seal(mock)
+
+    Seal will disable the creation of mock children by preventing to get or set
+    any new attribute on the sealed mock. The sealing process is performed recursively.
+
+    If a mock instance is assigned to an attribute instead of being dynamically created
+    it wont be considered in the sealing chain. This allows to prevent seal from fixing
+    part of the mock object.
+
+        >>> mock = Mock()
+        >>> mock.submock.attribute1 = 2
+        >>> mock.not_submock = mock.Mock()
+        >>> seal(mock)
+        >>> mock.submock.attribute2  # This will raise AttributeError.
+        >>> mock.not_submock.attribute2  # This won't raise.
+
+    .. versionadded:: 3.7
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index a0c20a0ad88..11b99e2d1c4 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -304,6 +304,11 @@ The :const:`~unittest.mock.sentinel` attributes now preserve their identity
 when they are :mod:`copied <copy>` or :mod:`pickled <pickle>`. (Contributed by
 Serhiy Storchaka in :issue:`20804`.)
 
+New function :const:`~unittest.mock.seal` will disable the creation of mock
+children by preventing to get or set any new attribute on the sealed mock.
+The sealing process is performed recursively. (Contributed by Mario Corchero
+in :issue:`30541`.)
+
 xmlrpc.server
 -------------
 
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index 94e34423487..9302dedae7f 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -18,6 +18,7 @@
     'NonCallableMagicMock',
     'mock_open',
     'PropertyMock',
+    'seal',
 )
 
 
@@ -382,6 +383,7 @@ def __init__(
         __dict__['_mock_name'] = name
         __dict__['_mock_new_name'] = _new_name
         __dict__['_mock_new_parent'] = _new_parent
+        __dict__['_mock_sealed'] = False
 
         if spec_set is not None:
             spec = spec_set
@@ -608,7 +610,7 @@ def __getattr__(self, name):
         return result
 
 
-    def __repr__(self):
+    def _extract_mock_name(self):
         _name_list = [self._mock_new_name]
         _parent = self._mock_new_parent
         last = self
@@ -638,7 +640,10 @@ def __repr__(self):
             if _name_list[1] not in ('()', '().'):
                 _first += '.'
         _name_list[0] = _first
-        name = ''.join(_name_list)
+        return ''.join(_name_list)
+
+    def __repr__(self):
+        name = self._extract_mock_name()
 
         name_string = ''
         if name not in ('mock', 'mock.'):
@@ -705,6 +710,11 @@ def __setattr__(self, name, value):
         else:
             if _check_and_set_parent(self, value, name, name):
                 self._mock_children[name] = value
+
+        if self._mock_sealed and not hasattr(self, name):
+            mock_name = f'{self._extract_mock_name()}.{name}'
+            raise AttributeError(f'Cannot set {mock_name}')
+
         return object.__setattr__(self, name, value)
 
 
@@ -888,6 +898,12 @@ def _get_child_mock(self, **kw):
                 klass = Mock
         else:
             klass = _type.__mro__[1]
+
+        if self._mock_sealed:
+            attribute = "." + kw["name"] if "name" in kw else "()"
+            mock_name = self._extract_mock_name() + attribute
+            raise AttributeError(mock_name)
+
         return klass(**kw)
 
 
@@ -2401,3 +2417,26 @@ def __get__(self, obj, obj_type):
         return self()
     def __set__(self, obj, val):
         self(val)
+
+
+def seal(mock):
+    """Disable the automatic generation of "submocks"
+
+    Given an input Mock, seals it to ensure no further mocks will be generated
+    when accessing an attribute that was not already defined.
+
+    Submocks are defined as all mocks which were created DIRECTLY from the
+    parent. If a mock is assigned to an attribute of an existing mock,
+    it is not considered a submock.
+
+    """
+    mock._mock_sealed = True
+    for attr in dir(mock):
+        try:
+            m = getattr(mock, attr)
+        except AttributeError:
+            continue
+        if not isinstance(m, NonCallableMock):
+            continue
+        if m._mock_new_parent is mock:
+            seal(m)
diff --git a/Lib/unittest/test/testmock/testsealable.py b/Lib/unittest/test/testmock/testsealable.py
new file mode 100644
index 00000000000..0e72b32411c
--- /dev/null
+++ b/Lib/unittest/test/testmock/testsealable.py
@@ -0,0 +1,181 @@
+import unittest
+from unittest import mock
+
+
+class SampleObject:
+    def __init__(self):
+        self.attr_sample1 = 1
+        self.attr_sample2 = 1
+
+    def method_sample1(self):
+        pass
+
+    def method_sample2(self):
+        pass
+
+
+class TestSealable(unittest.TestCase):
+
+    def test_attributes_return_more_mocks_by_default(self):
+        m = mock.Mock()
+
+        self.assertIsInstance(m.test, mock.Mock)
+        self.assertIsInstance(m.test(), mock.Mock)
+        self.assertIsInstance(m.test().test2(), mock.Mock)
+
+    def test_new_attributes_cannot_be_accessed_on_seal(self):
+        m = mock.Mock()
+
+        mock.seal(m)
+        with self.assertRaises(AttributeError):
+            m.test
+        with self.assertRaises(AttributeError):
+            m()
+
+    def test_new_attributes_cannot_be_set_on_seal(self):
+        m = mock.Mock()
+
+        mock.seal(m)
+        with self.assertRaises(AttributeError):
+            m.test = 1
+
+    def test_existing_attributes_can_be_set_on_seal(self):
+        m = mock.Mock()
+        m.test.test2 = 1
+
+        mock.seal(m)
+        m.test.test2 = 2
+        self.assertEqual(m.test.test2, 2)
+
+    def test_new_attributes_cannot_be_set_on_child_of_seal(self):
+        m = mock.Mock()
+        m.test.test2 = 1
+
+        mock.seal(m)
+        with self.assertRaises(AttributeError):
+            m.test.test3 = 1
+
+    def test_existing_attributes_allowed_after_seal(self):
+        m = mock.Mock()
+
+        m.test.return_value = 3
+
+        mock.seal(m)
+        self.assertEqual(m.test(), 3)
+
+    def test_initialized_attributes_allowed_after_seal(self):
+        m = mock.Mock(test_value=1)
+
+        mock.seal(m)
+        self.assertEqual(m.test_value, 1)
+
+    def test_call_on_sealed_mock_fails(self):
+        m = mock.Mock()
+
+        mock.seal(m)
+        with self.assertRaises(AttributeError):
+            m()
+
+    def test_call_on_defined_sealed_mock_succeeds(self):
+        m = mock.Mock(return_value=5)
+
+        mock.seal(m)
+        self.assertEqual(m(), 5)
+
+    def test_seals_recurse_on_added_attributes(self):
+        m = mock.Mock()
+
+        m.test1.test2().test3 = 4
+
+        mock.seal(m)
+        self.assertEqual(m.test1.test2().test3, 4)
+        with self.assertRaises(AttributeError):
+            m.test1.test2().test4
+        with self.assertRaises(AttributeError):
+            m.test1.test3
+
+    def test_seals_recurse_on_magic_methods(self):
+        m = mock.MagicMock()
+
+        m.test1.test2["a"].test3 = 4
+        m.test1.test3[2:5].test3 = 4
+
+        mock.seal(m)
+        self.assertEqual(m.test1.test2["a"].test3, 4)
+        self.assertEqual(m.test1.test2[2:5].test3, 4)
+        with self.assertRaises(AttributeError):
+            m.test1.test2["a"].test4
+        with self.assertRaises(AttributeError):
+            m.test1.test3[2:5].test4
+
+    def test_seals_dont_recurse_on_manual_attributes(self):
+        m = mock.Mock(name="root_mock")
+
+        m.test1.test2 = mock.Mock(name="not_sealed")
+        m.test1.test2.test3 = 4
+
+        mock.seal(m)
+        self.assertEqual(m.test1.test2.test3, 4)
+        m.test1.test2.test4  # Does not raise
+        m.test1.test2.test4 = 1  # Does not raise
+
+    def test_integration_with_spec_att_definition(self):
+        """You are not restricted when using mock with spec"""
+        m = mock.Mock(SampleObject)
+
+        m.attr_sample1 = 1
+        m.attr_sample3 = 3
+
+        mock.seal(m)
+        self.assertEqual(m.attr_sample1, 1)
+        self.assertEqual(m.attr_sample3, 3)
+        with self.assertRaises(AttributeError):
+            m.attr_sample2
+
+    def test_integration_with_spec_method_definition(self):
+        """You need to defin the methods, even if they are in the spec"""
+        m = mock.Mock(SampleObject)
+
+        m.method_sample1.return_value = 1
+
+        mock.seal(m)
+        self.assertEqual(m.method_sample1(), 1)
+        with self.assertRaises(AttributeError):
+            m.method_sample2()
+
+    def test_integration_with_spec_method_definition_respects_spec(self):
+        """You cannot define methods out of the spec"""
+        m = mock.Mock(SampleObject)
+
+        with self.assertRaises(AttributeError):
+            m.method_sample3.return_value = 3
+
+    def test_sealed_exception_has_attribute_name(self):
+        m = mock.Mock()
+
+        mock.seal(m)
+        with self.assertRaises(AttributeError) as cm:
+            m.SECRETE_name
+        self.assertIn("SECRETE_name", str(cm.exception))
+
+    def test_attribute_chain_is_maintained(self):
+        m = mock.Mock(name="mock_name")
+        m.test1.test2.test3.test4
+
+        mock.seal(m)
+        with self.assertRaises(AttributeError) as cm:
+            m.test1.test2.test3.test4.boom
+        self.assertIn("mock_name.test1.test2.test3.test4.boom", str(cm.exception))
+
+    def test_call_chain_is_maintained(self):
+        m = mock.Mock()
+        m.test1().test2.test3().test4
+
+        mock.seal(m)
+        with self.assertRaises(AttributeError) as cm:
+            m.test1().test2.test3().test4()
+        self.assertIn("mock.test1().test2.test3().test4", str(cm.exception))
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/Misc/NEWS.d/next/Library/2017-10-17-12-04-37.bpo-30541.q3BM6C.rst b/Misc/NEWS.d/next/Library/2017-10-17-12-04-37.bpo-30541.q3BM6C.rst
new file mode 100644
index 00000000000..7eb5e16faa0
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-17-12-04-37.bpo-30541.q3BM6C.rst
@@ -0,0 +1,2 @@
+Add new function to seal a mock and prevent the automatically creation of
+child mocks. Patch by Mario Corchero.


From webhook-mailer at python.org  Tue Oct 17 10:40:17 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 17 Oct 2017 14:40:17 -0000
Subject: [Python-checkins] bpo-31786: Make functions in the select module
 blocking when timeout is a small negative value. (#4003)
Message-ID: <mailman.70.1508251220.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/2c15b29aea5d6b9c61aa42d2c24a07ff1edb4b46
commit: 2c15b29aea5d6b9c61aa42d2c24a07ff1edb4b46
branch: master
author: Pablo Galindo <Pablogsal at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-17T17:14:41+03:00
summary:

bpo-31786: Make functions in the select module blocking when timeout is a small negative value. (#4003)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-15-23-44-57.bpo-31786.XwdEP4.rst
M Include/pytime.h
M Lib/test/test_poll.py
M Lib/test/test_time.py
M Modules/_testcapimodule.c
M Modules/selectmodule.c
M Python/pytime.c

diff --git a/Include/pytime.h b/Include/pytime.h
index 488fdc439b9..9ec9b03f19e 100644
--- a/Include/pytime.h
+++ b/Include/pytime.h
@@ -29,9 +29,20 @@ typedef enum {
     _PyTime_ROUND_CEILING=1,
     /* Round to nearest with ties going to nearest even integer.
        For example, used to round from a Python float. */
-    _PyTime_ROUND_HALF_EVEN
+    _PyTime_ROUND_HALF_EVEN=2,
+    /* Round away from zero 
+       For example, used for timeout. _PyTime_ROUND_CEILING rounds
+       -1e-9 to 0 milliseconds which causes bpo-31786 issue.
+       _PyTime_ROUND_UP rounds -1e-9 to -1 millisecond which keeps
+       the timeout sign as expected. select.poll(timeout) must block
+       for negative values." */
+    _PyTime_ROUND_UP=3,
+    /* _PyTime_ROUND_TIMEOUT (an alias for _PyTime_ROUND_UP) should be 
+       used for timeouts. */
+    _PyTime_ROUND_TIMEOUT = _PyTime_ROUND_UP
 } _PyTime_round_t;
 
+
 /* Convert a time_t to a PyLong. */
 PyAPI_FUNC(PyObject *) _PyLong_FromTime_t(
     time_t sec);
diff --git a/Lib/test/test_poll.py b/Lib/test/test_poll.py
index 16c2d2e123b..028dd2d08a3 100644
--- a/Lib/test/test_poll.py
+++ b/Lib/test/test_poll.py
@@ -204,6 +204,28 @@ def test_threaded_poll(self):
             os.write(w, b'spam')
             t.join()
 
+    @unittest.skipUnless(threading, 'Threading required for this test.')
+    @reap_threads
+    def test_poll_blocks_with_negative_ms(self):
+        for timeout_ms in [None, -1, -1.0, -0.1, -1e-100]:
+            # Create two file descriptors. This will be used to unlock
+            # the blocking call to poll.poll inside the thread
+            r, w = os.pipe()
+            pollster = select.poll()
+            pollster.register(r, select.POLLIN)
+
+            poll_thread = threading.Thread(target=pollster.poll, args=(timeout_ms,))
+            poll_thread.start()
+            poll_thread.join(timeout=0.1)
+            self.assertTrue(poll_thread.is_alive())
+
+            # Write to the pipe so pollster.poll unblocks and the thread ends.
+            os.write(w, b'spam')
+            poll_thread.join()
+            self.assertFalse(poll_thread.is_alive())
+            os.close(r)
+            os.close(w)
+
 
 def test_main():
     run_unittest(PollTests)
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index c92e66bf49a..61dda09c184 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -33,6 +33,8 @@ class _PyTime(enum.IntEnum):
     ROUND_CEILING = 1
     # Round to nearest with ties going to nearest even integer
     ROUND_HALF_EVEN = 2
+    # Round away from zero
+    ROUND_UP = 3
 
 # Rounding modes supported by PyTime
 ROUNDING_MODES = (
@@ -40,6 +42,7 @@ class _PyTime(enum.IntEnum):
     (_PyTime.ROUND_FLOOR, decimal.ROUND_FLOOR),
     (_PyTime.ROUND_CEILING, decimal.ROUND_CEILING),
     (_PyTime.ROUND_HALF_EVEN, decimal.ROUND_HALF_EVEN),
+    (_PyTime.ROUND_UP, decimal.ROUND_UP),
 )
 
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-15-23-44-57.bpo-31786.XwdEP4.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-15-23-44-57.bpo-31786.XwdEP4.rst
new file mode 100644
index 00000000000..f0326e30ecd
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-15-23-44-57.bpo-31786.XwdEP4.rst	
@@ -0,0 +1,3 @@
+Fix timeout rounding in the select module to round correctly negative timeouts between -1.0 and 0.0.
+The functions now block waiting for events as expected. Previously, the call was incorrectly non-blocking.
+Patch by Pablo Galindo.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 6e31105712f..0e1e772b5c1 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -3012,7 +3012,8 @@ check_time_rounding(int round)
 {
     if (round != _PyTime_ROUND_FLOOR
         && round != _PyTime_ROUND_CEILING
-        && round != _PyTime_ROUND_HALF_EVEN) {
+        && round != _PyTime_ROUND_HALF_EVEN
+        && round != _PyTime_ROUND_UP) {
         PyErr_SetString(PyExc_ValueError, "invalid rounding");
         return -1;
     }
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 66d1a37fb4a..530552324be 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -213,7 +213,7 @@ select_select(PyObject *self, PyObject *args)
         tvp = (struct timeval *)NULL;
     else {
         if (_PyTime_FromSecondsObject(&timeout, timeout_obj,
-                                      _PyTime_ROUND_CEILING) < 0) {
+                                      _PyTime_ROUND_TIMEOUT) < 0) {
             if (PyErr_ExceptionMatches(PyExc_TypeError)) {
                 PyErr_SetString(PyExc_TypeError,
                                 "timeout must be a float or None");
@@ -221,7 +221,7 @@ select_select(PyObject *self, PyObject *args)
             return NULL;
         }
 
-        if (_PyTime_AsTimeval(timeout, &tv, _PyTime_ROUND_CEILING) == -1)
+        if (_PyTime_AsTimeval(timeout, &tv, _PyTime_ROUND_TIMEOUT) == -1)
             return NULL;
         if (tv.tv_sec < 0) {
             PyErr_SetString(PyExc_ValueError, "timeout must be non-negative");
@@ -540,7 +540,7 @@ poll_poll(pollObject *self, PyObject *args)
     }
     else {
         if (_PyTime_FromMillisecondsObject(&timeout, timeout_obj,
-                                           _PyTime_ROUND_CEILING) < 0) {
+                                           _PyTime_ROUND_TIMEOUT) < 0) {
             if (PyErr_ExceptionMatches(PyExc_TypeError)) {
                 PyErr_SetString(PyExc_TypeError,
                                 "timeout must be an integer or None");
@@ -548,7 +548,7 @@ poll_poll(pollObject *self, PyObject *args)
             return NULL;
         }
 
-        ms = _PyTime_AsMilliseconds(timeout, _PyTime_ROUND_CEILING);
+        ms = _PyTime_AsMilliseconds(timeout, _PyTime_ROUND_TIMEOUT);
         if (ms < INT_MIN || ms > INT_MAX) {
             PyErr_SetString(PyExc_OverflowError, "timeout is too large");
             return NULL;
@@ -896,7 +896,7 @@ devpoll_poll(devpollObject *self, PyObject *args)
     }
     else {
         if (_PyTime_FromMillisecondsObject(&timeout, timeout_obj,
-                                           _PyTime_ROUND_CEILING) < 0) {
+                                           _PyTime_ROUND_TIMEOUT) < 0) {
             if (PyErr_ExceptionMatches(PyExc_TypeError)) {
                 PyErr_SetString(PyExc_TypeError,
                                 "timeout must be an integer or None");
@@ -904,7 +904,7 @@ devpoll_poll(devpollObject *self, PyObject *args)
             return NULL;
         }
 
-        ms = _PyTime_AsMilliseconds(timeout, _PyTime_ROUND_CEILING);
+        ms = _PyTime_AsMilliseconds(timeout, _PyTime_ROUND_TIMEOUT);
         if (ms < -1 || ms > INT_MAX) {
             PyErr_SetString(PyExc_OverflowError, "timeout is too large");
             return NULL;
@@ -1513,7 +1513,7 @@ pyepoll_poll(pyEpoll_Object *self, PyObject *args, PyObject *kwds)
         /* epoll_wait() has a resolution of 1 millisecond, round towards
            infinity to wait at least timeout seconds. */
         if (_PyTime_FromSecondsObject(&timeout, timeout_obj,
-                                      _PyTime_ROUND_CEILING) < 0) {
+                                      _PyTime_ROUND_TIMEOUT) < 0) {
             if (PyErr_ExceptionMatches(PyExc_TypeError)) {
                 PyErr_SetString(PyExc_TypeError,
                                 "timeout must be an integer or None");
@@ -2128,7 +2128,7 @@ kqueue_queue_control(kqueue_queue_Object *self, PyObject *args)
     }
     else {
         if (_PyTime_FromSecondsObject(&timeout,
-                                      otimeout, _PyTime_ROUND_CEILING) < 0) {
+                                      otimeout, _PyTime_ROUND_TIMEOUT) < 0) {
             PyErr_Format(PyExc_TypeError,
                 "timeout argument must be a number "
                 "or None, got %.200s",
diff --git a/Python/pytime.c b/Python/pytime.c
index 7b55b10d108..f19bb3673e4 100644
--- a/Python/pytime.c
+++ b/Python/pytime.c
@@ -120,9 +120,13 @@ _PyTime_Round(double x, _PyTime_round_t round)
     else if (round == _PyTime_ROUND_CEILING) {
         d = ceil(d);
     }
-    else {
+    else if (round == _PyTime_ROUND_FLOOR) {
         d = floor(d);
     }
+    else {
+        assert(round == _PyTime_ROUND_UP);
+        d = (d >= 0.0) ? ceil(d) : floor(d);
+    }
     return d;
 }
 
@@ -427,7 +431,7 @@ _PyTime_Divide(const _PyTime_t t, const _PyTime_t k,
             return t / k;
         }
     }
-    else {
+    else if (round == _PyTime_ROUND_FLOOR){
         if (t >= 0) {
             return t / k;
         }
@@ -435,6 +439,15 @@ _PyTime_Divide(const _PyTime_t t, const _PyTime_t k,
             return (t - (k - 1)) / k;
         }
     }
+    else {
+        assert(round == _PyTime_ROUND_UP);
+        if (t >= 0) {
+            return (t + k - 1) / k;
+        }
+        else {
+            return (t - (k - 1)) / k;
+        }
+    }
 }
 
 _PyTime_t


From lp_benchmark_robot at intel.com  Tue Oct 17 14:46:39 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Tue, 17 Oct 2017 11:46:39 -0700
Subject: [Python-checkins] [2 up,
 63 flat] Results for Python (master branch) 2017-10-17
Message-ID: <0f29d16e-b9a4-45e0-95b7-303edb3416dc@orsmsx155.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-17 03:03:10-07:00.
  - commit:		2bd37c2
  - previous commit:	0df1905
  - revision date:	2017-10-17 02:10: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.000% |  -1.156%   |  +4.829%   |  +8.141%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 0.621% |  +1.433%   |  +20.283%  |  +13.062%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 1.217% |  +0.818%   |  +20.853%  |  +12.240%  |
+-----+------------------------+--------+------------+------------+------------+
| :-) |     call_method_unknown| 0.610% |  +3.085%   |  +20.818%  |  +10.887%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 1.952% |  -2.231%   |  +4.336%   |  +13.861%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.522% |  -1.404%   |  +10.240%  |  +9.603%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.587% |  -0.535%   |  +6.960%   |  +11.184%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.462% |  +0.436%   |  +4.390%   |  +4.549%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.891% |  -1.089%   |  +3.833%   |  +21.749%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 7.594% |  -4.775%   |  +6.119%   |  +16.641%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.354% |  -0.384%   |  +4.576%   |  +5.682%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.608% |  +0.561%   |  +7.205%   |  +2.575%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.782% |  +1.260%   |  +3.632%   |  +5.046%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.233% |  -1.790%   |  +8.374%   |  +12.842%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.910% |  -0.156%   |  +7.349%   |  +10.139%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.897% |  +0.113%   |  +6.042%   |  +11.092%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.956% |  -0.075%   |  +8.835%   |  +10.224%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 2.865% |  -0.117%   |  +8.925%   |  +9.444%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.617% |  -0.008%   |  +4.099%   |  +8.812%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 0.775% |  -3.136%   |  -1.908%   |  +14.708%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.621% |  +0.104%   |  +9.567%   |  +10.940%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.533% |  -0.492%   |  +46.030%  |  +11.435%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 2.008% |  +0.429%   |  +10.100%  |  +13.089%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.554% |  -0.867%   |  +17.548%  |  +13.233%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 1.065% |  +0.728%   |  +9.206%   |  +7.869%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.831% |  -1.018%   |  +2.306%   |  +5.702%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.579% |  -0.897%   |  -2.127%   |  +3.323%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.572% |  -0.652%   |  +1.918%   |  +6.733%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.567% |  -1.607%   |  +4.997%   |  +9.821%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.252% |  -0.293%   |  -0.244%   |  +21.062%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.592% |  -0.055%   |  +3.125%   |  +18.144%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 1.238% |  -1.076%   |  +4.647%   |  +15.499%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 6.059% |  -0.290%   |  +11.387%  |  +10.782%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.318% |  -0.156%   |  +0.218%   |  +10.508%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.131% |  -0.140%   |  +11.009%  |  +4.769%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.093% |  -0.206%   |  +2.329%   |  +5.002%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.610% |  -0.414%   |  +9.873%   |  +13.093%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.702% |  -1.132%   |  +3.715%   |  +11.940%  |
+-----+------------------------+--------+------------+------------+------------+
| :-) |               regex_dna| 1.384% |  +3.873%   |  +2.205%   |  +8.506%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.831% |  +0.748%   |  -1.621%   |  +3.310%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 3.763% |  -1.497%   |  +8.896%   |  +2.960%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.729% |  +1.401%   |  +8.147%   |  +14.515%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.436% |  -1.112%   |  +3.287%   |  -0.315%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.829% |  -0.878%   |  +26.984%  |  +7.990%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.140% |  +1.357%   |  +4.287%   |  +6.319%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.670% |  +0.759%   |  +14.768%  |  +8.686%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 0.638% |  -2.358%   |  +0.553%   |  -2.518%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 2.003% |  -1.273%   |  +6.165%   |  +0.504%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 0.902% |  -1.127%   |  +6.753%   |  +7.804%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.862% |  +0.543%   |  +6.511%   |  +4.976%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.719% |  +0.622%   |  +19.107%  |  +7.137%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.952% |  -2.107%   |  +9.797%   |  +10.869%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 2.037% |  -0.880%   |  +9.807%   |  +7.453%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.897% |  -2.349%   |  +8.992%   |  +12.141%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.954% |  -0.723%   |  +11.784%  |  +11.080%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 4.746% |  -1.878%   |  +22.173%  |  +10.641%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.154% |  -0.461%   |  +5.985%   |  +6.451%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 0.676% |  +0.807%   |  +2.550%   |  -0.322%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 4.236% |  +2.274%   |  +9.495%   |  +18.701%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.858% |  +1.163%   |  +0.969%   |  +17.394%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 1.038% |  +0.517%   |  +8.461%   |  +5.313%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.199% |  -0.465%   |  +5.663%   |  +6.909%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.865% |  +0.235%   |  +1.560%   |  +7.667%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 4.108% |  +0.626%   |  -8.971%   |  +13.376%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 2.262% |  -0.449%   |  +5.495%   |  +8.563%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/2-up-63-flat-results-for-python-master-branch-2017-10-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  Tue Oct 17 15:45:09 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 17 Oct 2017 19:45:09 -0000
Subject: [Python-checkins] bpo-31334: Fix timeout in select.poll.poll()
 (GH-3277)
Message-ID: <mailman.71.1508269512.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/6cfa927ceb931ad968b5b03e4a2bffb64a8a0604
commit: 6cfa927ceb931ad968b5b03e4a2bffb64a8a0604
branch: master
author: Riccardo Coccioli <volans- at users.noreply.github.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-10-17T12:45:07-07:00
summary:

bpo-31334: Fix timeout in select.poll.poll() (GH-3277)

Always pass -1, or INFTIM where defined, to the poll() system call when
a negative timeout is passed to the poll.poll([timeout]) method in the
select module. Various OSes throw an error with arbitrary negative
values.

files:
A Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst
M Lib/test/test_poll.py
M Misc/ACKS
M Modules/selectmodule.c

diff --git a/Lib/test/test_poll.py b/Lib/test/test_poll.py
index 028dd2d08a3..d593495a999 100644
--- a/Lib/test/test_poll.py
+++ b/Lib/test/test_poll.py
@@ -207,7 +207,7 @@ def test_threaded_poll(self):
     @unittest.skipUnless(threading, 'Threading required for this test.')
     @reap_threads
     def test_poll_blocks_with_negative_ms(self):
-        for timeout_ms in [None, -1, -1.0, -0.1, -1e-100]:
+        for timeout_ms in [None, -1000, -1, -1.0, -0.1, -1e-100]:
             # Create two file descriptors. This will be used to unlock
             # the blocking call to poll.poll inside the thread
             r, w = os.pipe()
diff --git a/Misc/ACKS b/Misc/ACKS
index 38f68aca214..8b9f62eaf7d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -292,6 +292,7 @@ Brad Clements
 Robbie Clemons
 Steve Clift
 Herv? Coatanhay
+Riccardo Coccioli
 Nick Coghlan
 Josh Cogliati
 Dave Cole
diff --git a/Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst b/Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst
new file mode 100644
index 00000000000..1cbfd2531bc
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst
@@ -0,0 +1,3 @@
+Fix ``poll.poll([timeout])`` in the ``select`` module for arbitrary negative
+timeouts on all OSes where it can only be a non-negative integer or -1.
+Patch by Riccardo Coccioli.
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 530552324be..0f353fbe841 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -525,20 +525,14 @@ poll_poll(pollObject *self, PyObject *args)
     PyObject *result_list = NULL, *timeout_obj = NULL;
     int poll_result, i, j;
     PyObject *value = NULL, *num = NULL;
-    _PyTime_t timeout, ms, deadline;
+    _PyTime_t timeout = -1, ms = -1, deadline = 0;
     int async_err = 0;
 
     if (!PyArg_ParseTuple(args, "|O:poll", &timeout_obj)) {
         return NULL;
     }
 
-    /* Check values for timeout */
-    if (timeout_obj == NULL || timeout_obj == Py_None) {
-        timeout = -1;
-        ms = -1;
-        deadline = 0;   /* initialize to prevent gcc warning */
-    }
-    else {
+    if (timeout_obj != NULL && timeout_obj != Py_None) {
         if (_PyTime_FromMillisecondsObject(&timeout, timeout_obj,
                                            _PyTime_ROUND_TIMEOUT) < 0) {
             if (PyErr_ExceptionMatches(PyExc_TypeError)) {
@@ -554,7 +548,20 @@ poll_poll(pollObject *self, PyObject *args)
             return NULL;
         }
 
-        deadline = _PyTime_GetMonotonicClock() + timeout;
+        if (timeout >= 0) {
+            deadline = _PyTime_GetMonotonicClock() + timeout;
+        }
+    }
+
+    /* On some OSes, typically BSD-based ones, the timeout parameter of the
+       poll() syscall, when negative, must be exactly INFTIM, where defined,
+       or -1. See issue 31334. */
+    if (ms < 0) {
+#ifdef INFTIM
+        ms = INFTIM;
+#else
+        ms = -1;
+#endif
     }
 
     /* Avoid concurrent poll() invocation, issue 8865 */


From webhook-mailer at python.org  Tue Oct 17 15:52:41 2017
From: webhook-mailer at python.org (Barry Warsaw)
Date: Tue, 17 Oct 2017 19:52:41 -0000
Subject: [Python-checkins] bpo-31799: Make module.__spec__ more discoverable
 (#4010)
Message-ID: <mailman.72.1508269963.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/191e3138200906e43cba9347177914325b54843f
commit: 191e3138200906e43cba9347177914325b54843f
branch: master
author: Barry Warsaw <barry at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-17T15:52:38-04:00
summary:

bpo-31799: Make module.__spec__ more discoverable (#4010)

bpo-31799: Make module.__spec__ more discoverable

files:
M Doc/library/importlib.rst
M Doc/reference/import.rst

diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index 3a72648cbec..3d350e8d0d5 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -1048,7 +1048,15 @@ find and load modules.
 
 .. class:: ModuleSpec(name, loader, *, origin=None, loader_state=None, is_package=None)
 
-   A specification for a module's import-system-related state.
+   A specification for a module's import-system-related state.  This is
+   typically exposed as the module's ``__spec__`` attribute.  In the
+   descriptions below, the names in parentheses give the corresponding
+   attribute available directly on the module object.
+   E.g. ``module.__spec__.origin == module.__file__``.  Note however that
+   while the *values* are usually equivalent, they can differ since there is
+   no synchronization between the two objects.  Thus it is possible to update
+   the module's ``__path__`` at runtime, and this will not be automatically
+   reflected in ``__spec__.submodule_search_locations``.
 
    .. versionadded:: 3.4
 
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
index 8cf16cad4c9..7fbf8ed9d78 100644
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -519,8 +519,9 @@ and the loader that executes it.  Most importantly, it allows the
 import machinery to perform the boilerplate operations of loading,
 whereas without a module spec the loader had that responsibility.
 
-See :class:`~importlib.machinery.ModuleSpec` for more specifics on what
-information a module's spec may hold.
+The module's spec is exposed as the ``__spec__`` attribute on a module object.
+See :class:`~importlib.machinery.ModuleSpec` for details on the contents of
+the module spec.
 
 .. versionadded:: 3.4
 


From webhook-mailer at python.org  Tue Oct 17 15:59:24 2017
From: webhook-mailer at python.org (Barry Warsaw)
Date: Tue, 17 Oct 2017 19:59:24 -0000
Subject: [Python-checkins] [3.6] bpo-31799: Make module.__spec__ more
 discoverable (GH-4010) (#4021)
Message-ID: <mailman.73.1508270366.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/858ea4354fafa36e57859d2dfd70f8a057984075
commit: 858ea4354fafa36e57859d2dfd70f8a057984075
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Barry Warsaw <barry at python.org>
date: 2017-10-17T15:59:21-04:00
summary:

[3.6] bpo-31799: Make module.__spec__ more discoverable (GH-4010) (#4021)

bpo-31799: Make module.__spec__ more discoverable
(cherry picked from commit 191e3138200906e43cba9347177914325b54843f)

files:
M Doc/library/importlib.rst
M Doc/reference/import.rst

diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index 6406e306c49..d194362fb00 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -1045,7 +1045,15 @@ find and load modules.
 
 .. class:: ModuleSpec(name, loader, *, origin=None, loader_state=None, is_package=None)
 
-   A specification for a module's import-system-related state.
+   A specification for a module's import-system-related state.  This is
+   typically exposed as the module's ``__spec__`` attribute.  In the
+   descriptions below, the names in parentheses give the corresponding
+   attribute available directly on the module object.
+   E.g. ``module.__spec__.origin == module.__file__``.  Note however that
+   while the *values* are usually equivalent, they can differ since there is
+   no synchronization between the two objects.  Thus it is possible to update
+   the module's ``__path__`` at runtime, and this will not be automatically
+   reflected in ``__spec__.submodule_search_locations``.
 
    .. versionadded:: 3.4
 
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
index 8cf16cad4c9..7fbf8ed9d78 100644
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -519,8 +519,9 @@ and the loader that executes it.  Most importantly, it allows the
 import machinery to perform the boilerplate operations of loading,
 whereas without a module spec the loader had that responsibility.
 
-See :class:`~importlib.machinery.ModuleSpec` for more specifics on what
-information a module's spec may hold.
+The module's spec is exposed as the ``__spec__`` attribute on a module object.
+See :class:`~importlib.machinery.ModuleSpec` for details on the contents of
+the module spec.
 
 .. versionadded:: 3.4
 


From webhook-mailer at python.org  Tue Oct 17 16:13:16 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 17 Oct 2017 20:13:16 -0000
Subject: [Python-checkins] [2.7] bpo-31733,
 bpo-31692: Document 2 new env vars in What's New in Python 2.7
 (GH-4019)
Message-ID: <mailman.74.1508271201.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/355393e7438deeab4aeec3fcffea65e8cada083b
commit: 355393e7438deeab4aeec3fcffea65e8cada083b
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-17T13:13:13-07:00
summary:

[2.7] bpo-31733, bpo-31692: Document 2 new env vars in What's New in Python 2.7 (GH-4019)

bpo-31733, bpo-31692: Document the new PYTHONSHOWREFCOUNT and
PYTHONSHOWALLOCCOUNT environment variables.

files:
M Doc/whatsnew/2.7.rst

diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index 28a8d4be47b..1857aa4e8f3 100644
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -2540,6 +2540,21 @@ exemption allowing new ``-3`` warnings to be added in any Python 2.7
 maintenance release.
 
 
+Two new environment variables for debug mode
+--------------------------------------------
+
+In debug mode, the ``[xxx refs]`` statistic is not written by default, the
+:envvar:`PYTHONSHOWREFCOUNT` environment variable now must also be set.
+(Contributed by Victor Stinner; :issue:`31733`.)
+
+When Python is compiled with ``COUNT_ALLOC`` defined, allocation counts are no
+longer dumped by default anymore: the :envvar:`PYTHONSHOWALLOCCOUNT` environment
+variable must now also be set. Moreover, allocation counts are now dumped into
+stderr, rather than stdout. (Contributed by Victor Stinner; :issue:`31692`.)
+
+.. versionadded:: 2.7.15
+
+
 PEP 434: IDLE Enhancement Exception for All Branches
 ----------------------------------------------------
 


From webhook-mailer at python.org  Tue Oct 17 17:29:42 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 17 Oct 2017 21:29:42 -0000
Subject: [Python-checkins] bpo-28603: Fix formatting tracebacks for
 unhashable exceptions (#4014)
Message-ID: <mailman.75.1508275784.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/de86073a761cd3539aaca6f886a1f55effc0d9da
commit: de86073a761cd3539aaca6f886a1f55effc0d9da
branch: master
author: Zane Bitter <zbitter at redhat.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-18T00:29:39+03:00
summary:

bpo-28603: Fix formatting tracebacks for unhashable exceptions (#4014)

files:
A Lib/idlelib/idle_test/test_run.py
A Misc/NEWS.d/next/Core and Builtins/2017-10-17-13-29-19.bpo-28603._-oia3.rst
A Misc/NEWS.d/next/IDLE/2017-10-17-13-26-13.bpo-28603.TMEQfp.rst
A Misc/NEWS.d/next/Library/2017-10-17-12-29-18.bpo-28603.tGuX2C.rst
M Lib/idlelib/run.py
M Lib/test/test_traceback.py
M Lib/traceback.py
M Misc/ACKS
M Python/pythonrun.c

diff --git a/Lib/idlelib/idle_test/test_run.py b/Lib/idlelib/idle_test/test_run.py
new file mode 100644
index 00000000000..d7e627d23d3
--- /dev/null
+++ b/Lib/idlelib/idle_test/test_run.py
@@ -0,0 +1,35 @@
+import unittest
+from unittest import mock
+
+from test.support import captured_stderr
+import idlelib.run as idlerun
+
+
+class RunTest(unittest.TestCase):
+    def test_print_exception_unhashable(self):
+        class UnhashableException(Exception):
+            def __eq__(self, other):
+                return True
+
+        ex1 = UnhashableException('ex1')
+        ex2 = UnhashableException('ex2')
+        try:
+            raise ex2 from ex1
+        except UnhashableException:
+            try:
+                raise ex1
+            except UnhashableException:
+                with captured_stderr() as output:
+                    with mock.patch.object(idlerun,
+                                           'cleanup_traceback') as ct:
+                        ct.side_effect = lambda t, e: t
+                        idlerun.print_exception()
+
+        tb = output.getvalue().strip().splitlines()
+        self.assertEqual(11, len(tb))
+        self.assertIn('UnhashableException: ex2', tb[3])
+        self.assertIn('UnhashableException: ex1', tb[10])
+
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index 39e0c116f9b..6440e673bf5 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -203,16 +203,16 @@ def print_exception():
     seen = set()
 
     def print_exc(typ, exc, tb):
-        seen.add(exc)
+        seen.add(id(exc))
         context = exc.__context__
         cause = exc.__cause__
-        if cause is not None and cause not in seen:
+        if cause is not None and id(cause) not in seen:
             print_exc(type(cause), cause, cause.__traceback__)
             print("\nThe above exception was the direct cause "
                   "of the following exception:\n", file=efile)
         elif (context is not None and
               not exc.__suppress_context__ and
-              context not in seen):
+              id(context) not in seen):
             print_exc(type(context), context, context.__traceback__)
             print("\nDuring handling of the above exception, "
                   "another exception occurred:\n", file=efile)
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index e4833535890..bffc03e663f 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -443,6 +443,33 @@ def fmt():
             '    return traceback.format_stack()\n' % (__file__, lineno+1),
         ])
 
+    @cpython_only
+    def test_unhashable(self):
+        from _testcapi import exception_print
+
+        class UnhashableException(Exception):
+            def __eq__(self, other):
+                return True
+
+        ex1 = UnhashableException('ex1')
+        ex2 = UnhashableException('ex2')
+        try:
+            raise ex2 from ex1
+        except UnhashableException:
+            try:
+                raise ex1
+            except UnhashableException:
+                exc_type, exc_val, exc_tb = sys.exc_info()
+
+        with captured_output("stderr") as stderr_f:
+            exception_print(exc_val)
+
+        tb = stderr_f.getvalue().strip().splitlines()
+        self.assertEqual(11, len(tb))
+        self.assertEqual(context_message.strip(), tb[5])
+        self.assertIn('UnhashableException: ex2', tb[3])
+        self.assertIn('UnhashableException: ex1', tb[10])
+
 
 cause_message = (
     "\nThe above exception was the direct cause "
@@ -994,6 +1021,25 @@ def test_context(self):
         self.assertEqual(exc_info[0], exc.exc_type)
         self.assertEqual(str(exc_info[1]), str(exc))
 
+    def test_unhashable(self):
+        class UnhashableException(Exception):
+            def __eq__(self, other):
+                return True
+
+        ex1 = UnhashableException('ex1')
+        ex2 = UnhashableException('ex2')
+        try:
+            raise ex2 from ex1
+        except UnhashableException:
+            try:
+                raise ex1
+            except UnhashableException:
+                exc_info = sys.exc_info()
+        exc = traceback.TracebackException(*exc_info)
+        formatted = list(exc.format())
+        self.assertIn('UnhashableException: ex2\n', formatted[2])
+        self.assertIn('UnhashableException: ex1\n', formatted[6])
+
     def test_limit(self):
         def recurse(n):
             if n:
diff --git a/Lib/traceback.py b/Lib/traceback.py
index fb3bce12a13..ee8c7391403 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -458,11 +458,11 @@ def __init__(self, exc_type, exc_value, exc_traceback, *, limit=None,
         # Handle loops in __cause__ or __context__.
         if _seen is None:
             _seen = set()
-        _seen.add(exc_value)
+        _seen.add(id(exc_value))
         # Gracefully handle (the way Python 2.4 and earlier did) the case of
         # being called with no type or value (None, None, None).
         if (exc_value and exc_value.__cause__ is not None
-            and exc_value.__cause__ not in _seen):
+            and id(exc_value.__cause__) not in _seen):
             cause = TracebackException(
                 type(exc_value.__cause__),
                 exc_value.__cause__,
@@ -474,7 +474,7 @@ def __init__(self, exc_type, exc_value, exc_traceback, *, limit=None,
         else:
             cause = None
         if (exc_value and exc_value.__context__ is not None
-            and exc_value.__context__ not in _seen):
+            and id(exc_value.__context__) not in _seen):
             context = TracebackException(
                 type(exc_value.__context__),
                 exc_value.__context__,
diff --git a/Misc/ACKS b/Misc/ACKS
index 8b9f62eaf7d..f1130dcd6a4 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -147,6 +147,7 @@ Dominic Binks
 Philippe Biondi
 Michael Birtwell
 Stuart Bishop
+Zane Bitter
 Roy Bixler
 Daniel Black
 Jonathan Black
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-17-13-29-19.bpo-28603._-oia3.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-17-13-29-19.bpo-28603._-oia3.rst
new file mode 100644
index 00000000000..a3542accd5f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-17-13-29-19.bpo-28603._-oia3.rst	
@@ -0,0 +1,3 @@
+Print the full context/cause chain of exceptions on interpreter exit, even
+if an exception in the chain is unhashable or compares equal to later ones.
+Patch by Zane Bitter.
diff --git a/Misc/NEWS.d/next/IDLE/2017-10-17-13-26-13.bpo-28603.TMEQfp.rst b/Misc/NEWS.d/next/IDLE/2017-10-17-13-26-13.bpo-28603.TMEQfp.rst
new file mode 100644
index 00000000000..e69f7f67219
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-10-17-13-26-13.bpo-28603.TMEQfp.rst
@@ -0,0 +1,2 @@
+Fix a TypeError that caused a shell restart when printing a traceback that
+includes an exception that is unhashable. Patch by Zane Bitter.
diff --git a/Misc/NEWS.d/next/Library/2017-10-17-12-29-18.bpo-28603.tGuX2C.rst b/Misc/NEWS.d/next/Library/2017-10-17-12-29-18.bpo-28603.tGuX2C.rst
new file mode 100644
index 00000000000..1a5fb0aa67b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-17-12-29-18.bpo-28603.tGuX2C.rst
@@ -0,0 +1,3 @@
+traceback: Fix a TypeError that occurred during printing of exception
+tracebacks when either the current exception or an exception in its
+context/cause chain is unhashable. Patch by Zane Bitter.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index df814fbed97..25e2da44d95 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -817,13 +817,21 @@ print_exception_recursive(PyObject *f, PyObject *value, PyObject *seen)
 
     if (seen != NULL) {
         /* Exception chaining */
-        if (PySet_Add(seen, value) == -1)
+        PyObject *value_id = PyLong_FromVoidPtr(value);
+        if (value_id == NULL || PySet_Add(seen, value_id) == -1)
             PyErr_Clear();
         else if (PyExceptionInstance_Check(value)) {
+            PyObject *check_id = NULL;
             cause = PyException_GetCause(value);
             context = PyException_GetContext(value);
             if (cause) {
-                res = PySet_Contains(seen, cause);
+                check_id = PyLong_FromVoidPtr(cause);
+                if (check_id == NULL) {
+                    res = -1;
+                } else {
+                    res = PySet_Contains(seen, check_id);
+                    Py_DECREF(check_id);
+                }
                 if (res == -1)
                     PyErr_Clear();
                 if (res == 0) {
@@ -835,7 +843,13 @@ print_exception_recursive(PyObject *f, PyObject *value, PyObject *seen)
             }
             else if (context &&
                 !((PyBaseExceptionObject *)value)->suppress_context) {
-                res = PySet_Contains(seen, context);
+                check_id = PyLong_FromVoidPtr(context);
+                if (check_id == NULL) {
+                    res = -1;
+                } else {
+                    res = PySet_Contains(seen, check_id);
+                    Py_DECREF(check_id);
+                }
                 if (res == -1)
                     PyErr_Clear();
                 if (res == 0) {
@@ -848,6 +862,7 @@ print_exception_recursive(PyObject *f, PyObject *value, PyObject *seen)
             Py_XDECREF(context);
             Py_XDECREF(cause);
         }
+        Py_XDECREF(value_id);
     }
     print_exception(f, value);
     if (err != 0)


From webhook-mailer at python.org  Tue Oct 17 17:46:48 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 17 Oct 2017 21:46:48 -0000
Subject: [Python-checkins] time.clock() now emits a DeprecationWarning
 (GH-4020)
Message-ID: <mailman.76.1508276810.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/884d13a55fc328e2e1e3948a82b361b30804b818
commit: 884d13a55fc328e2e1e3948a82b361b30804b818
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-17T14:46:45-07:00
summary:

time.clock() now emits a DeprecationWarning (GH-4020)

bpo-31803: time.clock() and time.get_clock_info('clock') now emit a
DeprecationWarning warning.

Replace time.clock() with time.perf_counter() in tests and demos.

Remove also hasattr(time, 'monotonic') in test_time since time.monotonic()
is now always available since Python 3.5.

files:
A Misc/NEWS.d/next/Library/2017-10-17-22-55-13.bpo-31803.YLL1gJ.rst
M Doc/library/profile.rst
M Doc/library/time.rst
M Lib/ctypes/test/test_numbers.py
M Lib/ctypes/test/test_strings.py
M Lib/profile.py
M Lib/test/test_time.py
M Lib/turtledemo/bytedesign.py
M Lib/turtledemo/forest.py
M Lib/turtledemo/fractalcurves.py
M Lib/turtledemo/penrose.py
M Lib/turtledemo/tree.py
M Lib/turtledemo/wikipedia.py
M Modules/timemodule.c

diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst
index 5796e3acb6a..68f24abe6f0 100644
--- a/Doc/library/profile.rst
+++ b/Doc/library/profile.rst
@@ -575,7 +575,7 @@ procedure can be used to obtain a better constant for a given platform (see
 The method executes the number of Python calls given by the argument, directly
 and again under the profiler, measuring the time for both. It then computes the
 hidden overhead per profiler event, and returns that as a float.  For example,
-on a 1.8Ghz Intel Core i5 running Mac OS X, and using Python's time.clock() as
+on a 1.8Ghz Intel Core i5 running Mac OS X, and using Python's time.process_time() as
 the timer, the magical number is about 4.04e-6.
 
 The object of this exercise is to get a fairly consistent result. If your
diff --git a/Doc/library/time.rst b/Doc/library/time.rst
index 25a4ab50826..c5d1e83e739 100644
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -289,6 +289,9 @@ Functions
 
 .. function:: perf_counter()
 
+   .. index::
+      single: benchmarking
+
    Return the value (in fractional seconds) of a performance counter, i.e. a
    clock with the highest available resolution to measure a short duration.  It
    does include time elapsed during sleep and is system-wide.  The reference
@@ -300,6 +303,11 @@ Functions
 
 .. function:: process_time()
 
+   .. index::
+      single: CPU time
+      single: processor time
+      single: benchmarking
+
    Return the value (in fractional seconds) of the sum of the system and user
    CPU time of the current process.  It does not include time elapsed during
    sleep.  It is process-wide by definition.  The reference point of the
diff --git a/Lib/ctypes/test/test_numbers.py b/Lib/ctypes/test/test_numbers.py
index ba4f5633579..09eef90f748 100644
--- a/Lib/ctypes/test/test_numbers.py
+++ b/Lib/ctypes/test/test_numbers.py
@@ -241,7 +241,7 @@ class c_int_S(_SimpleCData):
 def run_test(rep, msg, func, arg=None):
 ##    items = [None] * rep
     items = range(rep)
-    from time import clock
+    from time import perf_counter as clock
     if arg is not None:
         start = clock()
         for i in items:
diff --git a/Lib/ctypes/test/test_strings.py b/Lib/ctypes/test/test_strings.py
index c7bfbda73d5..e28e141394d 100644
--- a/Lib/ctypes/test/test_strings.py
+++ b/Lib/ctypes/test/test_strings.py
@@ -194,7 +194,7 @@ def test_toolong(self):
 
 def run_test(rep, msg, func, arg):
     items = range(rep)
-    from time import clock
+    from time import perf_counter as clock
     start = clock()
     for i in items:
         func(arg); func(arg); func(arg); func(arg); func(arg)
diff --git a/Lib/profile.py b/Lib/profile.py
index 5ceeddc075f..0340a7907bf 100755
--- a/Lib/profile.py
+++ b/Lib/profile.py
@@ -195,7 +195,7 @@ def trace_dispatch(self, frame, event, arg):
             self.t = r[0] + r[1] - t # put back unrecorded delta
 
     # Dispatch routine for best timer program (return = scalar, fastest if
-    # an integer but float works too -- and time.clock() relies on that).
+    # an integer but float works too -- and time.process_time() relies on that).
 
     def trace_dispatch_i(self, frame, event, arg):
         timer = self.timer
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 61dda09c184..a08fd1822b0 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -9,6 +9,7 @@
 import time
 import threading
 import unittest
+import warnings
 try:
     import _testcapi
 except ImportError:
@@ -64,9 +65,11 @@ def test_time(self):
         self.assertTrue(info.adjustable)
 
     def test_clock(self):
-        time.clock()
+        with self.assertWarns(DeprecationWarning):
+            time.clock()
 
-        info = time.get_clock_info('clock')
+        with self.assertWarns(DeprecationWarning):
+            info = time.get_clock_info('clock')
         self.assertTrue(info.monotonic)
         self.assertFalse(info.adjustable)
 
@@ -427,8 +430,6 @@ def test_mktime_error(self):
             pass
         self.assertEqual(time.strftime('%Z', tt), tzname)
 
-    @unittest.skipUnless(hasattr(time, 'monotonic'),
-                         'need time.monotonic')
     def test_monotonic(self):
         # monotonic() should not go backward
         times = [time.monotonic() for n in range(100)]
@@ -467,8 +468,6 @@ def test_process_time(self):
         self.assertTrue(info.monotonic)
         self.assertFalse(info.adjustable)
 
-    @unittest.skipUnless(hasattr(time, 'monotonic'),
-                         'need time.monotonic')
     @unittest.skipUnless(hasattr(time, 'clock_settime'),
                          'need time.clock_settime')
     def test_monotonic_settime(self):
@@ -506,12 +505,15 @@ def test_localtime_failure(self):
         self.assertRaises(ValueError, time.ctime, float("nan"))
 
     def test_get_clock_info(self):
-        clocks = ['clock', 'perf_counter', 'process_time', 'time']
-        if hasattr(time, 'monotonic'):
-            clocks.append('monotonic')
+        clocks = ['clock', 'monotonic', 'perf_counter', 'process_time', 'time']
 
         for name in clocks:
-            info = time.get_clock_info(name)
+            if name == 'clock':
+                with self.assertWarns(DeprecationWarning):
+                    info = time.get_clock_info('clock')
+            else:
+                info = time.get_clock_info(name)
+
             #self.assertIsInstance(info, dict)
             self.assertIsInstance(info.implementation, str)
             self.assertNotEqual(info.implementation, '')
diff --git a/Lib/turtledemo/bytedesign.py b/Lib/turtledemo/bytedesign.py
index b3b095b7687..1b7452b512c 100755
--- a/Lib/turtledemo/bytedesign.py
+++ b/Lib/turtledemo/bytedesign.py
@@ -23,7 +23,7 @@
 """
 
 from turtle import Turtle, mainloop
-from time import clock
+from time import perf_counter as clock
 
 # wrapper for any additional drawing routines
 # that need to know about each other
diff --git a/Lib/turtledemo/forest.py b/Lib/turtledemo/forest.py
index 7fe080e6333..55b7da947d2 100755
--- a/Lib/turtledemo/forest.py
+++ b/Lib/turtledemo/forest.py
@@ -13,7 +13,7 @@
 """
 from turtle import Turtle, colormode, tracer, mainloop
 from random import randrange
-from time import clock
+from time import perf_counter as clock
 
 def symRandom(n):
     return randrange(-n,n+1)
diff --git a/Lib/turtledemo/fractalcurves.py b/Lib/turtledemo/fractalcurves.py
index c49f8b88ea1..54ade96a0ad 100755
--- a/Lib/turtledemo/fractalcurves.py
+++ b/Lib/turtledemo/fractalcurves.py
@@ -12,7 +12,7 @@
 scripts for turtle-graphics.
 """
 from turtle import *
-from time import sleep, clock
+from time import sleep, perf_counter as clock
 
 class CurvesTurtle(Pen):
     # example derived from
diff --git a/Lib/turtledemo/penrose.py b/Lib/turtledemo/penrose.py
index f73c864b7b4..b2a5813938a 100755
--- a/Lib/turtledemo/penrose.py
+++ b/Lib/turtledemo/penrose.py
@@ -17,7 +17,7 @@
 """
 from turtle import *
 from math import cos, pi
-from time import clock, sleep
+from time import perf_counter as clock, sleep
 
 f = (5**0.5-1)/2.0   # (sqrt(5)-1)/2 -- golden ratio
 d = 2 * cos(3*pi/10)
diff --git a/Lib/turtledemo/tree.py b/Lib/turtledemo/tree.py
index 71fff355c7c..9998fa839ce 100755
--- a/Lib/turtledemo/tree.py
+++ b/Lib/turtledemo/tree.py
@@ -16,7 +16,7 @@
 there are 1024 turtles.
 """
 from turtle import Turtle, mainloop
-from time import clock
+from time import perf_counter as clock
 
 def tree(plist, l, a, f):
     """ plist is list of pens
diff --git a/Lib/turtledemo/wikipedia.py b/Lib/turtledemo/wikipedia.py
index d6bbad892db..47d0f00e9da 100644
--- a/Lib/turtledemo/wikipedia.py
+++ b/Lib/turtledemo/wikipedia.py
@@ -14,7 +14,7 @@
 Followed by a complete undo().
 """
 from turtle import Screen, Turtle, mainloop
-from time import clock, sleep
+from time import perf_counter as clock, sleep
 
 def mn_eck(p, ne,sz):
     turtlelist = [p]
diff --git a/Misc/NEWS.d/next/Library/2017-10-17-22-55-13.bpo-31803.YLL1gJ.rst b/Misc/NEWS.d/next/Library/2017-10-17-22-55-13.bpo-31803.YLL1gJ.rst
new file mode 100644
index 00000000000..10a88ba03d7
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-17-22-55-13.bpo-31803.YLL1gJ.rst
@@ -0,0 +1,2 @@
+time.clock() and time.get_clock_info('clock') now emit a DeprecationWarning
+warning.
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 6af9a90e58a..463f5c55770 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -104,6 +104,13 @@ perf_counter(_Py_clock_info_t *info)
 static PyObject*
 pyclock(_Py_clock_info_t *info)
 {
+    if (PyErr_WarnEx(PyExc_DeprecationWarning,
+                      "time.clock has been deprecated in Python 3.3 and will "
+                      "be removed from Python 3.8: "
+                      "use time.perf_counter or time.process_time "
+                      "instead", 1) < 0) {
+        return NULL;
+    }
 #ifdef MS_WINDOWS
     return perf_counter(info);
 #else


From webhook-mailer at python.org  Tue Oct 17 18:14:22 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 17 Oct 2017 22:14:22 -0000
Subject: [Python-checkins] [3.6] bpo-28603: Fix formatting tracebacks for
 unhashable exceptions (GH-4014) (#4024)
Message-ID: <mailman.77.1508278463.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/2712247ec94dcc12cf9abeec78f18f54fcc3357a
commit: 2712247ec94dcc12cf9abeec78f18f54fcc3357a
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-18T01:14:19+03:00
summary:

[3.6] bpo-28603: Fix formatting tracebacks for unhashable exceptions (GH-4014) (#4024)

(cherry picked from commit de86073a761cd3539aaca6f886a1f55effc0d9da)

files:
A Lib/idlelib/idle_test/test_run.py
A Misc/NEWS.d/next/Core and Builtins/2017-10-17-13-29-19.bpo-28603._-oia3.rst
A Misc/NEWS.d/next/IDLE/2017-10-17-13-26-13.bpo-28603.TMEQfp.rst
A Misc/NEWS.d/next/Library/2017-10-17-12-29-18.bpo-28603.tGuX2C.rst
M Lib/idlelib/run.py
M Lib/test/test_traceback.py
M Lib/traceback.py
M Misc/ACKS
M Python/pythonrun.c

diff --git a/Lib/idlelib/idle_test/test_run.py b/Lib/idlelib/idle_test/test_run.py
new file mode 100644
index 00000000000..d7e627d23d3
--- /dev/null
+++ b/Lib/idlelib/idle_test/test_run.py
@@ -0,0 +1,35 @@
+import unittest
+from unittest import mock
+
+from test.support import captured_stderr
+import idlelib.run as idlerun
+
+
+class RunTest(unittest.TestCase):
+    def test_print_exception_unhashable(self):
+        class UnhashableException(Exception):
+            def __eq__(self, other):
+                return True
+
+        ex1 = UnhashableException('ex1')
+        ex2 = UnhashableException('ex2')
+        try:
+            raise ex2 from ex1
+        except UnhashableException:
+            try:
+                raise ex1
+            except UnhashableException:
+                with captured_stderr() as output:
+                    with mock.patch.object(idlerun,
+                                           'cleanup_traceback') as ct:
+                        ct.side_effect = lambda t, e: t
+                        idlerun.print_exception()
+
+        tb = output.getvalue().strip().splitlines()
+        self.assertEqual(11, len(tb))
+        self.assertIn('UnhashableException: ex2', tb[3])
+        self.assertIn('UnhashableException: ex1', tb[10])
+
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index 39e0c116f9b..6440e673bf5 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -203,16 +203,16 @@ def print_exception():
     seen = set()
 
     def print_exc(typ, exc, tb):
-        seen.add(exc)
+        seen.add(id(exc))
         context = exc.__context__
         cause = exc.__cause__
-        if cause is not None and cause not in seen:
+        if cause is not None and id(cause) not in seen:
             print_exc(type(cause), cause, cause.__traceback__)
             print("\nThe above exception was the direct cause "
                   "of the following exception:\n", file=efile)
         elif (context is not None and
               not exc.__suppress_context__ and
-              context not in seen):
+              id(context) not in seen):
             print_exc(type(context), context, context.__traceback__)
             print("\nDuring handling of the above exception, "
                   "another exception occurred:\n", file=efile)
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index e4833535890..bffc03e663f 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -443,6 +443,33 @@ def fmt():
             '    return traceback.format_stack()\n' % (__file__, lineno+1),
         ])
 
+    @cpython_only
+    def test_unhashable(self):
+        from _testcapi import exception_print
+
+        class UnhashableException(Exception):
+            def __eq__(self, other):
+                return True
+
+        ex1 = UnhashableException('ex1')
+        ex2 = UnhashableException('ex2')
+        try:
+            raise ex2 from ex1
+        except UnhashableException:
+            try:
+                raise ex1
+            except UnhashableException:
+                exc_type, exc_val, exc_tb = sys.exc_info()
+
+        with captured_output("stderr") as stderr_f:
+            exception_print(exc_val)
+
+        tb = stderr_f.getvalue().strip().splitlines()
+        self.assertEqual(11, len(tb))
+        self.assertEqual(context_message.strip(), tb[5])
+        self.assertIn('UnhashableException: ex2', tb[3])
+        self.assertIn('UnhashableException: ex1', tb[10])
+
 
 cause_message = (
     "\nThe above exception was the direct cause "
@@ -994,6 +1021,25 @@ def test_context(self):
         self.assertEqual(exc_info[0], exc.exc_type)
         self.assertEqual(str(exc_info[1]), str(exc))
 
+    def test_unhashable(self):
+        class UnhashableException(Exception):
+            def __eq__(self, other):
+                return True
+
+        ex1 = UnhashableException('ex1')
+        ex2 = UnhashableException('ex2')
+        try:
+            raise ex2 from ex1
+        except UnhashableException:
+            try:
+                raise ex1
+            except UnhashableException:
+                exc_info = sys.exc_info()
+        exc = traceback.TracebackException(*exc_info)
+        formatted = list(exc.format())
+        self.assertIn('UnhashableException: ex2\n', formatted[2])
+        self.assertIn('UnhashableException: ex1\n', formatted[6])
+
     def test_limit(self):
         def recurse(n):
             if n:
diff --git a/Lib/traceback.py b/Lib/traceback.py
index 09bda717ad0..41fefff9c2d 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -459,11 +459,11 @@ def __init__(self, exc_type, exc_value, exc_traceback, *, limit=None,
         # Handle loops in __cause__ or __context__.
         if _seen is None:
             _seen = set()
-        _seen.add(exc_value)
+        _seen.add(id(exc_value))
         # Gracefully handle (the way Python 2.4 and earlier did) the case of
         # being called with no type or value (None, None, None).
         if (exc_value and exc_value.__cause__ is not None
-            and exc_value.__cause__ not in _seen):
+            and id(exc_value.__cause__) not in _seen):
             cause = TracebackException(
                 type(exc_value.__cause__),
                 exc_value.__cause__,
@@ -475,7 +475,7 @@ def __init__(self, exc_type, exc_value, exc_traceback, *, limit=None,
         else:
             cause = None
         if (exc_value and exc_value.__context__ is not None
-            and exc_value.__context__ not in _seen):
+            and id(exc_value.__context__) not in _seen):
             context = TracebackException(
                 type(exc_value.__context__),
                 exc_value.__context__,
diff --git a/Misc/ACKS b/Misc/ACKS
index 83336eca5b9..c9dbf9f5560 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -145,6 +145,7 @@ Dominic Binks
 Philippe Biondi
 Michael Birtwell
 Stuart Bishop
+Zane Bitter
 Roy Bixler
 Daniel Black
 Jonathan Black
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-17-13-29-19.bpo-28603._-oia3.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-17-13-29-19.bpo-28603._-oia3.rst
new file mode 100644
index 00000000000..a3542accd5f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-17-13-29-19.bpo-28603._-oia3.rst	
@@ -0,0 +1,3 @@
+Print the full context/cause chain of exceptions on interpreter exit, even
+if an exception in the chain is unhashable or compares equal to later ones.
+Patch by Zane Bitter.
diff --git a/Misc/NEWS.d/next/IDLE/2017-10-17-13-26-13.bpo-28603.TMEQfp.rst b/Misc/NEWS.d/next/IDLE/2017-10-17-13-26-13.bpo-28603.TMEQfp.rst
new file mode 100644
index 00000000000..e69f7f67219
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-10-17-13-26-13.bpo-28603.TMEQfp.rst
@@ -0,0 +1,2 @@
+Fix a TypeError that caused a shell restart when printing a traceback that
+includes an exception that is unhashable. Patch by Zane Bitter.
diff --git a/Misc/NEWS.d/next/Library/2017-10-17-12-29-18.bpo-28603.tGuX2C.rst b/Misc/NEWS.d/next/Library/2017-10-17-12-29-18.bpo-28603.tGuX2C.rst
new file mode 100644
index 00000000000..1a5fb0aa67b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-17-12-29-18.bpo-28603.tGuX2C.rst
@@ -0,0 +1,3 @@
+traceback: Fix a TypeError that occurred during printing of exception
+tracebacks when either the current exception or an exception in its
+context/cause chain is unhashable. Patch by Zane Bitter.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 8befa546a92..bf651d0ff8d 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -811,13 +811,21 @@ print_exception_recursive(PyObject *f, PyObject *value, PyObject *seen)
 
     if (seen != NULL) {
         /* Exception chaining */
-        if (PySet_Add(seen, value) == -1)
+        PyObject *value_id = PyLong_FromVoidPtr(value);
+        if (value_id == NULL || PySet_Add(seen, value_id) == -1)
             PyErr_Clear();
         else if (PyExceptionInstance_Check(value)) {
+            PyObject *check_id = NULL;
             cause = PyException_GetCause(value);
             context = PyException_GetContext(value);
             if (cause) {
-                res = PySet_Contains(seen, cause);
+                check_id = PyLong_FromVoidPtr(cause);
+                if (check_id == NULL) {
+                    res = -1;
+                } else {
+                    res = PySet_Contains(seen, check_id);
+                    Py_DECREF(check_id);
+                }
                 if (res == -1)
                     PyErr_Clear();
                 if (res == 0) {
@@ -829,7 +837,13 @@ print_exception_recursive(PyObject *f, PyObject *value, PyObject *seen)
             }
             else if (context &&
                 !((PyBaseExceptionObject *)value)->suppress_context) {
-                res = PySet_Contains(seen, context);
+                check_id = PyLong_FromVoidPtr(context);
+                if (check_id == NULL) {
+                    res = -1;
+                } else {
+                    res = PySet_Contains(seen, check_id);
+                    Py_DECREF(check_id);
+                }
                 if (res == -1)
                     PyErr_Clear();
                 if (res == 0) {
@@ -842,6 +856,7 @@ print_exception_recursive(PyObject *f, PyObject *value, PyObject *seen)
             Py_XDECREF(context);
             Py_XDECREF(cause);
         }
+        Py_XDECREF(value_id);
     }
     print_exception(f, value);
     if (err != 0)


From webhook-mailer at python.org  Tue Oct 17 18:56:21 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Tue, 17 Oct 2017 22:56:21 -0000
Subject: [Python-checkins] bpo-13802: Use non-Latin characters in IDLE's
 Font settings sample. (#3960)
Message-ID: <mailman.78.1508280983.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/e2e42274ee5db1acedf57b63943e1f536d7a25bc
commit: e2e42274ee5db1acedf57b63943e1f536d7a25bc
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-10-17T18:56:16-04:00
summary:

bpo-13802: Use non-Latin characters in IDLE's Font settings sample. (#3960)

Even if one selects a font that defines a limited subset of the unicode
Basic Multilingual Plane, tcl/tk will use other fonts that define a
character. The expanded example give users of non-Latin characters
a better idea of what they might see in the IDLE shell and editors.

To make room for the expanded sample, frames on the Font tab are
re-arranged. The Font/Tabs help explains a bit about the additions.

files:
A Misc/NEWS.d/next/IDLE/2017-10-12-00-51-29.bpo-13802.VwjZRD.rst
M Lib/idlelib/configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index d27b0727d3d..cea85580d43 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -12,7 +12,7 @@
 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,
+                     NONE, BOTH, X, Y, W, E, EW, NS, NSEW, NW, CENTER,
                      HORIZONTAL, VERTICAL, ANCHOR, ACTIVE, END)
 from tkinter.ttk import (Button, Checkbutton, Entry, Frame, Label, LabelFrame,
                          OptionMenu, Notebook, Radiobutton, Scrollbar, Style)
@@ -479,8 +479,8 @@ def create_page_font_tab(self):
                     font_size_title: Label
                     (*)sizelist: DynOptionMenu - font_size
                     (*)bold_toggle: Checkbutton - font_bold
-                frame_font_sample: Frame
-                    (*)font_sample: Label
+            frame_sample: LabelFrame
+                (*)font_sample: Label
             frame_indent: LabelFrame
                     indent_title: Label
                     (*)indent_scale: Scale - space_num
@@ -490,10 +490,11 @@ def create_page_font_tab(self):
         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.
+        # Define frames and widgets.
         frame_font = LabelFrame(
-                self, borderwidth=2, relief=GROOVE, text=' Base Editor Font ')
+                self, borderwidth=2, relief=GROOVE, text=' Shell/Editor Font ')
+        frame_sample = LabelFrame(
+                self, borderwidth=2, relief=GROOVE, text=' Font Sample ')
         frame_indent = LabelFrame(
                 self, borderwidth=2, relief=GROOVE, text=' Indentation Width ')
         # frame_font.
@@ -501,7 +502,7 @@ def create_page_font_tab(self):
         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,
+        self.fontlist = Listbox(frame_font_name, height=15,
                                 takefocus=True, exportselection=FALSE)
         self.fontlist.bind('<ButtonRelease-1>', self.on_fontlist_select)
         self.fontlist.bind('<KeyRelease-Up>', self.on_fontlist_select)
@@ -514,11 +515,37 @@ def create_page_font_tab(self):
         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)
+        # frame_sample.
+        sample = (
+            '<ASCII/Latin1>\n'
+            'AaBbCcDdEeFfGgHhIiJj\n1234567890#:+=(){}[]\n'
+            '\u00a2\u00a3\u00a5\u00a7\u00a9\u00ab\u00ae\u00b6\u00bd\u011e'
+            '\u00c0\u00c1\u00c2\u00c3\u00c4\u00c5\u00c7\u00d0\u00d8\u00df\n'
+            '\n<IPA,Greek,Cyrillic>\n'
+            '\u0250\u0255\u0258\u025e\u025f\u0264\u026b\u026e\u0270\u0277'
+            '\u027b\u0281\u0283\u0286\u028e\u029e\u02a2\u02ab\u02ad\u02af\n'
+            '\u0391\u03b1\u0392\u03b2\u0393\u03b3\u0394\u03b4\u0395\u03b5'
+            '\u0396\u03b6\u0397\u03b7\u0398\u03b8\u0399\u03b9\u039a\u03ba\n'
+            '\u0411\u0431\u0414\u0434\u0416\u0436\u041f\u043f\u0424\u0444'
+            '\u0427\u0447\u042a\u044a\u042d\u044d\u0460\u0464\u046c\u04dc\n'
+            '\n<Hebrew, Arabic>\n'
+            '\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5\u05d6\u05d7\u05d8\u05d9'
+            '\u05da\u05db\u05dc\u05dd\u05de\u05df\u05e0\u05e1\u05e2\u05e3\n'
+            '\u0627\u0628\u062c\u062f\u0647\u0648\u0632\u062d\u0637\u064a'
+            '\u0660\u0661\u0662\u0663\u0664\u0665\u0666\u0667\u0668\u0669\n'
+            '\n<Devanagari, Tamil>\n'
+            '\u0966\u0967\u0968\u0969\u096a\u096b\u096c\u096d\u096e\u096f'
+            '\u0905\u0906\u0907\u0908\u0909\u090a\u090f\u0910\u0913\u0914\n'
+            '\u0be6\u0be7\u0be8\u0be9\u0bea\u0beb\u0bec\u0bed\u0bee\u0bef'
+            '\u0b85\u0b87\u0b89\u0b8e\n'
+            '\n<East Asian>\n'
+            '\u3007\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\n'
+            '\u6c49\u5b57\u6f22\u5b57\u4eba\u6728\u706b\u571f\u91d1\u6c34\n'
+            '\uac00\ub0d0\ub354\ub824\ubaa8\ubd64\uc218\uc720\uc988\uce58\n'
+            '\u3042\u3044\u3046\u3048\u304a\u30a2\u30a4\u30a6\u30a8\u30aa\n'
+            )
         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#:+=(){}[]')
+        self.font_sample = Label(frame_sample, text=sample, font=temp_font)
         # frame_indent.
         indent_title = Label(
                 frame_indent, justify=LEFT,
@@ -527,10 +554,12 @@ def create_page_font_tab(self):
                 frame_indent, variable=self.space_num,
                 orient='horizontal', tickinterval=2, from_=2, to=16)
 
-        # 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)
+        # Grid and pack widgets:
+        self.columnconfigure(1, weight=1)
+        frame_font.grid(row=0, column=0, padx=5, pady=5)
+        frame_sample.grid(row=0, column=1, rowspan=2, padx=5, pady=5,
+                          sticky='nsew')
+        frame_indent.grid(row=1, column=0, padx=5, pady=5, sticky='ew')
         # 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)
@@ -540,10 +569,9 @@ def create_page_font_tab(self):
         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)
+        # frame_sample.
         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)
 
@@ -2108,10 +2136,24 @@ def detach(self):
 dialog that are different from IDLE's default are saved in
 a .idlerc directory in your home directory. Except as noted,
 these changes apply to all versions of IDLE installed on this
-machine. Some do not take affect until IDLE is restarted.
-[Cancel] only cancels changes made since the last save.
+machine. [Cancel] only cancels changes made since the last save.
 '''
 help_pages = {
+    'Fonts/Tabs':'''
+Font sample: This shows what a selection of Basic Multilingual Plane
+unicode characters look like for the current font selection.  If the
+selected font does not define a character, Tk attempts to find another
+font that does.  Substitute glyphs depend on what is available on a
+particular system and will not necessarily have the same size as the
+font selected.  Line contains 20 characters up to Devanagari, 14 for
+Tamil, and 10 for East Asia.
+
+Hebrew and Arabic letters should display right to left, starting with
+alef, \u05d0 and \u0627.  Arabic digits display left to right.  The
+Devanagari and Tamil lines start with digits.  The East Asian lines
+are Chinese digits, Chinese Hanzi, Korean Hangul, and Japanese
+Hiragana and Katakana.
+''',
     'Highlights': '''
 Highlighting:
 The IDLE Dark color theme is new in October 2015.  It can only
diff --git a/Misc/NEWS.d/next/IDLE/2017-10-12-00-51-29.bpo-13802.VwjZRD.rst b/Misc/NEWS.d/next/IDLE/2017-10-12-00-51-29.bpo-13802.VwjZRD.rst
new file mode 100644
index 00000000000..b5b6da76d2a
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-10-12-00-51-29.bpo-13802.VwjZRD.rst
@@ -0,0 +1,15 @@
+Use non-Latin characters in the IDLE's Font settings sample.
+
+Even if one selects a font that defines a limited subset of the unicode
+
+Basic Multilingual Plane, tcl/tk will use other fonts that define a
+
+character.  The expanded example give users of non-Latin characters
+
+a better idea of what they might see in IDLE's shell and editors.
+
+
+
+To make room for the expanded sample, frames on the Font tab are
+
+re-arranged.  The Font/Tabs help explains a bit about the additions.


From webhook-mailer at python.org  Tue Oct 17 19:02:51 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Tue, 17 Oct 2017 23:02:51 -0000
Subject: [Python-checkins] bpo-30928: Update idlelib/NEWS.txt to 2017 Oct
 17. (#4025)
Message-ID: <mailman.79.1508281372.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/27288de0856c6fbe56354adb312ae706ce8bc7de
commit: 27288de0856c6fbe56354adb312ae706ce8bc7de
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-10-17T19:02:49-04:00
summary:

bpo-30928: Update idlelib/NEWS.txt to 2017 Oct 17. (#4025)

files:
M Lib/idlelib/NEWS.txt

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index cc03860a33e..a1a5d80854b 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,45 @@ Released on 2018-06-18?
 ========================
 
 
+bpo-28603: Fix a TypeError that caused a shell restart when printing
+a traceback that includes an exception that is unhashable.
+Patch by Zane Bitter.
+
+bpo-13802: Use non-Latin characters in the Font settings sample.
+Even if one selects a font that defines a limited subset of the unicode
+Basic Multilingual Plane, tcl/tk will use other fonts that define a
+character.  The expanded example give users of non-Latin characters
+a better idea of what they might see in the shell and editors.
+
+To make room for the expanded sample, frames on the Font tab are
+re-arranged.  The Font/Tabs help explains a bit about the additions.
+Patch by Terry Jan Reedy
+
+bpo-31460: Simplify the API of IDLE's Module Browser.
+Passing a widget instead of an flist with a root widget opens the
+option of creating a browser frame that is only part of a window.
+Passing a full file name instead of pieces assumed to come from a
+.py file opens the possibility of browsing python files that do not
+end in .py.
+
+bpo-31649: Make _htest and _utest parameters keyword-only.
+These are used to adjust code for human and unit tests.
+
+bpo-31459: Rename module browser from Class Browser to Module Browser.
+The original module-level class and method browser became a module
+browser, with the addition of module-level functions, years ago.
+Nested classes and functions were added yesterday.  For back-
+compatibility, the virtual event <<open-class-browser>>, which
+appears on the Keys tab of the Settings dialog, is not changed.
+Patch by Cheryl Sabella.
+
+bpo-1612262: Module browser now shows nested classes and functions.
+Original patches for code and tests by Guilherme Polo and
+Cheryl Sabella, respectively.  Revisions by Terry Jan Reedy.
+
+bpo-31500: Tk's default fonts now are scaled on HiDPI displays.
+This affects all dialogs.  Patch by Serhiy Storchaka.
+
 bpo-31493: Fix code context update and font update timers.
 Canceling timers prevents a warning message when test_idle completes.
 


From webhook-mailer at python.org  Tue Oct 17 19:51:53 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Tue, 17 Oct 2017 23:51:53 -0000
Subject: [Python-checkins] [3.6] bpo-13802: Use non-Latin characters in
 IDLE's Font settings sample. (GH-3960) (#4027)
Message-ID: <mailman.80.1508284315.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/ecacbb4f22ae86d29a73a5f715bce07d091da10d
commit: ecacbb4f22ae86d29a73a5f715bce07d091da10d
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-10-17T19:51:48-04:00
summary:

[3.6] bpo-13802: Use non-Latin characters in IDLE's Font settings sample. (GH-3960) (#4027)

Even if one selects a font that defines a limited subset of the unicode
Basic Multilingual Plane, tcl/tk will use other fonts that define a
character. The expanded example give users of non-Latin characters
a better idea of what they might see in the IDLE shell and editors.

To make room for the expanded sample, frames on the Font tab are
re-arranged. The Font/Tabs help explains a bit about the additions.
(cherry picked from commit e2e42274ee5db1acedf57b63943e1f536d7a25bc)

files:
A Misc/NEWS.d/next/IDLE/2017-10-12-00-51-29.bpo-13802.VwjZRD.rst
M Lib/idlelib/configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index d27b0727d3d..cea85580d43 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -12,7 +12,7 @@
 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,
+                     NONE, BOTH, X, Y, W, E, EW, NS, NSEW, NW, CENTER,
                      HORIZONTAL, VERTICAL, ANCHOR, ACTIVE, END)
 from tkinter.ttk import (Button, Checkbutton, Entry, Frame, Label, LabelFrame,
                          OptionMenu, Notebook, Radiobutton, Scrollbar, Style)
@@ -479,8 +479,8 @@ def create_page_font_tab(self):
                     font_size_title: Label
                     (*)sizelist: DynOptionMenu - font_size
                     (*)bold_toggle: Checkbutton - font_bold
-                frame_font_sample: Frame
-                    (*)font_sample: Label
+            frame_sample: LabelFrame
+                (*)font_sample: Label
             frame_indent: LabelFrame
                     indent_title: Label
                     (*)indent_scale: Scale - space_num
@@ -490,10 +490,11 @@ def create_page_font_tab(self):
         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.
+        # Define frames and widgets.
         frame_font = LabelFrame(
-                self, borderwidth=2, relief=GROOVE, text=' Base Editor Font ')
+                self, borderwidth=2, relief=GROOVE, text=' Shell/Editor Font ')
+        frame_sample = LabelFrame(
+                self, borderwidth=2, relief=GROOVE, text=' Font Sample ')
         frame_indent = LabelFrame(
                 self, borderwidth=2, relief=GROOVE, text=' Indentation Width ')
         # frame_font.
@@ -501,7 +502,7 @@ def create_page_font_tab(self):
         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,
+        self.fontlist = Listbox(frame_font_name, height=15,
                                 takefocus=True, exportselection=FALSE)
         self.fontlist.bind('<ButtonRelease-1>', self.on_fontlist_select)
         self.fontlist.bind('<KeyRelease-Up>', self.on_fontlist_select)
@@ -514,11 +515,37 @@ def create_page_font_tab(self):
         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)
+        # frame_sample.
+        sample = (
+            '<ASCII/Latin1>\n'
+            'AaBbCcDdEeFfGgHhIiJj\n1234567890#:+=(){}[]\n'
+            '\u00a2\u00a3\u00a5\u00a7\u00a9\u00ab\u00ae\u00b6\u00bd\u011e'
+            '\u00c0\u00c1\u00c2\u00c3\u00c4\u00c5\u00c7\u00d0\u00d8\u00df\n'
+            '\n<IPA,Greek,Cyrillic>\n'
+            '\u0250\u0255\u0258\u025e\u025f\u0264\u026b\u026e\u0270\u0277'
+            '\u027b\u0281\u0283\u0286\u028e\u029e\u02a2\u02ab\u02ad\u02af\n'
+            '\u0391\u03b1\u0392\u03b2\u0393\u03b3\u0394\u03b4\u0395\u03b5'
+            '\u0396\u03b6\u0397\u03b7\u0398\u03b8\u0399\u03b9\u039a\u03ba\n'
+            '\u0411\u0431\u0414\u0434\u0416\u0436\u041f\u043f\u0424\u0444'
+            '\u0427\u0447\u042a\u044a\u042d\u044d\u0460\u0464\u046c\u04dc\n'
+            '\n<Hebrew, Arabic>\n'
+            '\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5\u05d6\u05d7\u05d8\u05d9'
+            '\u05da\u05db\u05dc\u05dd\u05de\u05df\u05e0\u05e1\u05e2\u05e3\n'
+            '\u0627\u0628\u062c\u062f\u0647\u0648\u0632\u062d\u0637\u064a'
+            '\u0660\u0661\u0662\u0663\u0664\u0665\u0666\u0667\u0668\u0669\n'
+            '\n<Devanagari, Tamil>\n'
+            '\u0966\u0967\u0968\u0969\u096a\u096b\u096c\u096d\u096e\u096f'
+            '\u0905\u0906\u0907\u0908\u0909\u090a\u090f\u0910\u0913\u0914\n'
+            '\u0be6\u0be7\u0be8\u0be9\u0bea\u0beb\u0bec\u0bed\u0bee\u0bef'
+            '\u0b85\u0b87\u0b89\u0b8e\n'
+            '\n<East Asian>\n'
+            '\u3007\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\n'
+            '\u6c49\u5b57\u6f22\u5b57\u4eba\u6728\u706b\u571f\u91d1\u6c34\n'
+            '\uac00\ub0d0\ub354\ub824\ubaa8\ubd64\uc218\uc720\uc988\uce58\n'
+            '\u3042\u3044\u3046\u3048\u304a\u30a2\u30a4\u30a6\u30a8\u30aa\n'
+            )
         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#:+=(){}[]')
+        self.font_sample = Label(frame_sample, text=sample, font=temp_font)
         # frame_indent.
         indent_title = Label(
                 frame_indent, justify=LEFT,
@@ -527,10 +554,12 @@ def create_page_font_tab(self):
                 frame_indent, variable=self.space_num,
                 orient='horizontal', tickinterval=2, from_=2, to=16)
 
-        # 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)
+        # Grid and pack widgets:
+        self.columnconfigure(1, weight=1)
+        frame_font.grid(row=0, column=0, padx=5, pady=5)
+        frame_sample.grid(row=0, column=1, rowspan=2, padx=5, pady=5,
+                          sticky='nsew')
+        frame_indent.grid(row=1, column=0, padx=5, pady=5, sticky='ew')
         # 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)
@@ -540,10 +569,9 @@ def create_page_font_tab(self):
         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)
+        # frame_sample.
         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)
 
@@ -2108,10 +2136,24 @@ def detach(self):
 dialog that are different from IDLE's default are saved in
 a .idlerc directory in your home directory. Except as noted,
 these changes apply to all versions of IDLE installed on this
-machine. Some do not take affect until IDLE is restarted.
-[Cancel] only cancels changes made since the last save.
+machine. [Cancel] only cancels changes made since the last save.
 '''
 help_pages = {
+    'Fonts/Tabs':'''
+Font sample: This shows what a selection of Basic Multilingual Plane
+unicode characters look like for the current font selection.  If the
+selected font does not define a character, Tk attempts to find another
+font that does.  Substitute glyphs depend on what is available on a
+particular system and will not necessarily have the same size as the
+font selected.  Line contains 20 characters up to Devanagari, 14 for
+Tamil, and 10 for East Asia.
+
+Hebrew and Arabic letters should display right to left, starting with
+alef, \u05d0 and \u0627.  Arabic digits display left to right.  The
+Devanagari and Tamil lines start with digits.  The East Asian lines
+are Chinese digits, Chinese Hanzi, Korean Hangul, and Japanese
+Hiragana and Katakana.
+''',
     'Highlights': '''
 Highlighting:
 The IDLE Dark color theme is new in October 2015.  It can only
diff --git a/Misc/NEWS.d/next/IDLE/2017-10-12-00-51-29.bpo-13802.VwjZRD.rst b/Misc/NEWS.d/next/IDLE/2017-10-12-00-51-29.bpo-13802.VwjZRD.rst
new file mode 100644
index 00000000000..b5b6da76d2a
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-10-12-00-51-29.bpo-13802.VwjZRD.rst
@@ -0,0 +1,15 @@
+Use non-Latin characters in the IDLE's Font settings sample.
+
+Even if one selects a font that defines a limited subset of the unicode
+
+Basic Multilingual Plane, tcl/tk will use other fonts that define a
+
+character.  The expanded example give users of non-Latin characters
+
+a better idea of what they might see in IDLE's shell and editors.
+
+
+
+To make room for the expanded sample, frames on the Font tab are
+
+re-arranged.  The Font/Tabs help explains a bit about the additions.


From webhook-mailer at python.org  Tue Oct 17 19:53:15 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Tue, 17 Oct 2017 23:53:15 -0000
Subject: [Python-checkins] [3.6] bpo-30928: Update idlelib/NEWS.txt to 2017
 Oct 17. (GH-4025) (#4028)
Message-ID: <mailman.81.1508284397.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/98e0f26f2e4cbf5c2ca27b39f43c1cb0114c6e3c
commit: 98e0f26f2e4cbf5c2ca27b39f43c1cb0114c6e3c
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-10-17T19:53:12-04:00
summary:

[3.6] bpo-30928: Update idlelib/NEWS.txt to 2017 Oct 17. (GH-4025) (#4028)

(cherry picked from commit 27288de0856c6fbe56354adb312ae706ce8bc7de)

files:
M Lib/idlelib/NEWS.txt

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index f03e9cde8c9..eacf3246e02 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,45 @@ Released on 2017-09-25?
 ========================
 
 
+bpo-28603: Fix a TypeError that caused a shell restart when printing
+a traceback that includes an exception that is unhashable.
+Patch by Zane Bitter.
+
+bpo-13802: Use non-Latin characters in the Font settings sample.
+Even if one selects a font that defines a limited subset of the unicode
+Basic Multilingual Plane, tcl/tk will use other fonts that define a
+character.  The expanded example give users of non-Latin characters
+a better idea of what they might see in the shell and editors.
+
+To make room for the expanded sample, frames on the Font tab are
+re-arranged.  The Font/Tabs help explains a bit about the additions.
+Patch by Terry Jan Reedy
+
+bpo-31460: Simplify the API of IDLE's Module Browser.
+Passing a widget instead of an flist with a root widget opens the
+option of creating a browser frame that is only part of a window.
+Passing a full file name instead of pieces assumed to come from a
+.py file opens the possibility of browsing python files that do not
+end in .py.
+
+bpo-31649: Make _htest and _utest parameters keyword-only.
+These are used to adjust code for human and unit tests.
+
+bpo-31459: Rename module browser from Class Browser to Module Browser.
+The original module-level class and method browser became a module
+browser, with the addition of module-level functions, years ago.
+Nested classes and functions were added yesterday.  For back-
+compatibility, the virtual event <<open-class-browser>>, which
+appears on the Keys tab of the Settings dialog, is not changed.
+Patch by Cheryl Sabella.
+
+bpo-1612262: Module browser now shows nested classes and functions.
+Original patches for code and tests by Guilherme Polo and
+Cheryl Sabella, respectively.  Revisions by Terry Jan Reedy.
+
+bpo-31500: Tk's default fonts now are scaled on HiDPI displays.
+This affects all dialogs.  Patch by Serhiy Storchaka.
+
 bpo-31493: Fix code context update and font update timers.
 Canceling timers prevents a warning message when test_idle completes.
 


From webhook-mailer at python.org  Tue Oct 17 21:47:12 2017
From: webhook-mailer at python.org (Mariatta)
Date: Wed, 18 Oct 2017 01:47:12 -0000
Subject: [Python-checkins] bpo-31676: Fix test_imp.test_load_source() side
 effect (GH-3871) (GH-3988)
Message-ID: <mailman.82.1508291233.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/178148025494c4058571831fb11fc8eeff8b7365
commit: 178148025494c4058571831fb11fc8eeff8b7365
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-10-17T18:47:10-07:00
summary:

bpo-31676: Fix test_imp.test_load_source() side effect (GH-3871) (GH-3988)

test_load_source() now replaces the current __name__ module with a
temporary module to prevent side effects.
(cherry picked from commit a505ecdc5013cd8f930aacc1ec4fb2afa62d3853)

files:
M Lib/test/test_imp.py

diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
index d513eedc7bb..1c7605c77bb 100644
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -315,8 +315,13 @@ def test_multiple_calls_to_get_data(self):
         loader.get_data(imp.__file__)  # Will need to create a newly opened file
 
     def test_load_source(self):
-        with self.assertRaisesRegex(ValueError, 'embedded null'):
-            imp.load_source(__name__, __file__ + "\0")
+        # Create a temporary module since load_source(name) modifies
+        # sys.modules[name] attributes like __loader___
+        modname = f"tmp{__name__}"
+        mod = type(sys.modules[__name__])(modname)
+        with support.swap_item(sys.modules, modname, mod):
+            with self.assertRaisesRegex(ValueError, 'embedded null'):
+                imp.load_source(modname, __file__ + "\0")
 
     @support.cpython_only
     def test_issue31315(self):


From webhook-mailer at python.org  Tue Oct 17 22:44:24 2017
From: webhook-mailer at python.org (Mariatta)
Date: Wed, 18 Oct 2017 02:44:24 -0000
Subject: [Python-checkins] Add Code of Conduct to .github folder. (GH-4029)
Message-ID: <mailman.83.1508294665.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/ec12df1e6e4d03a0d22956355308df695a8dff36
commit: ec12df1e6e4d03a0d22956355308df695a8dff36
branch: master
author: Mariatta <Mariatta at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-10-17T19:44:20-07:00
summary:

Add Code of Conduct to .github folder. (GH-4029)

files:
A .github/CODE_OF_CONDUCT.rst

diff --git a/.github/CODE_OF_CONDUCT.rst b/.github/CODE_OF_CONDUCT.rst
new file mode 100644
index 00000000000..28de97ced16
--- /dev/null
+++ b/.github/CODE_OF_CONDUCT.rst
@@ -0,0 +1,14 @@
+Code of Conduct
+===============
+
+Please note that all interactions on
+`Python Software Foundation <https://www.python.org/psf-landing/>`__-supported
+infrastructure is `covered
+<https://www.python.org/psf/records/board/minutes/2014-01-06/#management-of-the-psfs-web-properties>`__
+by the `PSF Code of Conduct <https://www.python.org/psf/codeofconduct/>`__,
+which includes all infrastructure used in the development of Python itself
+(e.g. mailing lists, issue trackers, GitHub, etc.).
+
+In general this means everyone is expected to be open, considerate, and
+respectful of others no matter what their position is within the project.
+


From webhook-mailer at python.org  Wed Oct 18 03:13:12 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 18 Oct 2017 07:13:12 -0000
Subject: [Python-checkins] bpo-31806: Use _PyTime_ROUND_TIMEOUT for the
 timeout argument parsing in more functions (#4026)
Message-ID: <mailman.84.1508310794.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/59af94fa61bf90adbe624508e909b5d6ef6e8464
commit: 59af94fa61bf90adbe624508e909b5d6ef6e8464
branch: master
author: Pablo Galindo <Pablogsal at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-18T10:13:09+03:00
summary:

bpo-31806: Use _PyTime_ROUND_TIMEOUT for the timeout argument parsing in more functions (#4026)

Fix timeout rounding in time.sleep(), threading.Lock.acquire() and
socket.socket.settimeout() to round correctly negative timeouts between -1.0 and
0.0. The functions now block waiting for events as expected. Previously, the
call was incorrectly non-blocking.

files:
A Misc/NEWS.d/next/Library/2017-10-17-23-27-03.bpo-31806.TzphdL.rst
M Modules/_threadmodule.c
M Modules/socketmodule.c
M Modules/timemodule.c

diff --git a/Misc/NEWS.d/next/Library/2017-10-17-23-27-03.bpo-31806.TzphdL.rst b/Misc/NEWS.d/next/Library/2017-10-17-23-27-03.bpo-31806.TzphdL.rst
new file mode 100644
index 00000000000..941e77d5197
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-17-23-27-03.bpo-31806.TzphdL.rst
@@ -0,0 +1,4 @@
+Fix timeout rounding in time.sleep(), threading.Lock.acquire() and
+socket.socket.settimeout() to round correctly negative timeouts between -1.0 and
+0.0. The functions now block waiting for events as expected. Previously, the
+call was incorrectly non-blocking. Patch by Pablo Galindo.
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index 2657a1fc68d..72df78f9ccc 100644
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -104,7 +104,7 @@ lock_acquire_parse_args(PyObject *args, PyObject *kwds,
 
     if (timeout_obj
         && _PyTime_FromSecondsObject(timeout,
-                                     timeout_obj, _PyTime_ROUND_CEILING) < 0)
+                                     timeout_obj, _PyTime_ROUND_TIMEOUT) < 0)
         return -1;
 
     if (!blocking && *timeout != unset_timeout ) {
@@ -122,7 +122,7 @@ lock_acquire_parse_args(PyObject *args, PyObject *kwds,
     else if (*timeout != unset_timeout) {
         _PyTime_t microseconds;
 
-        microseconds = _PyTime_AsMicroseconds(*timeout, _PyTime_ROUND_CEILING);
+        microseconds = _PyTime_AsMicroseconds(*timeout, _PyTime_ROUND_TIMEOUT);
         if (microseconds >= PY_TIMEOUT_MAX) {
             PyErr_SetString(PyExc_OverflowError,
                             "timeout value is too large");
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 5df9d014c35..0758f9bd409 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2539,7 +2539,7 @@ socket_parse_timeout(_PyTime_t *timeout, PyObject *timeout_obj)
     }
 
     if (_PyTime_FromSecondsObject(timeout,
-                                  timeout_obj, _PyTime_ROUND_CEILING) < 0)
+                                  timeout_obj, _PyTime_ROUND_TIMEOUT) < 0)
         return -1;
 
     if (*timeout < 0) {
@@ -2548,10 +2548,10 @@ socket_parse_timeout(_PyTime_t *timeout, PyObject *timeout_obj)
     }
 
 #ifdef MS_WINDOWS
-    overflow |= (_PyTime_AsTimeval(*timeout, &tv, _PyTime_ROUND_CEILING) < 0);
+    overflow |= (_PyTime_AsTimeval(*timeout, &tv, _PyTime_ROUND_TIMEOUT) < 0);
 #endif
 #ifndef HAVE_POLL
-    ms = _PyTime_AsMilliseconds(*timeout, _PyTime_ROUND_CEILING);
+    ms = _PyTime_AsMilliseconds(*timeout, _PyTime_ROUND_TIMEOUT);
     overflow |= (ms > INT_MAX);
 #endif
     if (overflow) {
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 463f5c55770..b5e168f9ec3 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -245,7 +245,7 @@ static PyObject *
 time_sleep(PyObject *self, PyObject *obj)
 {
     _PyTime_t secs;
-    if (_PyTime_FromSecondsObject(&secs, obj, _PyTime_ROUND_CEILING))
+    if (_PyTime_FromSecondsObject(&secs, obj, _PyTime_ROUND_TIMEOUT))
         return NULL;
     if (secs < 0) {
         PyErr_SetString(PyExc_ValueError,


From webhook-mailer at python.org  Wed Oct 18 04:12:50 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 18 Oct 2017 08:12:50 -0000
Subject: [Python-checkins] [3.6] bpo-31786: Make functions in the select
 module blocking when timeout is a small negative value. (GH-4003). (#4022)
Message-ID: <mailman.85.1508314372.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/95602b368b87da3702a0f340ded2a23e823bb104
commit: 95602b368b87da3702a0f340ded2a23e823bb104
branch: 3.6
author: Pablo Galindo <Pablogsal at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-18T11:12:47+03:00
summary:

[3.6] bpo-31786: Make functions in the select module blocking when timeout is a small negative value. (GH-4003). (#4022)

(cherry picked from commit 2c15b29aea5d6b9c61aa42d2c24a07ff1edb4b46)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-15-23-44-57.bpo-31786.XwdEP4.rst
M Include/pytime.h
M Lib/test/test_poll.py
M Lib/test/test_time.py
M Modules/_testcapimodule.c
M Modules/selectmodule.c
M Python/pytime.c

diff --git a/Include/pytime.h b/Include/pytime.h
index 87ac7fcbbad..9e1f304fd48 100644
--- a/Include/pytime.h
+++ b/Include/pytime.h
@@ -29,9 +29,20 @@ typedef enum {
     _PyTime_ROUND_CEILING=1,
     /* Round to nearest with ties going to nearest even integer.
        For example, used to round from a Python float. */
-    _PyTime_ROUND_HALF_EVEN
+    _PyTime_ROUND_HALF_EVEN=2,
+    /* Round away from zero 
+       For example, used for timeout. _PyTime_ROUND_CEILING rounds
+       -1e-9 to 0 milliseconds which causes bpo-31786 issue.
+       _PyTime_ROUND_UP rounds -1e-9 to -1 millisecond which keeps
+       the timeout sign as expected. select.poll(timeout) must block
+       for negative values." */
+    _PyTime_ROUND_UP=3,
+    /* _PyTime_ROUND_TIMEOUT (an alias for _PyTime_ROUND_UP) should be 
+       used for timeouts. */
+    _PyTime_ROUND_TIMEOUT = _PyTime_ROUND_UP
 } _PyTime_round_t;
 
+
 /* Convert a time_t to a PyLong. */
 PyAPI_FUNC(PyObject *) _PyLong_FromTime_t(
     time_t sec);
diff --git a/Lib/test/test_poll.py b/Lib/test/test_poll.py
index 6a2bf6ea7b7..2a393601131 100644
--- a/Lib/test/test_poll.py
+++ b/Lib/test/test_poll.py
@@ -208,6 +208,28 @@ def test_threaded_poll(self):
             os.write(w, b'spam')
             t.join()
 
+    @unittest.skipUnless(threading, 'Threading required for this test.')
+    @reap_threads
+    def test_poll_blocks_with_negative_ms(self):
+        for timeout_ms in [None, -1, -1.0, -0.1, -1e-100]:
+            # Create two file descriptors. This will be used to unlock
+            # the blocking call to poll.poll inside the thread
+            r, w = os.pipe()
+            pollster = select.poll()
+            pollster.register(r, select.POLLIN)
+
+            poll_thread = threading.Thread(target=pollster.poll, args=(timeout_ms,))
+            poll_thread.start()
+            poll_thread.join(timeout=0.1)
+            self.assertTrue(poll_thread.is_alive())
+
+            # Write to the pipe so pollster.poll unblocks and the thread ends.
+            os.write(w, b'spam')
+            poll_thread.join()
+            self.assertFalse(poll_thread.is_alive())
+            os.close(r)
+            os.close(w)
+
 
 def test_main():
     run_unittest(PollTests)
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 7093fc6a2ec..5b6e58fa557 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -36,6 +36,8 @@ class _PyTime(enum.IntEnum):
     ROUND_CEILING = 1
     # Round to nearest with ties going to nearest even integer
     ROUND_HALF_EVEN = 2
+    # Round away from zero
+    ROUND_UP = 3
 
 # Rounding modes supported by PyTime
 ROUNDING_MODES = (
@@ -43,6 +45,7 @@ class _PyTime(enum.IntEnum):
     (_PyTime.ROUND_FLOOR, decimal.ROUND_FLOOR),
     (_PyTime.ROUND_CEILING, decimal.ROUND_CEILING),
     (_PyTime.ROUND_HALF_EVEN, decimal.ROUND_HALF_EVEN),
+    (_PyTime.ROUND_UP, decimal.ROUND_UP),
 )
 
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-15-23-44-57.bpo-31786.XwdEP4.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-15-23-44-57.bpo-31786.XwdEP4.rst
new file mode 100644
index 00000000000..f0326e30ecd
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-15-23-44-57.bpo-31786.XwdEP4.rst	
@@ -0,0 +1,3 @@
+Fix timeout rounding in the select module to round correctly negative timeouts between -1.0 and 0.0.
+The functions now block waiting for events as expected. Previously, the call was incorrectly non-blocking.
+Patch by Pablo Galindo.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index ede675da285..2eda03cb73a 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -3016,7 +3016,8 @@ check_time_rounding(int round)
 {
     if (round != _PyTime_ROUND_FLOOR
         && round != _PyTime_ROUND_CEILING
-        && round != _PyTime_ROUND_HALF_EVEN) {
+        && round != _PyTime_ROUND_HALF_EVEN
+        && round != _PyTime_ROUND_UP) {
         PyErr_SetString(PyExc_ValueError, "invalid rounding");
         return -1;
     }
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 4a7fe002f0b..9ae583be244 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -213,7 +213,7 @@ select_select(PyObject *self, PyObject *args)
         tvp = (struct timeval *)NULL;
     else {
         if (_PyTime_FromSecondsObject(&timeout, timeout_obj,
-                                      _PyTime_ROUND_CEILING) < 0) {
+                                      _PyTime_ROUND_TIMEOUT) < 0) {
             if (PyErr_ExceptionMatches(PyExc_TypeError)) {
                 PyErr_SetString(PyExc_TypeError,
                                 "timeout must be a float or None");
@@ -221,7 +221,7 @@ select_select(PyObject *self, PyObject *args)
             return NULL;
         }
 
-        if (_PyTime_AsTimeval(timeout, &tv, _PyTime_ROUND_CEILING) == -1)
+        if (_PyTime_AsTimeval(timeout, &tv, _PyTime_ROUND_TIMEOUT) == -1)
             return NULL;
         if (tv.tv_sec < 0) {
             PyErr_SetString(PyExc_ValueError, "timeout must be non-negative");
@@ -543,7 +543,7 @@ poll_poll(pollObject *self, PyObject *args)
     }
     else {
         if (_PyTime_FromMillisecondsObject(&timeout, timeout_obj,
-                                           _PyTime_ROUND_CEILING) < 0) {
+                                           _PyTime_ROUND_TIMEOUT) < 0) {
             if (PyErr_ExceptionMatches(PyExc_TypeError)) {
                 PyErr_SetString(PyExc_TypeError,
                                 "timeout must be an integer or None");
@@ -551,7 +551,7 @@ poll_poll(pollObject *self, PyObject *args)
             return NULL;
         }
 
-        ms = _PyTime_AsMilliseconds(timeout, _PyTime_ROUND_CEILING);
+        ms = _PyTime_AsMilliseconds(timeout, _PyTime_ROUND_TIMEOUT);
         if (ms < INT_MIN || ms > INT_MAX) {
             PyErr_SetString(PyExc_OverflowError, "timeout is too large");
             return NULL;
@@ -899,7 +899,7 @@ devpoll_poll(devpollObject *self, PyObject *args)
     }
     else {
         if (_PyTime_FromMillisecondsObject(&timeout, timeout_obj,
-                                           _PyTime_ROUND_CEILING) < 0) {
+                                           _PyTime_ROUND_TIMEOUT) < 0) {
             if (PyErr_ExceptionMatches(PyExc_TypeError)) {
                 PyErr_SetString(PyExc_TypeError,
                                 "timeout must be an integer or None");
@@ -907,7 +907,7 @@ devpoll_poll(devpollObject *self, PyObject *args)
             return NULL;
         }
 
-        ms = _PyTime_AsMilliseconds(timeout, _PyTime_ROUND_CEILING);
+        ms = _PyTime_AsMilliseconds(timeout, _PyTime_ROUND_TIMEOUT);
         if (ms < -1 || ms > INT_MAX) {
             PyErr_SetString(PyExc_OverflowError, "timeout is too large");
             return NULL;
@@ -1514,7 +1514,7 @@ pyepoll_poll(pyEpoll_Object *self, PyObject *args, PyObject *kwds)
         /* epoll_wait() has a resolution of 1 millisecond, round towards
            infinity to wait at least timeout seconds. */
         if (_PyTime_FromSecondsObject(&timeout, timeout_obj,
-                                      _PyTime_ROUND_CEILING) < 0) {
+                                      _PyTime_ROUND_TIMEOUT) < 0) {
             if (PyErr_ExceptionMatches(PyExc_TypeError)) {
                 PyErr_SetString(PyExc_TypeError,
                                 "timeout must be an integer or None");
@@ -2129,7 +2129,7 @@ kqueue_queue_control(kqueue_queue_Object *self, PyObject *args)
     }
     else {
         if (_PyTime_FromSecondsObject(&timeout,
-                                      otimeout, _PyTime_ROUND_CEILING) < 0) {
+                                      otimeout, _PyTime_ROUND_TIMEOUT) < 0) {
             PyErr_Format(PyExc_TypeError,
                 "timeout argument must be a number "
                 "or None, got %.200s",
diff --git a/Python/pytime.c b/Python/pytime.c
index b416eff6b29..19fdb55b066 100644
--- a/Python/pytime.c
+++ b/Python/pytime.c
@@ -84,12 +84,19 @@ _PyTime_Round(double x, _PyTime_round_t round)
     volatile double d;
 
     d = x;
-    if (round == _PyTime_ROUND_HALF_EVEN)
+    if (round == _PyTime_ROUND_HALF_EVEN){
         d = _PyTime_RoundHalfEven(d);
-    else if (round == _PyTime_ROUND_CEILING)
+    }
+    else if (round == _PyTime_ROUND_CEILING){
         d = ceil(d);
-    else
+    }
+    else if (round == _PyTime_ROUND_FLOOR) {
         d = floor(d);
+    }
+    else {
+        assert(round == _PyTime_ROUND_UP);
+        d = (d >= 0.0) ? ceil(d) : floor(d);
+    }
     return d;
 }
 
@@ -395,16 +402,29 @@ _PyTime_Divide(const _PyTime_t t, const _PyTime_t k,
         return x;
     }
     else if (round == _PyTime_ROUND_CEILING) {
-        if (t >= 0)
+        if (t >= 0){
             return (t + k - 1) / k;
-        else
+        }
+        else{
             return t / k;
+        }
     }
-    else {
-        if (t >= 0)
+    else if (round == _PyTime_ROUND_FLOOR){
+        if (t >= 0) {
             return t / k;
-        else
+        }
+        else{
             return (t - (k - 1)) / k;
+        }
+    }
+    else {
+        assert(round == _PyTime_ROUND_UP);
+        if (t >= 0) {
+            return (t + k - 1) / k;
+        }
+        else {
+            return (t - (k - 1)) / k;
+        }
     }
 }
 


From webhook-mailer at python.org  Wed Oct 18 04:28:41 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 18 Oct 2017 08:28:41 -0000
Subject: [Python-checkins] [2.7] bpo-31786: Make functions in the select
 module blocking when timeout is a small negative value. (GH-4003). (#4031)
Message-ID: <mailman.86.1508315323.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/ed267e3305a54eddae8106bdaae2c62d4c3b7db6
commit: ed267e3305a54eddae8106bdaae2c62d4c3b7db6
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-18T11:28:35+03:00
summary:

[2.7] bpo-31786: Make functions in the select module blocking when timeout is a small negative value. (GH-4003). (#4031)

(cherry picked from commit 2c15b29aea5d6b9c61aa42d2c24a07ff1edb4b46)

files:
M Lib/test/test_poll.py

diff --git a/Lib/test/test_poll.py b/Lib/test/test_poll.py
index 1e195ed624d..14dbfcf47b2 100644
--- a/Lib/test/test_poll.py
+++ b/Lib/test/test_poll.py
@@ -205,6 +205,28 @@ def test_threaded_poll(self):
             os.write(w, b'spam')
             t.join()
 
+    @unittest.skipUnless(threading, 'Threading required for this test.')
+    @reap_threads
+    def test_poll_blocks_with_negative_ms(self):
+        for timeout_ms in [None, -1, -1.0]:
+            # Create two file descriptors. This will be used to unlock
+            # the blocking call to poll.poll inside the thread
+            r, w = os.pipe()
+            pollster = select.poll()
+            pollster.register(r, select.POLLIN)
+
+            poll_thread = threading.Thread(target=pollster.poll, args=(timeout_ms,))
+            poll_thread.start()
+            poll_thread.join(timeout=0.1)
+            self.assertTrue(poll_thread.is_alive())
+
+            # Write to the pipe so pollster.poll unblocks and the thread ends.
+            os.write(w, b'spam')
+            poll_thread.join()
+            self.assertFalse(poll_thread.is_alive())
+            os.close(r)
+            os.close(w)
+
 
 def test_main():
     run_unittest(PollTests)


From solipsis at pitrou.net  Wed Oct 18 05:07:11 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 18 Oct 2017 09:07:11 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=-1
Message-ID: <20171018090710.130119.E2F496F66B6ADBA2@psf.io>

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

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


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

From webhook-mailer at python.org  Wed Oct 18 05:10:03 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 18 Oct 2017 09:10:03 -0000
Subject: [Python-checkins] [3.6] bpo-31806: Use _PyTime_ROUND_TIMEOUT for
 the timeout argument parsing in more functions (GH-4026) (#4032)
Message-ID: <mailman.87.1508317804.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/be4e9cc769aac3cb46670c049b9f21e412be53d1
commit: be4e9cc769aac3cb46670c049b9f21e412be53d1
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-18T12:09:57+03:00
summary:

[3.6] bpo-31806: Use _PyTime_ROUND_TIMEOUT for the timeout argument parsing in more functions (GH-4026) (#4032)

Fix timeout rounding in time.sleep(), threading.Lock.acquire() and
socket.socket.settimeout() to round correctly negative timeouts between -1.0 and
0.0. The functions now block waiting for events as expected. Previously, the
call was incorrectly non-blocking.
(cherry picked from commit 59af94fa61bf90adbe624508e909b5d6ef6e8464)

files:
A Misc/NEWS.d/next/Library/2017-10-17-23-27-03.bpo-31806.TzphdL.rst
M Modules/_threadmodule.c
M Modules/socketmodule.c
M Modules/timemodule.c

diff --git a/Misc/NEWS.d/next/Library/2017-10-17-23-27-03.bpo-31806.TzphdL.rst b/Misc/NEWS.d/next/Library/2017-10-17-23-27-03.bpo-31806.TzphdL.rst
new file mode 100644
index 00000000000..941e77d5197
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-17-23-27-03.bpo-31806.TzphdL.rst
@@ -0,0 +1,4 @@
+Fix timeout rounding in time.sleep(), threading.Lock.acquire() and
+socket.socket.settimeout() to round correctly negative timeouts between -1.0 and
+0.0. The functions now block waiting for events as expected. Previously, the
+call was incorrectly non-blocking. Patch by Pablo Galindo.
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index 02195596093..47e84b9e916 100644
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -111,7 +111,7 @@ lock_acquire_parse_args(PyObject *args, PyObject *kwds,
 
     if (timeout_obj
         && _PyTime_FromSecondsObject(timeout,
-                                     timeout_obj, _PyTime_ROUND_CEILING) < 0)
+                                     timeout_obj, _PyTime_ROUND_TIMEOUT) < 0)
         return -1;
 
     if (!blocking && *timeout != unset_timeout ) {
@@ -129,7 +129,7 @@ lock_acquire_parse_args(PyObject *args, PyObject *kwds,
     else if (*timeout != unset_timeout) {
         _PyTime_t microseconds;
 
-        microseconds = _PyTime_AsMicroseconds(*timeout, _PyTime_ROUND_CEILING);
+        microseconds = _PyTime_AsMicroseconds(*timeout, _PyTime_ROUND_TIMEOUT);
         if (microseconds >= PY_TIMEOUT_MAX) {
             PyErr_SetString(PyExc_OverflowError,
                             "timeout value is too large");
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index a351faa7f9f..da84291edcf 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2454,7 +2454,7 @@ socket_parse_timeout(_PyTime_t *timeout, PyObject *timeout_obj)
     }
 
     if (_PyTime_FromSecondsObject(timeout,
-                                  timeout_obj, _PyTime_ROUND_CEILING) < 0)
+                                  timeout_obj, _PyTime_ROUND_TIMEOUT) < 0)
         return -1;
 
     if (*timeout < 0) {
@@ -2463,10 +2463,10 @@ socket_parse_timeout(_PyTime_t *timeout, PyObject *timeout_obj)
     }
 
 #ifdef MS_WINDOWS
-    overflow |= (_PyTime_AsTimeval(*timeout, &tv, _PyTime_ROUND_CEILING) < 0);
+    overflow |= (_PyTime_AsTimeval(*timeout, &tv, _PyTime_ROUND_TIMEOUT) < 0);
 #endif
 #ifndef HAVE_POLL
-    ms = _PyTime_AsMilliseconds(*timeout, _PyTime_ROUND_CEILING);
+    ms = _PyTime_AsMilliseconds(*timeout, _PyTime_ROUND_TIMEOUT);
     overflow |= (ms > INT_MAX);
 #endif
     if (overflow) {
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 0abe569f137..dba3d0452ac 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -225,7 +225,7 @@ static PyObject *
 time_sleep(PyObject *self, PyObject *obj)
 {
     _PyTime_t secs;
-    if (_PyTime_FromSecondsObject(&secs, obj, _PyTime_ROUND_CEILING))
+    if (_PyTime_FromSecondsObject(&secs, obj, _PyTime_ROUND_TIMEOUT))
         return NULL;
     if (secs < 0) {
         PyErr_SetString(PyExc_ValueError,


From webhook-mailer at python.org  Wed Oct 18 08:04:09 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 18 Oct 2017 12:04:09 -0000
Subject: [Python-checkins] [2.7] bpo-31334: Fix timeout in
 select.poll.poll() (GH-3277) (#4034)
Message-ID: <mailman.88.1508328251.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/27b951c63353345cdf7a9a8c4c8133a5dafd6a80
commit: 27b951c63353345cdf7a9a8c4c8133a5dafd6a80
branch: 2.7
author: Riccardo Coccioli <volans- at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-18T15:04:04+03:00
summary:

[2.7] bpo-31334: Fix timeout in select.poll.poll() (GH-3277) (#4034)

Always pass -1, or INFTIM where defined, to the poll() system call when
a negative timeout is passed to the poll.poll([timeout]) method in the
select module. Various OSes throw an error with arbitrary negative
values..
(cherry picked from commit 6cfa927ceb931ad968b5b03e4a2bffb64a8a0604)

files:
A Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst
M Lib/test/test_poll.py
M Misc/ACKS
M Modules/selectmodule.c

diff --git a/Lib/test/test_poll.py b/Lib/test/test_poll.py
index 14dbfcf47b2..7ad693d319f 100644
--- a/Lib/test/test_poll.py
+++ b/Lib/test/test_poll.py
@@ -208,7 +208,7 @@ def test_threaded_poll(self):
     @unittest.skipUnless(threading, 'Threading required for this test.')
     @reap_threads
     def test_poll_blocks_with_negative_ms(self):
-        for timeout_ms in [None, -1, -1.0]:
+        for timeout_ms in [None, -1000, -1, -1.0]:
             # Create two file descriptors. This will be used to unlock
             # the blocking call to poll.poll inside the thread
             r, w = os.pipe()
diff --git a/Misc/ACKS b/Misc/ACKS
index 688cd470d20..e076c32b14d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -262,6 +262,7 @@ Brad Clements
 Robbie Clemons
 Steve Clift
 Herv? Coatanhay
+Riccardo Coccioli
 Nick Coghlan
 Josh Cogliati
 Dave Cole
diff --git a/Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst b/Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst
new file mode 100644
index 00000000000..1cbfd2531bc
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst
@@ -0,0 +1,3 @@
+Fix ``poll.poll([timeout])`` in the ``select`` module for arbitrary negative
+timeouts on all OSes where it can only be a non-negative integer or -1.
+Patch by Riccardo Coccioli.
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index a38aa08798c..ce4c15b6946 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -530,6 +530,17 @@ poll_poll(pollObject *self, PyObject *args)
             return NULL;
     }
 
+    /* On some OSes, typically BSD-based ones, the timeout parameter of the
+       poll() syscall, when negative, must be exactly INFTIM, where defined,
+       or -1. See issue 31334. */
+    if (timeout < 0) {
+#ifdef INFTIM
+        timeout = INFTIM;
+#else
+        timeout = -1;
+#endif
+    }
+
     /* Avoid concurrent poll() invocation, issue 8865 */
     if (self->poll_running) {
         PyErr_SetString(PyExc_RuntimeError,


From webhook-mailer at python.org  Wed Oct 18 08:05:19 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 18 Oct 2017 12:05:19 -0000
Subject: [Python-checkins] [3.6] bpo-31334: Fix timeout in
 select.poll.poll() (GH-3277) (#4033)
Message-ID: <mailman.89.1508328321.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/97abcabc195b87d6a5562dbb867a469fac27d3f6
commit: 97abcabc195b87d6a5562dbb867a469fac27d3f6
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-18T15:05:16+03:00
summary:

[3.6] bpo-31334: Fix timeout in select.poll.poll() (GH-3277) (#4033)

Always pass -1, or INFTIM where defined, to the poll() system call when
a negative timeout is passed to the poll.poll([timeout]) method in the
select module. Various OSes throw an error with arbitrary negative
values.
(cherry picked from commit 6cfa927ceb931ad968b5b03e4a2bffb64a8a0604)

files:
A Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst
M Lib/test/test_poll.py
M Misc/ACKS
M Modules/selectmodule.c

diff --git a/Lib/test/test_poll.py b/Lib/test/test_poll.py
index 2a393601131..e8725c3df8f 100644
--- a/Lib/test/test_poll.py
+++ b/Lib/test/test_poll.py
@@ -211,7 +211,7 @@ def test_threaded_poll(self):
     @unittest.skipUnless(threading, 'Threading required for this test.')
     @reap_threads
     def test_poll_blocks_with_negative_ms(self):
-        for timeout_ms in [None, -1, -1.0, -0.1, -1e-100]:
+        for timeout_ms in [None, -1000, -1, -1.0, -0.1, -1e-100]:
             # Create two file descriptors. This will be used to unlock
             # the blocking call to poll.poll inside the thread
             r, w = os.pipe()
diff --git a/Misc/ACKS b/Misc/ACKS
index c9dbf9f5560..a956acd6ecf 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -290,6 +290,7 @@ Brad Clements
 Robbie Clemons
 Steve Clift
 Herv? Coatanhay
+Riccardo Coccioli
 Nick Coghlan
 Josh Cogliati
 Dave Cole
diff --git a/Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst b/Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst
new file mode 100644
index 00000000000..1cbfd2531bc
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst
@@ -0,0 +1,3 @@
+Fix ``poll.poll([timeout])`` in the ``select`` module for arbitrary negative
+timeouts on all OSes where it can only be a non-negative integer or -1.
+Patch by Riccardo Coccioli.
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 9ae583be244..1de8bf7e4d5 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -528,20 +528,14 @@ poll_poll(pollObject *self, PyObject *args)
     PyObject *result_list = NULL, *timeout_obj = NULL;
     int poll_result, i, j;
     PyObject *value = NULL, *num = NULL;
-    _PyTime_t timeout, ms, deadline;
+    _PyTime_t timeout = -1, ms = -1, deadline = 0;
     int async_err = 0;
 
     if (!PyArg_ParseTuple(args, "|O:poll", &timeout_obj)) {
         return NULL;
     }
 
-    /* Check values for timeout */
-    if (timeout_obj == NULL || timeout_obj == Py_None) {
-        timeout = -1;
-        ms = -1;
-        deadline = 0;   /* initialize to prevent gcc warning */
-    }
-    else {
+    if (timeout_obj != NULL && timeout_obj != Py_None) {
         if (_PyTime_FromMillisecondsObject(&timeout, timeout_obj,
                                            _PyTime_ROUND_TIMEOUT) < 0) {
             if (PyErr_ExceptionMatches(PyExc_TypeError)) {
@@ -557,7 +551,20 @@ poll_poll(pollObject *self, PyObject *args)
             return NULL;
         }
 
-        deadline = _PyTime_GetMonotonicClock() + timeout;
+        if (timeout >= 0) {
+            deadline = _PyTime_GetMonotonicClock() + timeout;
+        }
+    }
+
+    /* On some OSes, typically BSD-based ones, the timeout parameter of the
+       poll() syscall, when negative, must be exactly INFTIM, where defined,
+       or -1. See issue 31334. */
+    if (ms < 0) {
+#ifdef INFTIM
+        ms = INFTIM;
+#else
+        ms = -1;
+#endif
     }
 
     /* Avoid concurrent poll() invocation, issue 8865 */


From webhook-mailer at python.org  Wed Oct 18 13:01:26 2017
From: webhook-mailer at python.org (Mariatta)
Date: Wed, 18 Oct 2017 17:01:26 -0000
Subject: [Python-checkins] Update TestCase.assertAlmostEqual and
 assertNotAlmostEqual docstrings. (GH-3998)
Message-ID: <mailman.90.1508346086.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/032a6480e360427d4f964e31643604fad804ea14
commit: 032a6480e360427d4f964e31643604fad804ea14
branch: master
author: Ron <RonVisbord at Gmail.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-10-18T10:01:23-07:00
summary:

Update TestCase.assertAlmostEqual and assertNotAlmostEqual docstrings. (GH-3998)

The word "difference" from missing the sentence.
This clarifies that it compares the difference between the two objects.

files:
M Lib/unittest/case.py

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index c48a63c575f..c0170d18257 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -852,7 +852,8 @@ def assertAlmostEqual(self, first, second, places=None, msg=None,
         """Fail if the two objects are unequal as determined by their
            difference rounded to the given number of decimal places
            (default 7) and comparing to zero, or by comparing that the
-           between the two objects is more than the given delta.
+           difference between the two objects is more than the given
+           delta.
 
            Note that decimal places (from zero) are usually not the same
            as significant digits (measured from the most significant digit).
@@ -896,7 +897,7 @@ def assertNotAlmostEqual(self, first, second, places=None, msg=None,
         """Fail if the two objects are equal as determined by their
            difference rounded to the given number of decimal places
            (default 7) and comparing to zero, or by comparing that the
-           between the two objects is less than the given delta.
+           difference between the two objects is less than the given delta.
 
            Note that decimal places (from zero) are usually not the same
            as significant digits (measured from the most significant digit).


From webhook-mailer at python.org  Wed Oct 18 13:30:10 2017
From: webhook-mailer at python.org (Mariatta)
Date: Wed, 18 Oct 2017 17:30:10 -0000
Subject: [Python-checkins] Update TestCase.assertAlmostEqual and
 assertNotAlmostEqual docstrings. (GH-3998) (GH-4040)
Message-ID: <mailman.91.1508347812.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/8fa0648f89e31f3e4b6f47435198ecf57e86b8b0
commit: 8fa0648f89e31f3e4b6f47435198ecf57e86b8b0
branch: 2.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-10-18T10:30:05-07:00
summary:

Update TestCase.assertAlmostEqual and assertNotAlmostEqual docstrings. (GH-3998) (GH-4040)

The word "difference" from missing the sentence.
This clarifies that it compares the difference between the two objects.
(cherry picked from commit 032a6480e360427d4f964e31643604fad804ea14)

files:
M Lib/unittest/case.py

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 8f4610145ac..a3f75af5279 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -526,7 +526,8 @@ def assertAlmostEqual(self, first, second, places=None, msg=None, delta=None):
         """Fail if the two objects are unequal as determined by their
            difference rounded to the given number of decimal places
            (default 7) and comparing to zero, or by comparing that the
-           between the two objects is more than the given delta.
+           difference between the two objects is more than the given
+           delta.
 
            Note that decimal places (from zero) are usually not the same
            as significant digits (measured from the most significant digit).
@@ -564,7 +565,7 @@ def assertNotAlmostEqual(self, first, second, places=None, msg=None, delta=None)
         """Fail if the two objects are equal as determined by their
            difference rounded to the given number of decimal places
            (default 7) and comparing to zero, or by comparing that the
-           between the two objects is less than the given delta.
+           difference between the two objects is less than the given delta.
 
            Note that decimal places (from zero) are usually not the same
            as significant digits (measured from the most significant digit).


From webhook-mailer at python.org  Wed Oct 18 13:34:30 2017
From: webhook-mailer at python.org (Mariatta)
Date: Wed, 18 Oct 2017 17:34:30 -0000
Subject: [Python-checkins] Update TestCase.assertAlmostEqual and
 assertNotAlmostEqual docstrings. (GH-3998) (GH-4039)
Message-ID: <mailman.92.1508348071.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/7bbbc6afa4f500ffbd7bfc25dbabf85548421fff
commit: 7bbbc6afa4f500ffbd7bfc25dbabf85548421fff
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-10-18T10:34:27-07:00
summary:

Update TestCase.assertAlmostEqual and assertNotAlmostEqual docstrings. (GH-3998) (GH-4039)

The word "difference" from missing the sentence.
This clarifies that it compares the difference between the two objects.
(cherry picked from commit 032a6480e360427d4f964e31643604fad804ea14)

files:
M Lib/unittest/case.py

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index f4dbc52852d..c3634ec997f 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -842,7 +842,8 @@ def assertAlmostEqual(self, first, second, places=None, msg=None,
         """Fail if the two objects are unequal as determined by their
            difference rounded to the given number of decimal places
            (default 7) and comparing to zero, or by comparing that the
-           between the two objects is more than the given delta.
+           difference between the two objects is more than the given
+           delta.
 
            Note that decimal places (from zero) are usually not the same
            as significant digits (measured from the most significant digit).
@@ -881,7 +882,7 @@ def assertNotAlmostEqual(self, first, second, places=None, msg=None,
         """Fail if the two objects are equal as determined by their
            difference rounded to the given number of decimal places
            (default 7) and comparing to zero, or by comparing that the
-           between the two objects is less than the given delta.
+           difference between the two objects is less than the given delta.
 
            Note that decimal places (from zero) are usually not the same
            as significant digits (measured from the most significant digit).


From lp_benchmark_robot at intel.com  Wed Oct 18 16:54:43 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Wed, 18 Oct 2017 13:54:43 -0700
Subject: [Python-checkins] [3 down, 1 up,
 61 flat] Results for Python (master branch) 2017-10-18
Message-ID: <81591441-074d-42e6-a7eb-6e0cab162aac@orsmsx153.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-18 03:03:14-07:00.
  - commit:		59af94f
  - previous commit:	2bd37c2
  - revision date:	2017-10-18 10:13:09+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.143% |  -0.014%   |  +4.815%   |  +8.359%   |
+-----+------------------------+--------+------------+------------+------------+
| :-( |             call_method| 0.523% |  -2.369%   |  +18.395%  |  +14.032%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 0.663% |  -1.673%   |  +19.529%  |  +14.936%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( |     call_method_unknown| 0.611% |  -3.013%   |  +18.432%  |  +12.935%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.202% |  -0.809%   |  +3.563%   |  +12.445%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.656% |  -0.646%   |  +9.660%   |  +9.733%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.678% |  +0.334%   |  +7.271%   |  +10.391%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.725% |  -0.797%   |  +3.628%   |  +7.005%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 2.982% |  -1.547%   |  +2.345%   |  +23.926%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 5.105% |  +3.432%   |  +9.341%   |  +13.163%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.091% |  -0.102%   |  +4.478%   |  +6.371%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.567% |  -0.886%   |  +6.383%   |  +3.396%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.458% |  -0.515%   |  +3.135%   |  +7.083%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.298% |  +0.511%   |  +8.841%   |  +11.155%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.604% |  -2.109%   |  +5.394%   |  +11.286%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.879% |  -0.509%   |  +5.563%   |  +11.185%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.918% |  +0.360%   |  +9.163%   |  +10.153%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 3.001% |  -0.017%   |  +8.909%   |  +8.882%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.249% |  -0.791%   |  +3.340%   |  +8.400%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |              json_loads| 1.203% |  +5.264%   |  +3.456%   |  +9.525%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.896% |  -1.188%   |  +8.492%   |  +11.015%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.771% |  +0.230%   |  +46.154%  |  +11.920%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 2.077% |  -1.939%   |  +8.358%   |  +13.195%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.628% |  +0.067%   |  +17.603%  |  +11.953%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 1.682% |  -0.384%   |  +8.857%   |  +10.169%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.971% |  +1.315%   |  +3.591%   |  +4.569%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.680% |  +1.973%   |  -0.113%   |  -0.050%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.825% |  +0.558%   |  +2.465%   |  +7.709%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.454% |  +0.173%   |  +5.161%   |  +10.903%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.426% |  -0.548%   |  -0.794%   |  +22.089%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.860% |  +1.763%   |  +4.833%   |  +16.159%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.632% |  +1.256%   |  +5.845%   |  +14.503%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 5.443% |  +0.301%   |  +11.654%  |  +9.467%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.049% |  +0.140%   |  +0.358%   |  +9.774%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.125% |  -0.134%   |  +10.889%  |  +5.056%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.092% |  -0.089%   |  +2.242%   |  +5.018%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 2.553% |  -1.712%   |  +8.329%   |  +15.273%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.429% |  +0.815%   |  +4.500%   |  +10.677%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 1.400% |  -0.264%   |  +1.947%   |  +7.757%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.600% |  -0.302%   |  -1.928%   |  +5.245%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 2.818% |  +0.587%   |  +9.430%   |  +2.962%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.141% |  -1.436%   |  +6.828%   |  +15.334%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.341% |  -0.669%   |  +2.639%   |  +0.264%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 0.911% |  +0.514%   |  +27.360%  |  +5.521%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.394% |  +0.110%   |  +4.392%   |  +7.070%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 1.710% |  +0.136%   |  +14.884%  |  +9.133%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 1.766% |  +1.574%   |  +2.119%   |  -0.590%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.417% |  +0.553%   |  +6.684%   |  +0.530%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.058% |  +0.088%   |  +6.835%   |  +9.161%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.231% |  -0.233%   |  +6.293%   |  +5.478%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 5.365% |  -0.021%   |  +19.090%  |  +8.132%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.697% |  +2.172%   |  +11.756%  |  +8.140%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.820% |  +0.326%   |  +10.101%  |  +6.910%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 5.087% |  +1.558%   |  +10.410%  |  +10.436%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.442% |  -0.149%   |  +11.652%  |  +11.332%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 6.718% |  +0.729%   |  +22.740%  |  +7.323%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 0.977% |  +0.365%   |  +6.328%   |  +6.508%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 0.794% |  -0.416%   |  +2.145%   |  -1.263%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 8.450% |  -1.907%   |  +7.769%   |  +21.019%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( |           unpickle_list| 1.010% |  -2.982%   |  -1.985%   |  +18.862%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 1.122% |  -0.363%   |  +8.129%   |  +4.899%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 0.951% |  +0.392%   |  +6.032%   |  +6.359%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.415% |  -0.699%   |  +0.872%   |  +8.104%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 4.556% |  -1.336%   |  -10.427%  |  +14.549%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 2.080% |  +0.062%   |  +5.553%   |  +8.577%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/3-down-1-up-61-flat-results-for-python-master-branch-2017-10-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  Wed Oct 18 20:28:59 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Thu, 19 Oct 2017 00:28:59 -0000
Subject: [Python-checkins] bpo-31457: Make the `LoggerAdapter.manager`
 property settable (#4042)
Message-ID: <mailman.93.1508372940.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/0b6a118a45ac2eded1348fea6ed300d5651f7471
commit: 0b6a118a45ac2eded1348fea6ed300d5651f7471
branch: master
author: ?ukasz Langa <lukasz at langa.pl>
committer: GitHub <noreply at github.com>
date: 2017-10-18T17:28:51-07:00
summary:

bpo-31457: Make the `LoggerAdapter.manager` property settable (#4042)

Due to a bug in the initial fix, the setter was in fact creating a different
property.  This is now fixed.

files:
A Misc/NEWS.d/next/Library/2017-10-18-16-48-09.bpo-31457._ovmzp.rst
M Lib/logging/__init__.py
M Lib/test/test_logging.py

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index b941eab97d6..75441906608 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1757,7 +1757,7 @@ def manager(self):
         return self.logger.manager
 
     @manager.setter
-    def set_manager(self, value):
+    def manager(self, value):
         self.logger.manager = value
 
     def __repr__(self):
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index fb0de9de046..583394cc73f 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -3982,12 +3982,25 @@ def test_nested(self):
         msg = 'Adapters can be nested, yo.'
         adapter_adapter = logging.LoggerAdapter(logger=self.adapter, extra=None)
         adapter_adapter.log(logging.CRITICAL, msg, self.recording)
-
         self.assertEqual(len(self.recording.records), 1)
         record = self.recording.records[0]
         self.assertEqual(record.levelno, logging.CRITICAL)
         self.assertEqual(record.msg, msg)
         self.assertEqual(record.args, (self.recording,))
+        orig_manager = adapter_adapter.manager
+        self.assertIs(self.adapter.manager, orig_manager)
+        self.assertIs(self.logger.manager, orig_manager)
+        temp_manager = object()
+        try:
+            adapter_adapter.manager = temp_manager
+            self.assertIs(adapter_adapter.manager, temp_manager)
+            self.assertIs(self.adapter.manager, temp_manager)
+            self.assertIs(self.logger.manager, temp_manager)
+        finally:
+            adapter_adapter.manager = orig_manager
+        self.assertIs(adapter_adapter.manager, orig_manager)
+        self.assertIs(self.adapter.manager, orig_manager)
+        self.assertIs(self.logger.manager, orig_manager)
 
 
 class LoggerTest(BaseTest):
diff --git a/Misc/NEWS.d/next/Library/2017-10-18-16-48-09.bpo-31457._ovmzp.rst b/Misc/NEWS.d/next/Library/2017-10-18-16-48-09.bpo-31457._ovmzp.rst
new file mode 100644
index 00000000000..1a59dce39a5
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-18-16-48-09.bpo-31457._ovmzp.rst
@@ -0,0 +1 @@
+The ``manager`` property on LoggerAdapter objects is now properly settable.


From webhook-mailer at python.org  Wed Oct 18 20:44:25 2017
From: webhook-mailer at python.org (Nick Coghlan)
Date: Thu, 19 Oct 2017 00:44:25 -0000
Subject: [Python-checkins] Move opcode tracing to occur after the possible
 update to f_lineno. (GH-3798)
Message-ID: <mailman.94.1508373866.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/20faa68bbb912a7b7b056477f5966eff51ff0a65
commit: 20faa68bbb912a7b7b056477f5966eff51ff0a65
branch: master
author: George King <george.w.king at gmail.com>
committer: Nick Coghlan <ncoghlan at gmail.com>
date: 2017-10-19T10:44:22+10:00
summary:

Move opcode tracing to occur after the possible update to f_lineno. (GH-3798)

files:
M Python/ceval.c

diff --git a/Python/ceval.c b/Python/ceval.c
index 86ffec42b31..0f7a40c45ce 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4416,10 +4416,6 @@ maybe_call_line_trace(Py_tracefunc func, PyObject *obj,
         *instr_lb = bounds.ap_lower;
         *instr_ub = bounds.ap_upper;
     }
-    /* Always emit an opcode event if we're tracing all opcodes. */
-    if (frame->f_trace_opcodes) {
-        result = call_trace(func, obj, tstate, frame, PyTrace_OPCODE, Py_None);
-    }
     /* If the last instruction falls at the start of a line or if it
        represents a jump backwards, update the frame's line number and
        then call the trace function if we're tracing source lines.
@@ -4430,6 +4426,10 @@ maybe_call_line_trace(Py_tracefunc func, PyObject *obj,
             result = call_trace(func, obj, tstate, frame, PyTrace_LINE, Py_None);
         }
     }
+    /* Always emit an opcode event if we're tracing all opcodes. */
+    if (frame->f_trace_opcodes) {
+        result = call_trace(func, obj, tstate, frame, PyTrace_OPCODE, Py_None);
+    }
     *instr_prev = frame->f_lasti;
     return result;
 }


From webhook-mailer at python.org  Wed Oct 18 21:03:01 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Thu, 19 Oct 2017 01:03:01 -0000
Subject: [Python-checkins] [3.6] bpo-31457: Make the `LoggerAdapter.manager`
 property settable (GH-4042) (#4043)
Message-ID: <mailman.95.1508374984.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/537ed75291ed8a640887f199f98e2e5076ef87b6
commit: 537ed75291ed8a640887f199f98e2e5076ef87b6
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ?ukasz Langa <lukasz at langa.pl>
date: 2017-10-18T18:02:59-07:00
summary:

[3.6] bpo-31457: Make the `LoggerAdapter.manager` property settable (GH-4042) (#4043)

Due to a bug in the initial fix, the setter was in fact creating a different
property.  This is now fixed.
(cherry picked from commit 0b6a118a45ac2eded1348fea6ed300d5651f7471)

files:
A Misc/NEWS.d/next/Library/2017-10-18-16-48-09.bpo-31457._ovmzp.rst
M Lib/logging/__init__.py
M Lib/test/test_logging.py

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 0965536797d..d363af5a1a8 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1715,7 +1715,7 @@ def manager(self):
         return self.logger.manager
 
     @manager.setter
-    def set_manager(self, value):
+    def manager(self, value):
         self.logger.manager = value
 
     def __repr__(self):
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 25046c3c38a..f0e2437b285 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -3959,12 +3959,25 @@ def test_nested(self):
         msg = 'Adapters can be nested, yo.'
         adapter_adapter = logging.LoggerAdapter(logger=self.adapter, extra=None)
         adapter_adapter.log(logging.CRITICAL, msg, self.recording)
-
         self.assertEqual(len(self.recording.records), 1)
         record = self.recording.records[0]
         self.assertEqual(record.levelno, logging.CRITICAL)
         self.assertEqual(record.msg, msg)
         self.assertEqual(record.args, (self.recording,))
+        orig_manager = adapter_adapter.manager
+        self.assertIs(self.adapter.manager, orig_manager)
+        self.assertIs(self.logger.manager, orig_manager)
+        temp_manager = object()
+        try:
+            adapter_adapter.manager = temp_manager
+            self.assertIs(adapter_adapter.manager, temp_manager)
+            self.assertIs(self.adapter.manager, temp_manager)
+            self.assertIs(self.logger.manager, temp_manager)
+        finally:
+            adapter_adapter.manager = orig_manager
+        self.assertIs(adapter_adapter.manager, orig_manager)
+        self.assertIs(self.adapter.manager, orig_manager)
+        self.assertIs(self.logger.manager, orig_manager)
 
 
 class LoggerTest(BaseTest):
diff --git a/Misc/NEWS.d/next/Library/2017-10-18-16-48-09.bpo-31457._ovmzp.rst b/Misc/NEWS.d/next/Library/2017-10-18-16-48-09.bpo-31457._ovmzp.rst
new file mode 100644
index 00000000000..1a59dce39a5
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-18-16-48-09.bpo-31457._ovmzp.rst
@@ -0,0 +1 @@
+The ``manager`` property on LoggerAdapter objects is now properly settable.


From webhook-mailer at python.org  Thu Oct 19 02:39:04 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Thu, 19 Oct 2017 06:39:04 -0000
Subject: [Python-checkins] drop unused configure check for pthread_atfork
 (#4046)
Message-ID: <mailman.96.1508395146.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/24c4d046c492d598d32982194c84db236ccf9793
commit: 24c4d046c492d598d32982194c84db236ccf9793
branch: master
author: Benjamin Peterson <benjamin at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-18T23:39:01-07:00
summary:

drop unused configure check for pthread_atfork (#4046)

files:
M configure
M configure.ac
M pyconfig.h.in

diff --git a/configure b/configure
index 324c0347060..aa605d2f694 100755
--- a/configure
+++ b/configure
@@ -10541,17 +10541,6 @@ $as_echo "#define HAVE_BROKEN_PTHREAD_SIGMASK 1" >>confdefs.h
 fi
 done
 
-      for ac_func in pthread_atfork
-do :
-  ac_fn_c_check_func "$LINENO" "pthread_atfork" "ac_cv_func_pthread_atfork"
-if test "x$ac_cv_func_pthread_atfork" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_ATFORK 1
-_ACEOF
-
-fi
-done
-
       for ac_func in pthread_getcpuclockid
 do :
   ac_fn_c_check_func "$LINENO" "pthread_getcpuclockid" "ac_cv_func_pthread_getcpuclockid"
diff --git a/configure.ac b/configure.ac
index bf2b7c07534..a5b9967a5e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3043,7 +3043,6 @@ if test "$posix_threads" = "yes"; then
             [Define if pthread_sigmask() does not work on your system.])
             ;;
         esac])
-      AC_CHECK_FUNCS(pthread_atfork)
       AC_CHECK_FUNCS(pthread_getcpuclockid)
 fi
 
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 7f0c6b33a95..662c42e047c 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -688,9 +688,6 @@
 /* Define if your compiler supports function prototype */
 #undef HAVE_PROTOTYPES
 
-/* Define to 1 if you have the `pthread_atfork' function. */
-#undef HAVE_PTHREAD_ATFORK
-
 /* Defined for Solaris 2.6 bug in pthread header. */
 #undef HAVE_PTHREAD_DESTRUCTOR
 


From webhook-mailer at python.org  Thu Oct 19 03:42:06 2017
From: webhook-mailer at python.org (Nick Coghlan)
Date: Thu, 19 Oct 2017 07:42:06 -0000
Subject: [Python-checkins] Add NEWS entry for opcode tracing change.
 (GH-4045)
Message-ID: <mailman.97.1508398928.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/05a634b12a8207611ae8e9d051427d615fcacb69
commit: 05a634b12a8207611ae8e9d051427d615fcacb69
branch: master
author: George King <george.w.king at gmail.com>
committer: Nick Coghlan <ncoghlan at gmail.com>
date: 2017-10-19T17:41:59+10:00
summary:

Add NEWS entry for opcode tracing change. (GH-4045)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-18-19-41-12.bpo-31618.liLDiS.rst

diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-18-19-41-12.bpo-31618.liLDiS.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-18-19-41-12.bpo-31618.liLDiS.rst
new file mode 100644
index 00000000000..5a8d3418a79
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-18-19-41-12.bpo-31618.liLDiS.rst	
@@ -0,0 +1,7 @@
+The per-frame tracing logic added in 3.7a1 has been altered so that
+``frame->f_lineno`` is updated before either ``"line"`` or ``"opcode"``
+events are emitted. Previously, opcode events were emitted first, and
+therefore would occasionally see stale line numbers on the frame. The
+behavior of this feature has changed slightly as a result: when both
+``f_trace_lines`` and ``f_trace_opcodes`` are enabled, line events now occur
+first.


From solipsis at pitrou.net  Thu Oct 19 05:07:09 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 19 Oct 2017 09:07:09 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=-3
Message-ID: <20171019090708.126157.B808CCB108F607E2@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 [0, 1, -2] memory blocks, sum=-1


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

From webhook-mailer at python.org  Thu Oct 19 13:25:01 2017
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Thu, 19 Oct 2017 17:25:01 -0000
Subject: [Python-checkins] bpo-31457: Don't omit inner ``process()`` calls
 with nested LogAdapters (#4044)
Message-ID: <mailman.98.1508433904.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/ce9e62544571e7ade7186697d5dd065fb4c5243f
commit: ce9e62544571e7ade7186697d5dd065fb4c5243f
branch: master
author: ?ukasz Langa <lukasz at langa.pl>
committer: GitHub <noreply at github.com>
date: 2017-10-19T10:24:55-07:00
summary:

bpo-31457: Don't omit inner ``process()`` calls with nested LogAdapters (#4044)

This used to be the case on Python 2.  Commit
212b590e118e3650b596917021ed9612a918180b changed the implementation for Python
3, making the `log()` method of LogAdapter call `logger._log()` directly.  This
makes nested log adapters not execute their ``process()`` method.  This patch
fixes the issue.

Also, now proxying `name`, too, to make `repr()` work with nested log adapters.

New tests added.

files:
A Misc/NEWS.d/next/Library/2017-10-18-19-05-17.bpo-31457.KlE6r8.rst
M Lib/logging/__init__.py
M Lib/test/test_logging.py

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 75441906608..9f2c0f0c58a 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1713,7 +1713,7 @@ def log(self, level, msg, *args, **kwargs):
         """
         if self.isEnabledFor(level):
             msg, kwargs = self.process(msg, kwargs)
-            self.logger._log(level, msg, args, **kwargs)
+            self.logger.log(level, msg, *args, **kwargs)
 
     def isEnabledFor(self, level):
         """
@@ -1760,6 +1760,10 @@ def manager(self):
     def manager(self, value):
         self.logger.manager = value
 
+    @property
+    def name(self):
+        return self.logger.name
+
     def __repr__(self):
         logger = self.logger
         level = getLevelName(logger.getEffectiveLevel())
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 583394cc73f..1968b4253c2 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -3904,7 +3904,6 @@ def test_critical(self):
 
 
 class LoggerAdapterTest(unittest.TestCase):
-
     def setUp(self):
         super(LoggerAdapterTest, self).setUp()
         old_handler_list = logging._handlerList[:]
@@ -3979,27 +3978,36 @@ def test_has_handlers(self):
         self.assertFalse(self.adapter.hasHandlers())
 
     def test_nested(self):
+        class Adapter(logging.LoggerAdapter):
+            prefix = 'Adapter'
+
+            def process(self, msg, kwargs):
+                return f"{self.prefix} {msg}", kwargs
+
         msg = 'Adapters can be nested, yo.'
-        adapter_adapter = logging.LoggerAdapter(logger=self.adapter, extra=None)
+        adapter = Adapter(logger=self.logger, extra=None)
+        adapter_adapter = Adapter(logger=adapter, extra=None)
+        adapter_adapter.prefix = 'AdapterAdapter'
+        self.assertEqual(repr(adapter), repr(adapter_adapter))
         adapter_adapter.log(logging.CRITICAL, msg, self.recording)
         self.assertEqual(len(self.recording.records), 1)
         record = self.recording.records[0]
         self.assertEqual(record.levelno, logging.CRITICAL)
-        self.assertEqual(record.msg, msg)
+        self.assertEqual(record.msg, f"Adapter AdapterAdapter {msg}")
         self.assertEqual(record.args, (self.recording,))
         orig_manager = adapter_adapter.manager
-        self.assertIs(self.adapter.manager, orig_manager)
+        self.assertIs(adapter.manager, orig_manager)
         self.assertIs(self.logger.manager, orig_manager)
         temp_manager = object()
         try:
             adapter_adapter.manager = temp_manager
             self.assertIs(adapter_adapter.manager, temp_manager)
-            self.assertIs(self.adapter.manager, temp_manager)
+            self.assertIs(adapter.manager, temp_manager)
             self.assertIs(self.logger.manager, temp_manager)
         finally:
             adapter_adapter.manager = orig_manager
         self.assertIs(adapter_adapter.manager, orig_manager)
-        self.assertIs(self.adapter.manager, orig_manager)
+        self.assertIs(adapter.manager, orig_manager)
         self.assertIs(self.logger.manager, orig_manager)
 
 
diff --git a/Misc/NEWS.d/next/Library/2017-10-18-19-05-17.bpo-31457.KlE6r8.rst b/Misc/NEWS.d/next/Library/2017-10-18-19-05-17.bpo-31457.KlE6r8.rst
new file mode 100644
index 00000000000..49463c4fd15
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-18-19-05-17.bpo-31457.KlE6r8.rst
@@ -0,0 +1,2 @@
+If nested log adapters are used, the inner ``process()`` methods are no
+longer omitted.


From webhook-mailer at python.org  Thu Oct 19 13:50:00 2017
From: webhook-mailer at python.org (Yury Selivanov)
Date: Thu, 19 Oct 2017 17:50:00 -0000
Subject: [Python-checkins] bpo-31632: fix set_protocol() in
 _SSLProtocolTransport (#3817) (#3817)
Message-ID: <mailman.99.1508435404.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/ea2ef5d0ca869d4550820ed53bdf56013dbb9546
commit: ea2ef5d0ca869d4550820ed53bdf56013dbb9546
branch: master
author: jlacoline <jean.lacoline at gmail.com>
committer: Yury Selivanov <yury at magic.io>
date: 2017-10-19T13:49:57-04:00
summary:

bpo-31632: fix set_protocol() in _SSLProtocolTransport (#3817) (#3817)

files:
A Misc/NEWS.d/next/Library/2017-10-04-11-37-14.bpo-31632.LiOC3C.rst
M Lib/asyncio/sslproto.py
M Lib/test/test_asyncio/test_sslproto.py
M Misc/ACKS

diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py
index 68499e5aeea..53e6d2b667b 100644
--- a/Lib/asyncio/sslproto.py
+++ b/Lib/asyncio/sslproto.py
@@ -293,11 +293,10 @@ def feed_appdata(self, data, offset=0):
 class _SSLProtocolTransport(transports._FlowControlMixin,
                             transports.Transport):
 
-    def __init__(self, loop, ssl_protocol, app_protocol):
+    def __init__(self, loop, ssl_protocol):
         self._loop = loop
         # SSLProtocol instance
         self._ssl_protocol = ssl_protocol
-        self._app_protocol = app_protocol
         self._closed = False
 
     def get_extra_info(self, name, default=None):
@@ -305,10 +304,10 @@ def get_extra_info(self, name, default=None):
         return self._ssl_protocol._get_extra_info(name, default)
 
     def set_protocol(self, protocol):
-        self._app_protocol = protocol
+        self._ssl_protocol._app_protocol = protocol
 
     def get_protocol(self):
-        return self._app_protocol
+        return self._ssl_protocol._app_protocol
 
     def is_closing(self):
         return self._closed
@@ -431,8 +430,7 @@ def __init__(self, loop, app_protocol, sslcontext, waiter,
         self._waiter = waiter
         self._loop = loop
         self._app_protocol = app_protocol
-        self._app_transport = _SSLProtocolTransport(self._loop,
-                                                    self, self._app_protocol)
+        self._app_transport = _SSLProtocolTransport(self._loop, self)
         # _SSLPipe instance (None until the connection is made)
         self._sslpipe = None
         self._session_established = False
diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index bcd236ea263..f573ae8fe77 100644
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -121,6 +121,14 @@ def test_get_extra_info_on_closed_connection(self):
         ssl_proto.connection_lost(None)
         self.assertIsNone(ssl_proto._get_extra_info('socket'))
 
+    def test_set_new_app_protocol(self):
+        waiter = asyncio.Future(loop=self.loop)
+        ssl_proto = self.ssl_protocol(waiter)
+        new_app_proto = asyncio.Protocol()
+        ssl_proto._app_transport.set_protocol(new_app_proto)
+        self.assertIs(ssl_proto._app_transport.get_protocol(), new_app_proto)
+        self.assertIs(ssl_proto._app_protocol, new_app_proto)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/Misc/ACKS b/Misc/ACKS
index f1130dcd6a4..7b174c63535 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -858,6 +858,7 @@ Vladimir Kushnir
 Erno Kuusela
 Ross Lagerwall
 Cameron Laird
+Lo?c Lajeanne
 David Lam
 Thomas Lamb
 Valerie Lambert
diff --git a/Misc/NEWS.d/next/Library/2017-10-04-11-37-14.bpo-31632.LiOC3C.rst b/Misc/NEWS.d/next/Library/2017-10-04-11-37-14.bpo-31632.LiOC3C.rst
new file mode 100644
index 00000000000..6178d0633ee
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-04-11-37-14.bpo-31632.LiOC3C.rst
@@ -0,0 +1,2 @@
+Fix method set_protocol() of class _SSLProtocolTransport in asyncio module.
+This method was previously modifying a wrong reference to the protocol.


From webhook-mailer at python.org  Thu Oct 19 14:11:52 2017
From: webhook-mailer at python.org (Mariatta)
Date: Thu, 19 Oct 2017 18:11:52 -0000
Subject: [Python-checkins] bpo-31457: Don't omit inner ``process()`` calls
 with nested LogAdapters (GH-4044) (GH-4050)
Message-ID: <mailman.100.1508436714.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/4d9a8f22999de489ede9216ff983d4359d837760
commit: 4d9a8f22999de489ede9216ff983d4359d837760
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-10-19T11:11:49-07:00
summary:

bpo-31457: Don't omit inner ``process()`` calls with nested LogAdapters (GH-4044) (GH-4050)

This used to be the case on Python 2.  Commit
212b590e118e3650b596917021ed9612a918180b changed the implementation for Python
3, making the `log()` method of LogAdapter call `logger._log()` directly.  This
makes nested log adapters not execute their ``process()`` method.  This patch
fixes the issue.

Also, now proxying `name`, too, to make `repr()` work with nested log adapters.

New tests added.
(cherry picked from commit ce9e62544571e7ade7186697d5dd065fb4c5243f)

files:
A Misc/NEWS.d/next/Library/2017-10-18-19-05-17.bpo-31457.KlE6r8.rst
M Lib/logging/__init__.py
M Lib/test/test_logging.py

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index d363af5a1a8..3617dbb6d99 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1669,7 +1669,7 @@ def log(self, level, msg, *args, **kwargs):
         """
         if self.isEnabledFor(level):
             msg, kwargs = self.process(msg, kwargs)
-            self.logger._log(level, msg, args, **kwargs)
+            self.logger.log(level, msg, *args, **kwargs)
 
     def isEnabledFor(self, level):
         """
@@ -1718,6 +1718,10 @@ def manager(self):
     def manager(self, value):
         self.logger.manager = value
 
+    @property
+    def name(self):
+        return self.logger.name
+
     def __repr__(self):
         logger = self.logger
         level = getLevelName(logger.getEffectiveLevel())
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index f0e2437b285..b325f7697f7 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -3881,7 +3881,6 @@ def test_critical(self):
 
 
 class LoggerAdapterTest(unittest.TestCase):
-
     def setUp(self):
         super(LoggerAdapterTest, self).setUp()
         old_handler_list = logging._handlerList[:]
@@ -3956,27 +3955,36 @@ def test_has_handlers(self):
         self.assertFalse(self.adapter.hasHandlers())
 
     def test_nested(self):
+        class Adapter(logging.LoggerAdapter):
+            prefix = 'Adapter'
+
+            def process(self, msg, kwargs):
+                return f"{self.prefix} {msg}", kwargs
+
         msg = 'Adapters can be nested, yo.'
-        adapter_adapter = logging.LoggerAdapter(logger=self.adapter, extra=None)
+        adapter = Adapter(logger=self.logger, extra=None)
+        adapter_adapter = Adapter(logger=adapter, extra=None)
+        adapter_adapter.prefix = 'AdapterAdapter'
+        self.assertEqual(repr(adapter), repr(adapter_adapter))
         adapter_adapter.log(logging.CRITICAL, msg, self.recording)
         self.assertEqual(len(self.recording.records), 1)
         record = self.recording.records[0]
         self.assertEqual(record.levelno, logging.CRITICAL)
-        self.assertEqual(record.msg, msg)
+        self.assertEqual(record.msg, f"Adapter AdapterAdapter {msg}")
         self.assertEqual(record.args, (self.recording,))
         orig_manager = adapter_adapter.manager
-        self.assertIs(self.adapter.manager, orig_manager)
+        self.assertIs(adapter.manager, orig_manager)
         self.assertIs(self.logger.manager, orig_manager)
         temp_manager = object()
         try:
             adapter_adapter.manager = temp_manager
             self.assertIs(adapter_adapter.manager, temp_manager)
-            self.assertIs(self.adapter.manager, temp_manager)
+            self.assertIs(adapter.manager, temp_manager)
             self.assertIs(self.logger.manager, temp_manager)
         finally:
             adapter_adapter.manager = orig_manager
         self.assertIs(adapter_adapter.manager, orig_manager)
-        self.assertIs(self.adapter.manager, orig_manager)
+        self.assertIs(adapter.manager, orig_manager)
         self.assertIs(self.logger.manager, orig_manager)
 
 
diff --git a/Misc/NEWS.d/next/Library/2017-10-18-19-05-17.bpo-31457.KlE6r8.rst b/Misc/NEWS.d/next/Library/2017-10-18-19-05-17.bpo-31457.KlE6r8.rst
new file mode 100644
index 00000000000..49463c4fd15
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-18-19-05-17.bpo-31457.KlE6r8.rst
@@ -0,0 +1,2 @@
+If nested log adapters are used, the inner ``process()`` methods are no
+longer omitted.


From webhook-mailer at python.org  Thu Oct 19 14:12:47 2017
From: webhook-mailer at python.org (Yury Selivanov)
Date: Thu, 19 Oct 2017 18:12:47 -0000
Subject: [Python-checkins] bpo-31632: fix set_protocol() in
 _SSLProtocolTransport (GH-3817) (GH-3817) (#4052)
Message-ID: <mailman.101.1508436768.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/9c23b173b823b5e6da01d85c570c7ae2ab07b38b
commit: 9c23b173b823b5e6da01d85c570c7ae2ab07b38b
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Yury Selivanov <yury at magic.io>
date: 2017-10-19T14:12:44-04:00
summary:

bpo-31632: fix set_protocol() in _SSLProtocolTransport (GH-3817) (GH-3817) (#4052)

(cherry picked from commit ea2ef5d0ca869d4550820ed53bdf56013dbb9546)

files:
A Misc/NEWS.d/next/Library/2017-10-04-11-37-14.bpo-31632.LiOC3C.rst
M Lib/asyncio/sslproto.py
M Lib/test/test_asyncio/test_sslproto.py
M Misc/ACKS

diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py
index 7948c4c3b4e..f4d8a484182 100644
--- a/Lib/asyncio/sslproto.py
+++ b/Lib/asyncio/sslproto.py
@@ -294,11 +294,10 @@ def feed_appdata(self, data, offset=0):
 class _SSLProtocolTransport(transports._FlowControlMixin,
                             transports.Transport):
 
-    def __init__(self, loop, ssl_protocol, app_protocol):
+    def __init__(self, loop, ssl_protocol):
         self._loop = loop
         # SSLProtocol instance
         self._ssl_protocol = ssl_protocol
-        self._app_protocol = app_protocol
         self._closed = False
 
     def get_extra_info(self, name, default=None):
@@ -306,10 +305,10 @@ def get_extra_info(self, name, default=None):
         return self._ssl_protocol._get_extra_info(name, default)
 
     def set_protocol(self, protocol):
-        self._app_protocol = protocol
+        self._ssl_protocol._app_protocol = protocol
 
     def get_protocol(self):
-        return self._app_protocol
+        return self._ssl_protocol._app_protocol
 
     def is_closing(self):
         return self._closed
@@ -436,8 +435,7 @@ def __init__(self, loop, app_protocol, sslcontext, waiter,
         self._waiter = waiter
         self._loop = loop
         self._app_protocol = app_protocol
-        self._app_transport = _SSLProtocolTransport(self._loop,
-                                                    self, self._app_protocol)
+        self._app_transport = _SSLProtocolTransport(self._loop, self)
         # _SSLPipe instance (None until the connection is made)
         self._sslpipe = None
         self._session_established = False
diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index bcd236ea263..f573ae8fe77 100644
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -121,6 +121,14 @@ def test_get_extra_info_on_closed_connection(self):
         ssl_proto.connection_lost(None)
         self.assertIsNone(ssl_proto._get_extra_info('socket'))
 
+    def test_set_new_app_protocol(self):
+        waiter = asyncio.Future(loop=self.loop)
+        ssl_proto = self.ssl_protocol(waiter)
+        new_app_proto = asyncio.Protocol()
+        ssl_proto._app_transport.set_protocol(new_app_proto)
+        self.assertIs(ssl_proto._app_transport.get_protocol(), new_app_proto)
+        self.assertIs(ssl_proto._app_protocol, new_app_proto)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/Misc/ACKS b/Misc/ACKS
index a956acd6ecf..667f447bc5e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -849,6 +849,7 @@ Vladimir Kushnir
 Erno Kuusela
 Ross Lagerwall
 Cameron Laird
+Lo?c Lajeanne
 David Lam
 Thomas Lamb
 Valerie Lambert
diff --git a/Misc/NEWS.d/next/Library/2017-10-04-11-37-14.bpo-31632.LiOC3C.rst b/Misc/NEWS.d/next/Library/2017-10-04-11-37-14.bpo-31632.LiOC3C.rst
new file mode 100644
index 00000000000..6178d0633ee
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-04-11-37-14.bpo-31632.LiOC3C.rst
@@ -0,0 +1,2 @@
+Fix method set_protocol() of class _SSLProtocolTransport in asyncio module.
+This method was previously modifying a wrong reference to the protocol.


From webhook-mailer at python.org  Thu Oct 19 15:46:43 2017
From: webhook-mailer at python.org (Yury Selivanov)
Date: Thu, 19 Oct 2017 19:46:43 -0000
Subject: [Python-checkins] bpo-31819: Add AbstractEventLoop.sock_recv_into()
 (#4051)
Message-ID: <mailman.102.1508442405.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/525f40d231aba2c004619fc7a5207171ed65b0cb
commit: 525f40d231aba2c004619fc7a5207171ed65b0cb
branch: master
author: Antoine Pitrou <pitrou at free.fr>
committer: Yury Selivanov <yury at magic.io>
date: 2017-10-19T15:46:40-04:00
summary:

bpo-31819: Add AbstractEventLoop.sock_recv_into() (#4051)

* bpo-31819: Add AbstractEventLoop.sock_recv_into()

* Add NEWS

* Add doc

files:
A Misc/NEWS.d/next/Library/2017-10-19-20-03-13.bpo-31819.mw2wF9.rst
M Doc/library/asyncio-eventloop.rst
M Lib/asyncio/events.py
M Lib/asyncio/proactor_events.py
M Lib/asyncio/selector_events.py
M Lib/asyncio/windows_events.py
M Lib/test/test_asyncio/test_events.py
M Lib/test/test_asyncio/test_proactor_events.py
M Modules/overlapped.c

diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
index 83bbb70b037..ade37390c63 100644
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -554,6 +554,21 @@ Low-level socket operations
 
    This method is a :ref:`coroutine <coroutine>`.
 
+.. coroutinemethod:: AbstractEventLoop.sock_recv_into(sock, buf)
+
+   Receive data from the socket.  Modeled after blocking
+   :meth:`socket.socket.recv_into` method.
+
+   The received data is written into *buf* (a writable buffer).
+   The return value is the number of bytes written.
+
+   With :class:`SelectorEventLoop` event loop, the socket *sock* must be
+   non-blocking.
+
+   This method is a :ref:`coroutine <coroutine>`.
+
+   .. versionadded:: 3.7
+
 .. coroutinemethod:: AbstractEventLoop.sock_sendall(sock, data)
 
    Send data to the socket.  Modeled after blocking
diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py
index 03af6994e94..0dbd92cf3a3 100644
--- a/Lib/asyncio/events.py
+++ b/Lib/asyncio/events.py
@@ -461,6 +461,9 @@ def remove_writer(self, fd):
     def sock_recv(self, sock, nbytes):
         raise NotImplementedError
 
+    def sock_recv_into(self, sock, buf):
+        raise NotImplementedError
+
     def sock_sendall(self, sock, data):
         raise NotImplementedError
 
diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py
index 642f61e3563..5e7a39727cc 100644
--- a/Lib/asyncio/proactor_events.py
+++ b/Lib/asyncio/proactor_events.py
@@ -439,6 +439,9 @@ def close(self):
     def sock_recv(self, sock, n):
         return self._proactor.recv(sock, n)
 
+    def sock_recv_into(self, sock, buf):
+        return self._proactor.recv_into(sock, buf)
+
     def sock_sendall(self, sock, data):
         return self._proactor.send(sock, data)
 
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
index 4b403560c31..7143ca2660a 100644
--- a/Lib/asyncio/selector_events.py
+++ b/Lib/asyncio/selector_events.py
@@ -386,6 +386,41 @@ def _sock_recv(self, fut, registered, sock, n):
         else:
             fut.set_result(data)
 
+    def sock_recv_into(self, sock, buf):
+        """Receive data from the socket.
+
+        The received data is written into *buf* (a writable buffer).
+        The return value is the number of bytes written.
+
+        This method is a coroutine.
+        """
+        if self._debug and sock.gettimeout() != 0:
+            raise ValueError("the socket must be non-blocking")
+        fut = self.create_future()
+        self._sock_recv_into(fut, False, sock, buf)
+        return fut
+
+    def _sock_recv_into(self, fut, registered, sock, buf):
+        # _sock_recv_into() can add itself as an I/O callback if the operation
+        # can't be done immediately. Don't use it directly, call sock_recv_into().
+        fd = sock.fileno()
+        if registered:
+            # Remove the callback early.  It should be rare that the
+            # selector says the fd is ready but the call still returns
+            # EAGAIN, and I am willing to take a hit in that case in
+            # order to simplify the common case.
+            self.remove_reader(fd)
+        if fut.cancelled():
+            return
+        try:
+            nbytes = sock.recv_into(buf)
+        except (BlockingIOError, InterruptedError):
+            self.add_reader(fd, self._sock_recv_into, fut, True, sock, buf)
+        except Exception as exc:
+            fut.set_exception(exc)
+        else:
+            fut.set_result(nbytes)
+
     def sock_sendall(self, sock, data):
         """Send data to the socket.
 
diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py
index b777dd065ad..6045ba029e5 100644
--- a/Lib/asyncio/windows_events.py
+++ b/Lib/asyncio/windows_events.py
@@ -448,6 +448,28 @@ def finish_recv(trans, key, ov):
 
         return self._register(ov, conn, finish_recv)
 
+    def recv_into(self, conn, buf, flags=0):
+        self._register_with_iocp(conn)
+        ov = _overlapped.Overlapped(NULL)
+        try:
+            if isinstance(conn, socket.socket):
+                ov.WSARecvInto(conn.fileno(), buf, flags)
+            else:
+                ov.ReadFileInto(conn.fileno(), buf)
+        except BrokenPipeError:
+            return self._result(b'')
+
+        def finish_recv(trans, key, ov):
+            try:
+                return ov.getresult()
+            except OSError as exc:
+                if exc.winerror == _overlapped.ERROR_NETNAME_DELETED:
+                    raise ConnectionResetError(*exc.args)
+                else:
+                    raise
+
+        return self._register(ov, conn, finish_recv)
+
     def send(self, conn, buf, flags=0):
         self._register_with_iocp(conn)
         ov = _overlapped.Overlapped(NULL)
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 736f703c2fb..0ea9c086747 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -427,6 +427,9 @@ def _basetest_sock_client_ops(self, httpd, sock):
                     self.loop.sock_recv(sock, 1024))
             with self.assertRaises(ValueError):
                 self.loop.run_until_complete(
+                    self.loop.sock_recv_into(sock, bytearray()))
+            with self.assertRaises(ValueError):
+                self.loop.run_until_complete(
                     self.loop.sock_accept(sock))
 
         # test in non-blocking mode
@@ -443,16 +446,37 @@ def _basetest_sock_client_ops(self, httpd, sock):
         sock.close()
         self.assertTrue(data.startswith(b'HTTP/1.0 200 OK'))
 
+    def _basetest_sock_recv_into(self, httpd, sock):
+        # same as _basetest_sock_client_ops, but using sock_recv_into
+        sock.setblocking(False)
+        self.loop.run_until_complete(
+            self.loop.sock_connect(sock, httpd.address))
+        self.loop.run_until_complete(
+            self.loop.sock_sendall(sock, b'GET / HTTP/1.0\r\n\r\n'))
+        data = bytearray(1024)
+        with memoryview(data) as buf:
+            nbytes = self.loop.run_until_complete(
+                self.loop.sock_recv_into(sock, buf[:1024]))
+            # consume data
+            self.loop.run_until_complete(
+                self.loop.sock_recv_into(sock, buf[nbytes:]))
+        sock.close()
+        self.assertTrue(data.startswith(b'HTTP/1.0 200 OK'))
+
     def test_sock_client_ops(self):
         with test_utils.run_test_server() as httpd:
             sock = socket.socket()
             self._basetest_sock_client_ops(httpd, sock)
+            sock = socket.socket()
+            self._basetest_sock_recv_into(httpd, sock)
 
     @unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')
     def test_unix_sock_client_ops(self):
         with test_utils.run_test_unix_server() as httpd:
             sock = socket.socket(socket.AF_UNIX)
             self._basetest_sock_client_ops(httpd, sock)
+            sock = socket.socket(socket.AF_UNIX)
+            self._basetest_sock_recv_into(httpd, sock)
 
     def test_sock_client_fail(self):
         # Make sure that we will get an unused port
@@ -2613,6 +2637,8 @@ def test_not_implemented(self):
         self.assertRaises(
             NotImplementedError, loop.sock_recv, f, 10)
         self.assertRaises(
+            NotImplementedError, loop.sock_recv_into, f, 10)
+        self.assertRaises(
             NotImplementedError, loop.sock_sendall, f, 10)
         self.assertRaises(
             NotImplementedError, loop.sock_connect, f, f)
diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py
index d76da661ab9..7a8b52352d6 100644
--- a/Lib/test/test_asyncio/test_proactor_events.py
+++ b/Lib/test/test_asyncio/test_proactor_events.py
@@ -489,6 +489,11 @@ def test_sock_recv(self):
         self.loop.sock_recv(self.sock, 1024)
         self.proactor.recv.assert_called_with(self.sock, 1024)
 
+    def test_sock_recv_into(self):
+        buf = bytearray(10)
+        self.loop.sock_recv_into(self.sock, buf)
+        self.proactor.recv_into.assert_called_with(self.sock, buf)
+
     def test_sock_sendall(self):
         self.loop.sock_sendall(self.sock, b'data')
         self.proactor.send.assert_called_with(self.sock, b'data')
diff --git a/Misc/NEWS.d/next/Library/2017-10-19-20-03-13.bpo-31819.mw2wF9.rst b/Misc/NEWS.d/next/Library/2017-10-19-20-03-13.bpo-31819.mw2wF9.rst
new file mode 100644
index 00000000000..7bdb0d9f88a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-19-20-03-13.bpo-31819.mw2wF9.rst
@@ -0,0 +1 @@
+Add AbstractEventLoop.sock_recv_into().
diff --git a/Modules/overlapped.c b/Modules/overlapped.c
index 6099d46643f..9355ce60f4d 100644
--- a/Modules/overlapped.c
+++ b/Modules/overlapped.c
@@ -37,8 +37,8 @@
 
 #define T_HANDLE T_POINTER
 
-enum {TYPE_NONE, TYPE_NOT_STARTED, TYPE_READ, TYPE_WRITE, TYPE_ACCEPT,
-      TYPE_CONNECT, TYPE_DISCONNECT, TYPE_CONNECT_NAMED_PIPE,
+enum {TYPE_NONE, TYPE_NOT_STARTED, TYPE_READ, TYPE_READINTO, TYPE_WRITE,
+      TYPE_ACCEPT, TYPE_CONNECT, TYPE_DISCONNECT, TYPE_CONNECT_NAMED_PIPE,
       TYPE_WAIT_NAMED_PIPE_AND_CONNECT};
 
 typedef struct {
@@ -51,10 +51,10 @@ typedef struct {
     /* Type of operation */
     DWORD type;
     union {
-        /* Buffer used for reading: TYPE_READ and TYPE_ACCEPT */
-        PyObject *read_buffer;
-        /* Buffer used for writing: TYPE_WRITE */
-        Py_buffer write_buffer;
+        /* Buffer allocated by us: TYPE_READ and TYPE_ACCEPT */
+        PyObject *allocated_buffer;
+        /* Buffer passed by the user: TYPE_WRITE and TYPE_READINTO */
+        Py_buffer user_buffer;
     };
 } OverlappedObject;
 
@@ -550,9 +550,9 @@ Overlapped_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     self->handle = NULL;
     self->error = 0;
     self->type = TYPE_NONE;
-    self->read_buffer = NULL;
+    self->allocated_buffer = NULL;
     memset(&self->overlapped, 0, sizeof(OVERLAPPED));
-    memset(&self->write_buffer, 0, sizeof(Py_buffer));
+    memset(&self->user_buffer, 0, sizeof(Py_buffer));
     if (event)
         self->overlapped.hEvent = event;
     return (PyObject *)self;
@@ -597,11 +597,12 @@ Overlapped_dealloc(OverlappedObject *self)
     switch (self->type) {
     case TYPE_READ:
     case TYPE_ACCEPT:
-        Py_CLEAR(self->read_buffer);
+        Py_CLEAR(self->allocated_buffer);
         break;
     case TYPE_WRITE:
-        if (self->write_buffer.obj)
-            PyBuffer_Release(&self->write_buffer);
+    case TYPE_READINTO:
+        if (self->user_buffer.obj)
+            PyBuffer_Release(&self->user_buffer);
         break;
     }
     PyObject_Del(self);
@@ -676,7 +677,7 @@ Overlapped_getresult(OverlappedObject *self, PyObject *args)
         case ERROR_MORE_DATA:
             break;
         case ERROR_BROKEN_PIPE:
-            if ((self->type == TYPE_READ || self->type == TYPE_ACCEPT) && self->read_buffer != NULL)
+            if (self->type == TYPE_READ || self->type == TYPE_READINTO)
                 break;
             /* fall through */
         default:
@@ -685,17 +686,45 @@ Overlapped_getresult(OverlappedObject *self, PyObject *args)
 
     switch (self->type) {
         case TYPE_READ:
-            assert(PyBytes_CheckExact(self->read_buffer));
-            if (transferred != PyBytes_GET_SIZE(self->read_buffer) &&
-                _PyBytes_Resize(&self->read_buffer, transferred))
+            assert(PyBytes_CheckExact(self->allocated_buffer));
+            if (transferred != PyBytes_GET_SIZE(self->allocated_buffer) &&
+                _PyBytes_Resize(&self->allocated_buffer, transferred))
                 return NULL;
-            Py_INCREF(self->read_buffer);
-            return self->read_buffer;
+            Py_INCREF(self->allocated_buffer);
+            return self->allocated_buffer;
         default:
             return PyLong_FromUnsignedLong((unsigned long) transferred);
     }
 }
 
+static PyObject *
+do_ReadFile(OverlappedObject *self, HANDLE handle,
+            char *bufstart, DWORD buflen)
+{
+    DWORD nread;
+    int ret;
+    DWORD err;
+
+    Py_BEGIN_ALLOW_THREADS
+    ret = ReadFile(handle, bufstart, buflen, &nread,
+                   &self->overlapped);
+    Py_END_ALLOW_THREADS
+
+    self->error = err = ret ? ERROR_SUCCESS : GetLastError();
+    switch (err) {
+        case ERROR_BROKEN_PIPE:
+            mark_as_completed(&self->overlapped);
+            return SetFromWindowsErr(err);
+        case ERROR_SUCCESS:
+        case ERROR_MORE_DATA:
+        case ERROR_IO_PENDING:
+            Py_RETURN_NONE;
+        default:
+            self->type = TYPE_NOT_STARTED;
+            return SetFromWindowsErr(err);
+    }
+}
+
 PyDoc_STRVAR(
     Overlapped_ReadFile_doc,
     "ReadFile(handle, size) -> Overlapped[message]\n\n"
@@ -706,10 +735,7 @@ Overlapped_ReadFile(OverlappedObject *self, PyObject *args)
 {
     HANDLE handle;
     DWORD size;
-    DWORD nread;
     PyObject *buf;
-    BOOL ret;
-    DWORD err;
 
     if (!PyArg_ParseTuple(args, F_HANDLE F_DWORD, &handle, &size))
         return NULL;
@@ -728,14 +754,66 @@ Overlapped_ReadFile(OverlappedObject *self, PyObject *args)
 
     self->type = TYPE_READ;
     self->handle = handle;
-    self->read_buffer = buf;
+    self->allocated_buffer = buf;
+
+    return do_ReadFile(self, handle, PyBytes_AS_STRING(buf), size);
+}
+
+PyDoc_STRVAR(
+    Overlapped_ReadFileInto_doc,
+    "ReadFileInto(handle, buf) -> Overlapped[bytes_transferred]\n\n"
+    "Start overlapped receive");
+
+static PyObject *
+Overlapped_ReadFileInto(OverlappedObject *self, PyObject *args)
+{
+    HANDLE handle;
+    PyObject *bufobj;
+
+    if (!PyArg_ParseTuple(args, F_HANDLE "O", &handle, &bufobj))
+        return NULL;
+
+    if (self->type != TYPE_NONE) {
+        PyErr_SetString(PyExc_ValueError, "operation already attempted");
+        return NULL;
+    }
+
+    if (!PyArg_Parse(bufobj, "y*", &self->user_buffer))
+        return NULL;
+
+#if SIZEOF_SIZE_T > SIZEOF_LONG
+    if (self->user_buffer.len > (Py_ssize_t)ULONG_MAX) {
+        PyBuffer_Release(&self->user_buffer);
+        PyErr_SetString(PyExc_ValueError, "buffer too large");
+        return NULL;
+    }
+#endif
+
+    self->type = TYPE_READINTO;
+    self->handle = handle;
+
+    return do_ReadFile(self, handle, self->user_buffer.buf,
+                       (DWORD)self->user_buffer.len);
+}
+
+static PyObject *
+do_WSARecv(OverlappedObject *self, HANDLE handle,
+           char *bufstart, DWORD buflen, DWORD flags)
+{
+    DWORD nread;
+    WSABUF wsabuf;
+    int ret;
+    DWORD err;
+    
+    wsabuf.buf = bufstart;
+    wsabuf.len = buflen;
 
     Py_BEGIN_ALLOW_THREADS
-    ret = ReadFile(handle, PyBytes_AS_STRING(buf), size, &nread,
-                   &self->overlapped);
+    ret = WSARecv((SOCKET)handle, &wsabuf, 1, &nread, &flags,
+                  &self->overlapped, NULL);
     Py_END_ALLOW_THREADS
 
-    self->error = err = ret ? ERROR_SUCCESS : GetLastError();
+    self->error = err = (ret < 0 ? WSAGetLastError() : ERROR_SUCCESS);
     switch (err) {
         case ERROR_BROKEN_PIPE:
             mark_as_completed(&self->overlapped);
@@ -761,11 +839,7 @@ Overlapped_WSARecv(OverlappedObject *self, PyObject *args)
     HANDLE handle;
     DWORD size;
     DWORD flags = 0;
-    DWORD nread;
     PyObject *buf;
-    WSABUF wsabuf;
-    int ret;
-    DWORD err;
 
     if (!PyArg_ParseTuple(args, F_HANDLE F_DWORD "|" F_DWORD,
                           &handle, &size, &flags))
@@ -785,28 +859,48 @@ Overlapped_WSARecv(OverlappedObject *self, PyObject *args)
 
     self->type = TYPE_READ;
     self->handle = handle;
-    self->read_buffer = buf;
-    wsabuf.len = size;
-    wsabuf.buf = PyBytes_AS_STRING(buf);
+    self->allocated_buffer = buf;
 
-    Py_BEGIN_ALLOW_THREADS
-    ret = WSARecv((SOCKET)handle, &wsabuf, 1, &nread, &flags,
-                  &self->overlapped, NULL);
-    Py_END_ALLOW_THREADS
+    return do_WSARecv(self, handle, PyBytes_AS_STRING(buf), size, flags);
+}
 
-    self->error = err = (ret < 0 ? WSAGetLastError() : ERROR_SUCCESS);
-    switch (err) {
-        case ERROR_BROKEN_PIPE:
-            mark_as_completed(&self->overlapped);
-            return SetFromWindowsErr(err);
-        case ERROR_SUCCESS:
-        case ERROR_MORE_DATA:
-        case ERROR_IO_PENDING:
-            Py_RETURN_NONE;
-        default:
-            self->type = TYPE_NOT_STARTED;
-            return SetFromWindowsErr(err);
+PyDoc_STRVAR(
+    Overlapped_WSARecvInto_doc,
+    "WSARecvInto(handle, buf, flags) -> Overlapped[bytes_transferred]\n\n"
+    "Start overlapped receive");
+
+static PyObject *
+Overlapped_WSARecvInto(OverlappedObject *self, PyObject *args)
+{
+    HANDLE handle;
+    PyObject *bufobj;
+    DWORD flags;
+
+    if (!PyArg_ParseTuple(args, F_HANDLE "O" F_DWORD,
+                          &handle, &bufobj, &flags))
+        return NULL;
+
+    if (self->type != TYPE_NONE) {
+        PyErr_SetString(PyExc_ValueError, "operation already attempted");
+        return NULL;
+    }
+
+    if (!PyArg_Parse(bufobj, "y*", &self->user_buffer))
+        return NULL;
+
+#if SIZEOF_SIZE_T > SIZEOF_LONG
+    if (self->user_buffer.len > (Py_ssize_t)ULONG_MAX) {
+        PyBuffer_Release(&self->user_buffer);
+        PyErr_SetString(PyExc_ValueError, "buffer too large");
+        return NULL;
     }
+#endif
+
+    self->type = TYPE_READINTO;
+    self->handle = handle;
+
+    return do_WSARecv(self, handle, self->user_buffer.buf,
+                      (DWORD)self->user_buffer.len, flags);
 }
 
 PyDoc_STRVAR(
@@ -831,12 +925,12 @@ Overlapped_WriteFile(OverlappedObject *self, PyObject *args)
         return NULL;
     }
 
-    if (!PyArg_Parse(bufobj, "y*", &self->write_buffer))
+    if (!PyArg_Parse(bufobj, "y*", &self->user_buffer))
         return NULL;
 
 #if SIZEOF_SIZE_T > SIZEOF_LONG
-    if (self->write_buffer.len > (Py_ssize_t)ULONG_MAX) {
-        PyBuffer_Release(&self->write_buffer);
+    if (self->user_buffer.len > (Py_ssize_t)ULONG_MAX) {
+        PyBuffer_Release(&self->user_buffer);
         PyErr_SetString(PyExc_ValueError, "buffer too large");
         return NULL;
     }
@@ -846,8 +940,8 @@ Overlapped_WriteFile(OverlappedObject *self, PyObject *args)
     self->handle = handle;
 
     Py_BEGIN_ALLOW_THREADS
-    ret = WriteFile(handle, self->write_buffer.buf,
-                    (DWORD)self->write_buffer.len,
+    ret = WriteFile(handle, self->user_buffer.buf,
+                    (DWORD)self->user_buffer.len,
                     &written, &self->overlapped);
     Py_END_ALLOW_THREADS
 
@@ -887,12 +981,12 @@ Overlapped_WSASend(OverlappedObject *self, PyObject *args)
         return NULL;
     }
 
-    if (!PyArg_Parse(bufobj, "y*", &self->write_buffer))
+    if (!PyArg_Parse(bufobj, "y*", &self->user_buffer))
         return NULL;
 
 #if SIZEOF_SIZE_T > SIZEOF_LONG
-    if (self->write_buffer.len > (Py_ssize_t)ULONG_MAX) {
-        PyBuffer_Release(&self->write_buffer);
+    if (self->user_buffer.len > (Py_ssize_t)ULONG_MAX) {
+        PyBuffer_Release(&self->user_buffer);
         PyErr_SetString(PyExc_ValueError, "buffer too large");
         return NULL;
     }
@@ -900,8 +994,8 @@ Overlapped_WSASend(OverlappedObject *self, PyObject *args)
 
     self->type = TYPE_WRITE;
     self->handle = handle;
-    wsabuf.len = (DWORD)self->write_buffer.len;
-    wsabuf.buf = self->write_buffer.buf;
+    wsabuf.len = (DWORD)self->user_buffer.len;
+    wsabuf.buf = self->user_buffer.buf;
 
     Py_BEGIN_ALLOW_THREADS
     ret = WSASend((SOCKET)handle, &wsabuf, 1, &written, flags,
@@ -951,7 +1045,7 @@ Overlapped_AcceptEx(OverlappedObject *self, PyObject *args)
 
     self->type = TYPE_ACCEPT;
     self->handle = (HANDLE)ListenSocket;
-    self->read_buffer = buf;
+    self->allocated_buffer = buf;
 
     Py_BEGIN_ALLOW_THREADS
     ret = Py_AcceptEx(ListenSocket, AcceptSocket, PyBytes_AS_STRING(buf),
@@ -1193,8 +1287,12 @@ static PyMethodDef Overlapped_methods[] = {
      METH_NOARGS, Overlapped_cancel_doc},
     {"ReadFile", (PyCFunction) Overlapped_ReadFile,
      METH_VARARGS, Overlapped_ReadFile_doc},
+    {"ReadFileInto", (PyCFunction) Overlapped_ReadFileInto,
+     METH_VARARGS, Overlapped_ReadFileInto_doc},
     {"WSARecv", (PyCFunction) Overlapped_WSARecv,
      METH_VARARGS, Overlapped_WSARecv_doc},
+    {"WSARecvInto", (PyCFunction) Overlapped_WSARecvInto,
+     METH_VARARGS, Overlapped_WSARecvInto_doc},
     {"WriteFile", (PyCFunction) Overlapped_WriteFile,
      METH_VARARGS, Overlapped_WriteFile_doc},
     {"WSASend", (PyCFunction) Overlapped_WSASend,


From lp_benchmark_robot at intel.com  Thu Oct 19 16:08:36 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Thu, 19 Oct 2017 13:08:36 -0700
Subject: [Python-checkins] [7 down,
 58 flat] Results for Python (master branch) 2017-10-19
Message-ID: <a9afbcc0-e89f-48b5-81d9-cc58388e3b17@orsmsx106.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-19 03:03:15-07:00.
  - commit:		05a634b
  - previous commit:	59af94f
  - revision date:	2017-10-19 17:41:59+10: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.137% |  +0.086%   |  +4.897%   |  +7.415%   |
+-----+------------------------+--------+------------+------------+------------+
| :-( |             call_method| 0.357% |  -2.032%   |  +16.737%  |  +15.279%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( |       call_method_slots| 0.318% |  -2.576%   |  +17.456%  |  +15.557%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( |     call_method_unknown| 0.299% |  -2.221%   |  +16.620%  |  +14.045%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( |             call_simple| 1.569% |  -5.492%   |  -1.734%   |  +19.178%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.334% |  -2.047%   |  +7.811%   |  +13.194%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.942% |  -2.342%   |  +5.099%   |  +11.523%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.417% |  +0.240%   |  +3.859%   |  +5.347%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.613% |  +6.503%   |  +8.696%   |  +18.333%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 2.982% |  +0.242%   |  +9.561%   |  +11.430%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.115% |  -1.042%   |  +3.483%   |  +7.625%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.323% |  -1.386%   |  +5.085%   |  +5.846%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.695% |  -0.221%   |  +2.921%   |  +6.810%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.350% |  -2.225%   |  +6.813%   |  +13.313%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.614% |  +0.373%   |  +5.747%   |  +9.753%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.730% |  -0.213%   |  +5.362%   |  +12.331%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.437% |  -0.896%   |  +8.349%   |  +12.153%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 2.954% |  -1.237%   |  +7.782%   |  +9.702%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 2.483% |  -0.633%   |  +2.728%   |  +9.877%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 2.701% |  -0.439%   |  +3.032%   |  +9.515%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.570% |  -0.572%   |  +7.968%   |  +10.277%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.902% |  +0.753%   |  +46.560%  |  +12.839%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.563% |  +0.369%   |  +8.696%   |  +11.840%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.489% |  +1.575%   |  +18.901%  |  +11.104%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 1.731% |  -0.682%   |  +8.236%   |  +10.658%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.896% |  -0.417%   |  +3.189%   |  +5.932%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.824% |  -0.859%   |  -0.972%   |  +2.463%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 1.157% |  -1.545%   |  +0.958%   |  +8.317%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.239% |  -1.629%   |  +3.616%   |  +12.323%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 2.658% |  +1.614%   |  +0.833%   |  +21.795%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( |             pickle_dict| 0.232% |  -2.943%   |  +2.032%   |  +21.397%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.818% |  -0.899%   |  +4.999%   |  +15.674%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.659% |  -0.823%   |  +10.927%  |  +9.971%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.130% |  -0.056%   |  +0.302%   |  +9.321%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.133% |  -0.002%   |  +10.887%  |  +4.830%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.089% |  +0.116%   |  +2.355%   |  +4.958%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 0.993% |  +0.957%   |  +9.207%   |  +14.093%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.534% |  -3.087%   |  +1.552%   |  +13.303%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( |               regex_dna| 1.212% |  -4.265%   |  -2.235%   |  +12.946%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 3.073% |  -0.748%   |  -2.691%   |  +6.063%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.915% |  -4.165%   |  +5.658%   |  +6.715%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 2.760% |  -0.795%   |  +6.087%   |  +15.380%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 2.043% |  -2.678%   |  +0.032%   |  +1.960%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.685% |  -1.724%   |  +26.108%  |  +10.191%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.237% |  -1.540%   |  +2.919%   |  +8.779%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.931% |  -3.370%   |  +12.016%  |  +12.115%  |
+-----+------------------------+--------+------------+------------+------------+
| :-( | scimark_sparse_mat_mult| 1.203% |  -4.196%   |  -1.989%   |  -4.212%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 2.576% |  -3.164%   |  +3.731%   |  +1.737%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.164% |  -0.082%   |  +6.759%   |  +5.496%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.964% |  -1.368%   |  +5.010%   |  +5.313%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 5.516% |  -1.947%   |  +17.515%  |  +12.463%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.873% |  -1.015%   |  +10.860%  |  +8.337%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 2.543% |  -1.384%   |  +8.857%   |  +7.260%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.638% |  -1.059%   |  +9.462%   |  +10.170%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.339% |  -0.933%   |  +10.828%  |  +9.495%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 3.092% |  -0.650%   |  +22.238%  |  +9.726%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.163% |  -1.314%   |  +5.097%   |  +6.875%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.458% |  -1.414%   |  +0.761%   |  +1.344%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 9.116% |  +0.106%   |  +7.867%   |  +20.646%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.778% |  +1.171%   |  -0.790%   |  +17.529%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 0.739% |  -1.536%   |  +6.717%   |  +7.602%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.002% |  -2.086%   |  +4.071%   |  +9.959%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 3.274% |  -0.240%   |  +0.634%   |  +8.794%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 3.881% |  +2.510%   |  -7.655%   |  +11.510%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 2.269% |  -1.359%   |  +4.269%   |  +10.473%  |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

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

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  Fri Oct 20 05:07:35 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 20 Oct 2017 09:07:35 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=15
Message-ID: <20171020090734.115836.26013CF1986DC356@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/reflogDaTxm3', '--timeout', '7200']

From webhook-mailer at python.org  Fri Oct 20 10:08:22 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Fri, 20 Oct 2017 14:08:22 -0000
Subject: [Python-checkins] bpo-31825: Fixed OverflowError in the
 'unicode-escape' codec (#4058)
Message-ID: <mailman.103.1508508503.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/56cb465cc93dcb35aaf7266ca3dbe2dcff1fac5f
commit: 56cb465cc93dcb35aaf7266ca3dbe2dcff1fac5f
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-20T17:08:15+03:00
summary:

bpo-31825: Fixed OverflowError in the 'unicode-escape' codec (#4058)

and in codecs.escape_decode() when decode an escaped non-ascii byte.

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-20-14-07-46.bpo-31825.gJvmGW.rst
M Lib/test/test_codecs.py
M Objects/bytesobject.c
M Objects/unicodeobject.c
M Python/ast.c

diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index 1e63ed8d793..de6868a46c4 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -1203,6 +1203,8 @@ def test_escape(self):
             check(br"\8", b"\\8")
         with self.assertWarns(DeprecationWarning):
             check(br"\9", b"\\9")
+        with self.assertWarns(DeprecationWarning):
+            check(b"\\\xfa", b"\\\xfa")
 
     def test_errors(self):
         decode = codecs.escape_decode
@@ -2474,6 +2476,8 @@ def test_escape_decode(self):
             check(br"\8", "\\8")
         with self.assertWarns(DeprecationWarning):
             check(br"\9", "\\9")
+        with self.assertWarns(DeprecationWarning):
+            check(b"\\\xfa", "\\\xfa")
 
     def test_decode_errors(self):
         decode = codecs.unicode_escape_decode
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-20-14-07-46.bpo-31825.gJvmGW.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-20-14-07-46.bpo-31825.gJvmGW.rst
new file mode 100644
index 00000000000..18e81afa1f8
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-20-14-07-46.bpo-31825.gJvmGW.rst	
@@ -0,0 +1,2 @@
+Fixed OverflowError in the 'unicode-escape' codec and in
+codecs.escape_decode() when decode an escaped non-ascii byte.
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 6a4eb67808a..48b6501f7a5 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -1257,7 +1257,7 @@ PyObject *PyBytes_DecodeEscape(const char *s,
     if (first_invalid_escape != NULL) {
         if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
                              "invalid escape sequence '\\%c'",
-                             *first_invalid_escape) < 0) {
+                             (unsigned char)*first_invalid_escape) < 0) {
             Py_DECREF(result);
             return NULL;
         }
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index bb1c0830fc5..2f308774d71 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -6136,7 +6136,7 @@ PyUnicode_DecodeUnicodeEscape(const char *s,
     if (first_invalid_escape != NULL) {
         if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
                              "invalid escape sequence '\\%c'",
-                             *first_invalid_escape) < 0) {
+                             (unsigned char)*first_invalid_escape) < 0) {
             Py_DECREF(result);
             return NULL;
         }
diff --git a/Python/ast.c b/Python/ast.c
index 6989965efab..a6cc0f7e044 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -4147,7 +4147,7 @@ decode_utf8(struct compiling *c, const char **sPtr, const char *end)
 
 static int
 warn_invalid_escape_sequence(struct compiling *c, const node *n,
-                             char first_invalid_escape_char)
+                             unsigned char first_invalid_escape_char)
 {
     PyObject *msg = PyUnicode_FromFormat("invalid escape sequence \\%c",
                                          first_invalid_escape_char);


From webhook-mailer at python.org  Fri Oct 20 10:41:32 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Fri, 20 Oct 2017 14:41:32 -0000
Subject: [Python-checkins] bpo-31825: Fixed OverflowError in the
 'unicode-escape' codec (GH-4058) (#4059)
Message-ID: <mailman.104.1508510493.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/1e78ed6825701029aa45a68f9e62dd3bb8d4e928
commit: 1e78ed6825701029aa45a68f9e62dd3bb8d4e928
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-20T17:41:29+03:00
summary:

bpo-31825: Fixed OverflowError in the 'unicode-escape' codec (GH-4058) (#4059)

and in codecs.escape_decode() when decode an escaped non-ascii byte.
(cherry picked from commit 56cb465cc93dcb35aaf7266ca3dbe2dcff1fac5f)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-20-14-07-46.bpo-31825.gJvmGW.rst
M Lib/test/test_codecs.py
M Objects/bytesobject.c
M Objects/unicodeobject.c
M Python/ast.c

diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index 1e63ed8d793..de6868a46c4 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -1203,6 +1203,8 @@ def test_escape(self):
             check(br"\8", b"\\8")
         with self.assertWarns(DeprecationWarning):
             check(br"\9", b"\\9")
+        with self.assertWarns(DeprecationWarning):
+            check(b"\\\xfa", b"\\\xfa")
 
     def test_errors(self):
         decode = codecs.escape_decode
@@ -2474,6 +2476,8 @@ def test_escape_decode(self):
             check(br"\8", "\\8")
         with self.assertWarns(DeprecationWarning):
             check(br"\9", "\\9")
+        with self.assertWarns(DeprecationWarning):
+            check(b"\\\xfa", "\\\xfa")
 
     def test_decode_errors(self):
         decode = codecs.unicode_escape_decode
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-20-14-07-46.bpo-31825.gJvmGW.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-20-14-07-46.bpo-31825.gJvmGW.rst
new file mode 100644
index 00000000000..18e81afa1f8
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-20-14-07-46.bpo-31825.gJvmGW.rst	
@@ -0,0 +1,2 @@
+Fixed OverflowError in the 'unicode-escape' codec and in
+codecs.escape_decode() when decode an escaped non-ascii byte.
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 4c55294d9d8..489062e8355 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -1255,7 +1255,7 @@ PyObject *PyBytes_DecodeEscape(const char *s,
     if (first_invalid_escape != NULL) {
         if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
                              "invalid escape sequence '\\%c'",
-                             *first_invalid_escape) < 0) {
+                             (unsigned char)*first_invalid_escape) < 0) {
             Py_DECREF(result);
             return NULL;
         }
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index e9fc6580383..64905e84b14 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -6174,7 +6174,7 @@ PyUnicode_DecodeUnicodeEscape(const char *s,
     if (first_invalid_escape != NULL) {
         if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
                              "invalid escape sequence '\\%c'",
-                             *first_invalid_escape) < 0) {
+                             (unsigned char)*first_invalid_escape) < 0) {
             Py_DECREF(result);
             return NULL;
         }
diff --git a/Python/ast.c b/Python/ast.c
index 2973b9fd866..d2710259acb 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -4127,7 +4127,7 @@ decode_utf8(struct compiling *c, const char **sPtr, const char *end)
 
 static int
 warn_invalid_escape_sequence(struct compiling *c, const node *n,
-                             char first_invalid_escape_char)
+                             unsigned char first_invalid_escape_char)
 {
     PyObject *msg = PyUnicode_FromFormat("invalid escape sequence \\%c",
                                          first_invalid_escape_char);


From lp_benchmark_robot at intel.com  Fri Oct 20 13:04:39 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Fri, 20 Oct 2017 10:04:39 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-10-20
Message-ID: <29a1e4a4-7539-440c-9ecf-437b2890b4f1@orsmsx110.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-20 03:03:16-07:00.
  - commit:		525f40d
  - previous commit:	05a634b
  - revision date:	2017-10-19 15:46:40-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.114% |  +0.098%   |  +4.991%   |  +7.014%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 0.151% |  +0.132%   |  +16.847%  |  +17.945%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 0.236% |  +0.084%   |  +17.525%  |  +18.268%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.521% |  -0.061%   |  +16.570%  |  +16.295%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 1.874% |  +0.066%   |  -1.666%   |  +14.754%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.235% |  +0.247%   |  +8.038%   |  +11.954%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 1.228% |  +0.019%   |  +5.118%   |  +11.715%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.579% |  +0.070%   |  +3.926%   |  +5.133%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.448% |  -0.056%   |  +8.645%   |  +18.042%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.111% |  -1.059%   |  +8.603%   |  +14.584%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.046% |  -0.688%   |  +2.819%   |  +8.241%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.271% |  +0.040%   |  +5.123%   |  +2.797%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.890% |  -0.174%   |  +2.752%   |  +6.864%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.192% |  +0.209%   |  +7.008%   |  +13.042%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.466% |  +0.242%   |  +5.976%   |  +10.165%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.771% |  -0.084%   |  +5.283%   |  +12.323%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.687% |  -0.115%   |  +8.244%   |  +12.068%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 2.862% |  +0.030%   |  +7.810%   |  +9.697%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.910% |  +0.353%   |  +3.071%   |  +10.129%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 2.715% |  -0.028%   |  +3.005%   |  +11.048%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.237% |  -1.244%   |  +6.823%   |  +11.187%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.418% |  +0.670%   |  +46.918%  |  +11.313%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.588% |  -1.100%   |  +7.692%   |  +13.566%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.536% |  -0.106%   |  +18.815%  |  +10.649%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 1.201% |  +0.245%   |  +8.461%   |  +10.261%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.543% |  -0.206%   |  +2.989%   |  +5.040%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.430% |  +0.154%   |  -0.817%   |  -0.048%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.569% |  +0.220%   |  +1.176%   |  +8.557%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.869% |  -1.693%   |  +1.985%   |  +10.616%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.478% |  +0.468%   |  +1.297%   |  +20.012%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.232% |  +0.087%   |  +2.118%   |  +18.183%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.761% |  +0.144%   |  +5.136%   |  +14.411%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 6.452% |  -1.096%   |  +9.951%   |  +11.077%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.144% |  +0.001%   |  +0.303%   |  +9.302%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.125% |  -0.001%   |  +10.887%  |  +4.672%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.086% |  -0.017%   |  +2.338%   |  +4.779%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.310% |  -0.577%   |  +8.683%   |  +13.991%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.343% |  -1.682%   |  -0.104%   |  +10.206%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.339% |  +0.331%   |  -1.897%   |  +12.857%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 3.065% |  +0.246%   |  -2.438%   |  +5.319%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.135% |  +0.317%   |  +5.957%   |  +8.425%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.278% |  +0.457%   |  +6.516%   |  +15.239%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.716% |  +0.040%   |  +0.071%   |  +1.788%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.555% |  -0.037%   |  +26.080%  |  +9.692%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.610% |  +0.702%   |  +3.600%   |  +5.521%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.913% |  +0.089%   |  +12.094%  |  +9.546%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 1.213% |  -0.026%   |  -2.015%   |  +0.164%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 3.158% |  -1.183%   |  +2.592%   |  +3.264%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.298% |  +0.237%   |  +6.980%   |  +6.022%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.812% |  +1.067%   |  +6.024%   |  +4.738%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 6.385% |  +1.326%   |  +18.609%  |  +10.601%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.920% |  +0.234%   |  +11.069%  |  +8.678%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.917% |  +0.164%   |  +9.007%   |  +7.453%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.428% |  +0.687%   |  +10.084%  |  +9.454%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.884% |  +1.213%   |  +11.909%  |  +8.707%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 4.134% |  -0.792%   |  +21.621%  |  +12.494%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.260% |  -0.034%   |  +5.065%   |  +6.518%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 0.661% |  +0.234%   |  +0.993%   |  +0.344%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle|10.394% |  -1.314%   |  +6.656%   |  +21.166%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 1.137% |  -0.244%   |  -1.036%   |  +16.748%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 1.445% |  -0.106%   |  +6.618%   |  +7.319%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.045% |  -0.354%   |  +3.731%   |  +9.142%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 3.372% |  -0.334%   |  +0.302%   |  +7.942%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 4.506% |  -0.453%   |  -8.143%   |  +11.164%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 2.237% |  -0.232%   |  +4.047%   |  +9.925%   |
+-----+------------------------+--------+------------+------------+------------+

* 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-10-20

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 Oct 20 16:42:37 2017
From: webhook-mailer at python.org (Brett Cannon)
Date: Fri, 20 Oct 2017 20:42:37 -0000
Subject: [Python-checkins] bpo-31781: Prevent crashes when calling methods
 of an uninitialized zipimport.zipimporter object (GH-3986)
Message-ID: <mailman.105.1508532160.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/db60a5bfa5d5f7a6f1538cc1fe76f0fda57b524e
commit: db60a5bfa5d5f7a6f1538cc1fe76f0fda57b524e
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Brett Cannon <brettcannon at users.noreply.github.com>
date: 2017-10-20T13:42:35-07:00
summary:

bpo-31781: Prevent crashes when calling methods of an uninitialized zipimport.zipimporter object (GH-3986)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-13-20-01-47.bpo-31781.cXE9SM.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 4a934ff6cbd..67ca39b8066 100644
--- a/Lib/test/test_zipimport.py
+++ b/Lib/test/test_zipimport.py
@@ -668,6 +668,20 @@ def testBytesPath(self):
         with self.assertWarns(DeprecationWarning):
             zipimport.zipimporter(memoryview(os.fsencode(filename)))
 
+    @support.cpython_only
+    def testUninitializedZipimporter(self):
+        # The interpreter shouldn't crash in case of calling methods of an
+        # uninitialized zipimport.zipimporter object.
+        zi = zipimport.zipimporter.__new__(zipimport.zipimporter)
+        self.assertRaises(ValueError, zi.find_module, 'foo')
+        self.assertRaises(ValueError, zi.find_loader, 'foo')
+        self.assertRaises(ValueError, zi.load_module, 'foo')
+        self.assertRaises(ValueError, zi.get_filename, 'foo')
+        self.assertRaises(ValueError, zi.is_package, 'foo')
+        self.assertRaises(ValueError, zi.get_data, 'foo')
+        self.assertRaises(ValueError, zi.get_code, 'foo')
+        self.assertRaises(ValueError, zi.get_source, 'foo')
+
 
 @support.requires_zlib
 class CompressedZipImportTestCase(UncompressedZipImportTestCase):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-13-20-01-47.bpo-31781.cXE9SM.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-13-20-01-47.bpo-31781.cXE9SM.rst
new file mode 100644
index 00000000000..79898cfd3d7
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-13-20-01-47.bpo-31781.cXE9SM.rst	
@@ -0,0 +1,2 @@
+Prevent crashes when calling methods of an uninitialized
+``zipimport.zipimporter`` object. Patch by Oren Milman.
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index 895cd800fc4..009480bac58 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -322,6 +322,12 @@ get_module_info(ZipImporter *self, PyObject *fullname)
     PyObject *path, *fullpath, *item;
     struct st_zip_searchorder *zso;
 
+    if (self->prefix == NULL) {
+        PyErr_SetString(PyExc_ValueError,
+                        "zipimporter.__init__() wasn't called");
+        return MI_ERROR;
+    }
+
     subname = get_subname(fullname);
     if (subname == NULL)
         return MI_ERROR;
@@ -652,6 +658,12 @@ zipimport_zipimporter_get_data_impl(ZipImporter *self, PyObject *path)
     PyObject *toc_entry;
     Py_ssize_t path_start, path_len, len;
 
+    if (self->archive == NULL) {
+        PyErr_SetString(PyExc_ValueError,
+                        "zipimporter.__init__() wasn't called");
+        return NULL;
+    }
+
 #ifdef ALTSEP
     path = _PyObject_CallMethodId((PyObject *)&PyUnicode_Type, &PyId_replace,
                                   "OCC", path, ALTSEP, SEP);
@@ -1476,6 +1488,12 @@ get_module_code(ZipImporter *self, PyObject *fullname,
     PyObject *path, *fullpath = NULL;
     struct st_zip_searchorder *zso;
 
+    if (self->prefix == NULL) {
+        PyErr_SetString(PyExc_ValueError,
+                        "zipimporter.__init__() wasn't called");
+        return NULL;
+    }
+
     subname = get_subname(fullname);
     if (subname == NULL)
         return NULL;


From solipsis at pitrou.net  Sat Oct 21 05:11:55 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 21 Oct 2017 09:11:55 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=4
Message-ID: <20171021090647.109439.7BBF9FF39172EEE5@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/reflognBDcl_', '--timeout', '7200']

From webhook-mailer at python.org  Sat Oct 21 14:59:26 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sat, 21 Oct 2017 18:59:26 -0000
Subject: [Python-checkins] Fix bytes warnings in test_struct (added in
 bpo-29802). (#4068)
Message-ID: <mailman.106.1508612368.12142.python-checkins@python.org>

https://github.com/python/cpython/commit/73c4708630f99b94c35476529748629fff1fc63e
commit: 73c4708630f99b94c35476529748629fff1fc63e
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-21T21:59:23+03:00
summary:

Fix bytes warnings in test_struct (added in bpo-29802). (#4068)

files:
M Lib/test/test_struct.py

diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index a896468848e..8fd56c91cb7 100644
--- a/Lib/test/test_struct.py
+++ b/Lib/test/test_struct.py
@@ -614,9 +614,9 @@ def test_issue29802(self):
         # the Struct object was decrefed twice and the reference to
         # deallocated object was left in a cache.
         with self.assertRaises(TypeError):
-            struct.unpack(b'b', 0)
+            struct.unpack('b', 0)
         # Shouldn't crash.
-        self.assertEqual(struct.unpack(b'b', b'a'), (b'a'[0],))
+        self.assertEqual(struct.unpack('b', b'a'), (b'a'[0],))
 
     def test_format_attr(self):
         s = struct.Struct('=i2H')


From solipsis at pitrou.net  Sun Oct 22 05:05:36 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 22 Oct 2017 09:05:36 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=5
Message-ID: <20171022090536.115894.D8B7C8C6E0D11ECD@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


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

From webhook-mailer at python.org  Sun Oct 22 05:15:44 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sun, 22 Oct 2017 09:15:44 -0000
Subject: [Python-checkins] Fix py3k warnings in 1/0 in tests. (#4072)
Message-ID: <mailman.0.1508663744.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/4dc05c34ac5269bee55455296909ec47ad8ebb24
commit: 4dc05c34ac5269bee55455296909ec47ad8ebb24
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-22T12:15:41+03:00
summary:

Fix py3k warnings in 1/0 in tests. (#4072)

files:
M Lib/ctypes/test/test_parameters.py
M Lib/json/tests/test_speedups.py
M Lib/test/test_random.py

diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py
index c6231f706b9..23c1b6e2259 100644
--- a/Lib/ctypes/test/test_parameters.py
+++ b/Lib/ctypes/test/test_parameters.py
@@ -202,7 +202,7 @@ def __dict__(self):
         class WorseStruct(Structure):
             @property
             def __dict__(self):
-                1/0
+                1/0.0
         with self.assertRaises(ZeroDivisionError):
             WorseStruct().__setstate__({}, b'foo')
 
diff --git a/Lib/json/tests/test_speedups.py b/Lib/json/tests/test_speedups.py
index 6ff8401a0c7..a6b7c38ddf6 100644
--- a/Lib/json/tests/test_speedups.py
+++ b/Lib/json/tests/test_speedups.py
@@ -3,7 +3,7 @@
 
 class BadBool:
     def __nonzero__(self):
-        1/0
+        1/0.0
 
 
 class TestSpeedups(CTest):
diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py
index d2a4f213f13..8a6d17290dd 100644
--- a/Lib/test/test_random.py
+++ b/Lib/test/test_random.py
@@ -313,10 +313,10 @@ def test_bug_31478(self):
         # long/int subclass argument.
         class BadInt(int):
             def __abs__(self):
-                1/0
+                1/0.0
         class BadLong(long):
             def __abs__(self):
-                1/0
+                1/0.0
         self.gen.seed(42)
         expected_value = self.gen.random()
         for seed_arg in [42L, BadInt(42), BadLong(42)]:


From webhook-mailer at python.org  Sun Oct 22 05:40:34 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Sun, 22 Oct 2017 09:40:34 -0000
Subject: [Python-checkins] bpo-28326: Fix multiprocessing.Process when
 stdout and/or stderr is closed or None. (#4073)
Message-ID: <mailman.1.1508665239.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/daeefd2e049b74340307481112a39f77de0f4769
commit: daeefd2e049b74340307481112a39f77de0f4769
branch: master
author: Antoine Pitrou <pitrou at free.fr>
committer: GitHub <noreply at github.com>
date: 2017-10-22T11:40:31+02:00
summary:

bpo-28326: Fix multiprocessing.Process when stdout and/or stderr is closed or None. (#4073)

files:
A Misc/NEWS.d/next/Library/2017-10-22-11-06-02.bpo-28326.rxh7L4.rst
M Lib/multiprocessing/popen_fork.py
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/multiprocessing/popen_fork.py b/Lib/multiprocessing/popen_fork.py
index cbdbfa79cf3..b0fc01396eb 100644
--- a/Lib/multiprocessing/popen_fork.py
+++ b/Lib/multiprocessing/popen_fork.py
@@ -14,8 +14,14 @@ class Popen(object):
     method = 'fork'
 
     def __init__(self, process_obj):
-        sys.stdout.flush()
-        sys.stderr.flush()
+        try:
+            sys.stdout.flush()
+        except (AttributeError, ValueError):
+            pass
+        try:
+            sys.stderr.flush()
+        except (AttributeError, ValueError):
+            pass
         self.returncode = None
         self.finalizer = None
         self._launch(process_obj)
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 8e004e21a4f..69c0bd892c8 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -582,6 +582,27 @@ def test_wait_for_threads(self):
         proc.join()
         self.assertTrue(evt.is_set())
 
+    @classmethod
+    def _test_error_on_stdio_flush(self, evt):
+        evt.set()
+
+    def test_error_on_stdio_flush(self):
+        streams = [io.StringIO(), None]
+        streams[0].close()
+        for stream_name in ('stdout', 'stderr'):
+            for stream in streams:
+                old_stream = getattr(sys, stream_name)
+                setattr(sys, stream_name, stream)
+                try:
+                    evt = self.Event()
+                    proc = self.Process(target=self._test_error_on_stdio_flush,
+                                        args=(evt,))
+                    proc.start()
+                    proc.join()
+                    self.assertTrue(evt.is_set())
+                finally:
+                    setattr(sys, stream_name, old_stream)
+
 
 #
 #
diff --git a/Misc/NEWS.d/next/Library/2017-10-22-11-06-02.bpo-28326.rxh7L4.rst b/Misc/NEWS.d/next/Library/2017-10-22-11-06-02.bpo-28326.rxh7L4.rst
new file mode 100644
index 00000000000..bcf43bc84c9
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-22-11-06-02.bpo-28326.rxh7L4.rst
@@ -0,0 +1 @@
+Fix multiprocessing.Process when stdout and/or stderr is closed or None.


From webhook-mailer at python.org  Sun Oct 22 06:18:23 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sun, 22 Oct 2017 10:18:23 -0000
Subject: [Python-checkins] bpo-28286: Add tests for the mode argument of
 GzipFile. (#4074)
Message-ID: <mailman.2.1508667504.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/bcbdd2f8db396c3f0ec9186162b39b5a34effa0e
commit: bcbdd2f8db396c3f0ec9186162b39b5a34effa0e
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-22T13:18:21+03:00
summary:

bpo-28286: Add tests for the mode argument of GzipFile. (#4074)

files:
M Lib/test/test_gzip.py

diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py
index b457bd3f44d..295d4d4a8fd 100644
--- a/Lib/test/test_gzip.py
+++ b/Lib/test/test_gzip.py
@@ -431,6 +431,30 @@ def test_fileobj_from_fdopen(self):
             with gzip.GzipFile(fileobj=f, mode="w") as g:
                 pass
 
+    def test_fileobj_mode(self):
+        gzip.GzipFile(self.filename, "wb").close()
+        with open(self.filename, "r+b") as f:
+            with gzip.GzipFile(fileobj=f, mode='r') as g:
+                self.assertEqual(g.mode, gzip.READ)
+            with gzip.GzipFile(fileobj=f, mode='w') as g:
+                self.assertEqual(g.mode, gzip.WRITE)
+            with gzip.GzipFile(fileobj=f, mode='a') as g:
+                self.assertEqual(g.mode, gzip.WRITE)
+            with gzip.GzipFile(fileobj=f, mode='x') as g:
+                self.assertEqual(g.mode, gzip.WRITE)
+            with self.assertRaises(ValueError):
+                gzip.GzipFile(fileobj=f, mode='z')
+        for mode in "rb", "r+b":
+            with open(self.filename, mode) as f:
+                with gzip.GzipFile(fileobj=f) as g:
+                    self.assertEqual(g.mode, gzip.READ)
+        for mode in "wb", "ab", "xb":
+            if "x" in mode:
+                support.unlink(self.filename)
+            with open(self.filename, mode) as f:
+                with gzip.GzipFile(fileobj=f) as g:
+                    self.assertEqual(g.mode, gzip.WRITE)
+
     def test_bytes_filename(self):
         str_filename = self.filename
         try:


From webhook-mailer at python.org  Sun Oct 22 06:27:16 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Sun, 22 Oct 2017 10:27:16 -0000
Subject: [Python-checkins] [3.6] bpo-28326: Fix multiprocessing.Process when
 stdout and/or stderr is closed or None. (GH-4073). (#4075)
Message-ID: <mailman.3.1508668037.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/34ef6da8f5fb03b83268bd35b77fb2183c748b70
commit: 34ef6da8f5fb03b83268bd35b77fb2183c748b70
branch: 3.6
author: Antoine Pitrou <pitrou at free.fr>
committer: GitHub <noreply at github.com>
date: 2017-10-22T12:27:13+02:00
summary:

[3.6] bpo-28326: Fix multiprocessing.Process when stdout and/or stderr is closed or None. (GH-4073).  (#4075)

* bpo-28326: Fix multiprocessing.Process when stdout and/or stderr is closed or None. (#4073)

(cherry picked from commit daeefd2e049b74340307481112a39f77de0f4769)

* [3.6] bpo-28326: Fix multiprocessing.Process when stdout and/or stderr is closed or None. (GH-4073).
(cherry picked from commit daeefd2e049b74340307481112a39f77de0f4769)

files:
A Misc/NEWS.d/next/Library/2017-10-22-11-06-02.bpo-28326.rxh7L4.rst
M Lib/multiprocessing/popen_fork.py
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/multiprocessing/popen_fork.py b/Lib/multiprocessing/popen_fork.py
index d2ebd7cfbe1..5d0fa569f12 100644
--- a/Lib/multiprocessing/popen_fork.py
+++ b/Lib/multiprocessing/popen_fork.py
@@ -14,8 +14,14 @@ class Popen(object):
     method = 'fork'
 
     def __init__(self, process_obj):
-        sys.stdout.flush()
-        sys.stderr.flush()
+        try:
+            sys.stdout.flush()
+        except (AttributeError, ValueError):
+            pass
+        try:
+            sys.stderr.flush()
+        except (AttributeError, ValueError):
+            pass
         self.returncode = None
         self._launch(process_obj)
 
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index db30e6b9d22..80c95d6bca6 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -425,6 +425,27 @@ def test_lose_target_ref(self):
         self.assertEqual(q.get(), 5)
         close_queue(q)
 
+    @classmethod
+    def _test_error_on_stdio_flush(self, evt):
+        evt.set()
+
+    def test_error_on_stdio_flush(self):
+        streams = [io.StringIO(), None]
+        streams[0].close()
+        for stream_name in ('stdout', 'stderr'):
+            for stream in streams:
+                old_stream = getattr(sys, stream_name)
+                setattr(sys, stream_name, stream)
+                try:
+                    evt = self.Event()
+                    proc = self.Process(target=self._test_error_on_stdio_flush,
+                                        args=(evt,))
+                    proc.start()
+                    proc.join()
+                    self.assertTrue(evt.is_set())
+                finally:
+                    setattr(sys, stream_name, old_stream)
+
 
 #
 #
diff --git a/Misc/NEWS.d/next/Library/2017-10-22-11-06-02.bpo-28326.rxh7L4.rst b/Misc/NEWS.d/next/Library/2017-10-22-11-06-02.bpo-28326.rxh7L4.rst
new file mode 100644
index 00000000000..bcf43bc84c9
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-22-11-06-02.bpo-28326.rxh7L4.rst
@@ -0,0 +1 @@
+Fix multiprocessing.Process when stdout and/or stderr is closed or None.


From webhook-mailer at python.org  Sun Oct 22 07:10:50 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Sun, 22 Oct 2017 11:10:50 -0000
Subject: [Python-checkins] bpo-31653: Don't release the GIL if we can
 acquire a multiprocessing semaphore immediately (#4078)
Message-ID: <mailman.4.1508670651.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/c872d39d324cd6f1a71b73e10406bbaed192d35f
commit: c872d39d324cd6f1a71b73e10406bbaed192d35f
branch: master
author: Antoine Pitrou <pitrou at free.fr>
committer: GitHub <noreply at github.com>
date: 2017-10-22T13:10:46+02:00
summary:

bpo-31653: Don't release the GIL if we can acquire a multiprocessing semaphore immediately (#4078)

files:
A Misc/NEWS.d/next/Library/2017-10-22-12-43-03.bpo-31653.ttfGvq.rst
M Modules/_multiprocessing/semaphore.c

diff --git a/Misc/NEWS.d/next/Library/2017-10-22-12-43-03.bpo-31653.ttfGvq.rst b/Misc/NEWS.d/next/Library/2017-10-22-12-43-03.bpo-31653.ttfGvq.rst
new file mode 100644
index 00000000000..0587a087924
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-22-12-43-03.bpo-31653.ttfGvq.rst
@@ -0,0 +1,2 @@
+Don't release the GIL if we can acquire a multiprocessing semaphore
+immediately.
diff --git a/Modules/_multiprocessing/semaphore.c b/Modules/_multiprocessing/semaphore.c
index 79e8715a061..337e8943212 100644
--- a/Modules/_multiprocessing/semaphore.c
+++ b/Modules/_multiprocessing/semaphore.c
@@ -304,19 +304,29 @@ semlock_acquire(SemLockObject *self, PyObject *args, PyObject *kwds)
         deadline.tv_nsec %= 1000000000;
     }
 
+    /* Check whether we can acquire without releasing the GIL and blocking */
     do {
-        Py_BEGIN_ALLOW_THREADS
-        if (blocking && timeout_obj == Py_None)
-            res = sem_wait(self->handle);
-        else if (!blocking)
-            res = sem_trywait(self->handle);
-        else
-            res = sem_timedwait(self->handle, &deadline);
-        Py_END_ALLOW_THREADS
+        res = sem_trywait(self->handle);
         err = errno;
-        if (res == MP_EXCEPTION_HAS_BEEN_SET)
-            break;
     } while (res < 0 && errno == EINTR && !PyErr_CheckSignals());
+    errno = err;
+
+    if (res < 0 && errno == EAGAIN && blocking) {
+        /* Couldn't acquire immediately, need to block */
+        do {
+            Py_BEGIN_ALLOW_THREADS
+            if (blocking && timeout_obj == Py_None)
+                res = sem_wait(self->handle);
+            else if (!blocking)
+                res = sem_trywait(self->handle);
+            else
+                res = sem_timedwait(self->handle, &deadline);
+            Py_END_ALLOW_THREADS
+            err = errno;
+            if (res == MP_EXCEPTION_HAS_BEEN_SET)
+                break;
+        } while (res < 0 && errno == EINTR && !PyErr_CheckSignals());
+    }
 
     if (res < 0) {
         errno = err;


From webhook-mailer at python.org  Sun Oct 22 07:53:47 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sun, 22 Oct 2017 11:53:47 -0000
Subject: [Python-checkins] bpo-28286: Add tests for the mode argument of
 GzipFile. (GH-4074) (#4076)
Message-ID: <mailman.5.1508673229.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/251de30935490a702b0a365f1e9bea696b39c016
commit: 251de30935490a702b0a365f1e9bea696b39c016
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-22T14:53:43+03:00
summary:

bpo-28286: Add tests for the mode argument of GzipFile. (GH-4074) (#4076)

(cherry picked from commit bcbdd2f8db396c3f0ec9186162b39b5a34effa0e)

files:
M Lib/test/test_gzip.py

diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py
index b457bd3f44d..295d4d4a8fd 100644
--- a/Lib/test/test_gzip.py
+++ b/Lib/test/test_gzip.py
@@ -431,6 +431,30 @@ def test_fileobj_from_fdopen(self):
             with gzip.GzipFile(fileobj=f, mode="w") as g:
                 pass
 
+    def test_fileobj_mode(self):
+        gzip.GzipFile(self.filename, "wb").close()
+        with open(self.filename, "r+b") as f:
+            with gzip.GzipFile(fileobj=f, mode='r') as g:
+                self.assertEqual(g.mode, gzip.READ)
+            with gzip.GzipFile(fileobj=f, mode='w') as g:
+                self.assertEqual(g.mode, gzip.WRITE)
+            with gzip.GzipFile(fileobj=f, mode='a') as g:
+                self.assertEqual(g.mode, gzip.WRITE)
+            with gzip.GzipFile(fileobj=f, mode='x') as g:
+                self.assertEqual(g.mode, gzip.WRITE)
+            with self.assertRaises(ValueError):
+                gzip.GzipFile(fileobj=f, mode='z')
+        for mode in "rb", "r+b":
+            with open(self.filename, mode) as f:
+                with gzip.GzipFile(fileobj=f) as g:
+                    self.assertEqual(g.mode, gzip.READ)
+        for mode in "wb", "ab", "xb":
+            if "x" in mode:
+                support.unlink(self.filename)
+            with open(self.filename, mode) as f:
+                with gzip.GzipFile(fileobj=f) as g:
+                    self.assertEqual(g.mode, gzip.WRITE)
+
     def test_bytes_filename(self):
         str_filename = self.filename
         try:


From webhook-mailer at python.org  Sun Oct 22 07:54:08 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sun, 22 Oct 2017 11:54:08 -0000
Subject: [Python-checkins] [2.7] bpo-28286: Add tests for the mode argument
 of GzipFile. (GH-4074). (#4077)
Message-ID: <mailman.6.1508673250.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/f7d19b0464cb89ec696affbad9fd7e7c94456eaf
commit: f7d19b0464cb89ec696affbad9fd7e7c94456eaf
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-22T14:54:05+03:00
summary:

[2.7] bpo-28286: Add tests for the mode argument of GzipFile. (GH-4074). (#4077)

(cherry picked from commit bcbdd2f8db396c3f0ec9186162b39b5a34effa0e)

files:
M Lib/test/test_gzip.py

diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py
index 5025b91d343..902d93fe043 100644
--- a/Lib/test/test_gzip.py
+++ b/Lib/test/test_gzip.py
@@ -331,6 +331,26 @@ def test_fileobj_from_fdopen(self):
             with gzip.GzipFile(fileobj=f, mode="w") as g:
                 self.assertEqual(g.name, "")
 
+    def test_fileobj_mode(self):
+        gzip.GzipFile(self.filename, "wb").close()
+        with open(self.filename, "r+b") as f:
+            with gzip.GzipFile(fileobj=f, mode='r') as g:
+                self.assertEqual(g.mode, gzip.READ)
+            with gzip.GzipFile(fileobj=f, mode='w') as g:
+                self.assertEqual(g.mode, gzip.WRITE)
+            with gzip.GzipFile(fileobj=f, mode='a') as g:
+                self.assertEqual(g.mode, gzip.WRITE)
+            with self.assertRaises(IOError):
+                gzip.GzipFile(fileobj=f, mode='z')
+        for mode in "rb", "r+b":
+            with open(self.filename, mode) as f:
+                with gzip.GzipFile(fileobj=f) as g:
+                    self.assertEqual(g.mode, gzip.READ)
+        for mode in "wb", "ab":
+            with open(self.filename, mode) as f:
+                with gzip.GzipFile(fileobj=f) as g:
+                    self.assertEqual(g.mode, gzip.WRITE)
+
     def test_read_with_extra(self):
         # Gzip data with an extra field
         gzdata = (b'\x1f\x8b\x08\x04\xb2\x17cQ\x02\xff'


From webhook-mailer at python.org  Sun Oct 22 14:31:37 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sun, 22 Oct 2017 18:31:37 -0000
Subject: [Python-checkins] bpo-31572: Get rid of using _PyObject_HasAttrId()
 in pickle. (#3729)
Message-ID: <mailman.7.1508697103.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/04e36af9b88cd5e80fc818e51d46f07252a2ff3f
commit: 04e36af9b88cd5e80fc818e51d46f07252a2ff3f
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-22T21:31:34+03:00
summary:

bpo-31572: Get rid of using _PyObject_HasAttrId() in pickle. (#3729)

files:
M Modules/_pickle.c

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index d531dee2565..b71fb9350e6 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -4241,19 +4241,23 @@ _pickle_Pickler___init___impl(PicklerObject *self, PyObject *file,
     self->fast = 0;
     self->fast_nesting = 0;
     self->fast_memo = NULL;
-    self->pers_func = NULL;
-    if (_PyObject_HasAttrId((PyObject *)self, &PyId_persistent_id)) {
-        self->pers_func = _PyObject_GetAttrId((PyObject *)self,
-                                              &PyId_persistent_id);
-        if (self->pers_func == NULL)
+
+    self->pers_func = _PyObject_GetAttrId((PyObject *)self,
+                                          &PyId_persistent_id);
+    if (self->pers_func == NULL) {
+        if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
             return -1;
+        }
+        PyErr_Clear();
     }
-    self->dispatch_table = NULL;
-    if (_PyObject_HasAttrId((PyObject *)self, &PyId_dispatch_table)) {
-        self->dispatch_table = _PyObject_GetAttrId((PyObject *)self,
-                                                   &PyId_dispatch_table);
-        if (self->dispatch_table == NULL)
+
+    self->dispatch_table = _PyObject_GetAttrId((PyObject *)self,
+                                               &PyId_dispatch_table);
+    if (self->dispatch_table == NULL) {
+        if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
             return -1;
+        }
+        PyErr_Clear();
     }
 
     return 0;
@@ -5208,22 +5212,24 @@ load_frozenset(UnpicklerObject *self)
 static PyObject *
 instantiate(PyObject *cls, PyObject *args)
 {
-    PyObject *result = NULL;
-    _Py_IDENTIFIER(__getinitargs__);
     /* Caller must assure args are a tuple.  Normally, args come from
        Pdata_poptuple which packs objects from the top of the stack
        into a newly created tuple. */
     assert(PyTuple_Check(args));
-    if (PyTuple_GET_SIZE(args) > 0 || !PyType_Check(cls) ||
-        _PyObject_HasAttrId(cls, &PyId___getinitargs__)) {
-        result = PyObject_CallObject(cls, args);
-    }
-    else {
+    if (!PyTuple_GET_SIZE(args) && PyType_Check(cls)) {
+        _Py_IDENTIFIER(__getinitargs__);
         _Py_IDENTIFIER(__new__);
-
-        result = _PyObject_CallMethodIdObjArgs(cls, &PyId___new__, cls, NULL);
+        PyObject *func = _PyObject_GetAttrId(cls, &PyId___getinitargs__);
+        if (func == NULL) {
+            if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
+                return NULL;
+            }
+            PyErr_Clear();
+            return _PyObject_CallMethodIdObjArgs(cls, &PyId___new__, cls, NULL);
+        }
+        Py_DECREF(func);
     }
-    return result;
+    return PyObject_CallObject(cls, args);
 }
 
 static int
@@ -6679,17 +6685,14 @@ _pickle_Unpickler___init___impl(UnpicklerObject *self, PyObject *file,
         return -1;
 
     self->fix_imports = fix_imports;
-    if (self->fix_imports == -1)
-        return -1;
 
-    if (_PyObject_HasAttrId((PyObject *)self, &PyId_persistent_load)) {
-        self->pers_func = _PyObject_GetAttrId((PyObject *)self,
-                                              &PyId_persistent_load);
-        if (self->pers_func == NULL)
-            return 1;
-    }
-    else {
-        self->pers_func = NULL;
+    self->pers_func = _PyObject_GetAttrId((PyObject *)self,
+                                          &PyId_persistent_load);
+    if (self->pers_func == NULL) {
+        if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
+            return -1;
+        }
+        PyErr_Clear();
     }
 
     self->stack = (Pdata *)Pdata_New();


From webhook-mailer at python.org  Sun Oct 22 17:39:52 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Sun, 22 Oct 2017 21:39:52 -0000
Subject: [Python-checkins] bpo-20825: Containment test for ip_network in
 ip_network.
Message-ID: <mailman.8.1508708396.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/91dc64ba3f51100540b2ab6c6cd72c3bb18a6d49
commit: 91dc64ba3f51100540b2ab6c6cd72c3bb18a6d49
branch: master
author: Cheryl Sabella <cheryl.sabella at gmail.com>
committer: Antoine Pitrou <pitrou at free.fr>
date: 2017-10-22T23:39:49+02:00
summary:

bpo-20825: Containment test for ip_network in ip_network.

files:
A Misc/NEWS.d/next/Library/2017-10-21-09-13-16.bpo-20825.-1MBEy.rst
M Doc/library/ipaddress.rst
M Lib/ipaddress.py
M Lib/test/test_ipaddress.py

diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
index 36c6859d701..75c9107bd5e 100644
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -543,6 +543,28 @@ so to avoid duplication they are only documented for :class:`IPv4Network`.
          >>> ip_network('192.0.2.0/24').supernet(new_prefix=20)
          IPv4Network('192.0.0.0/20')
 
+   .. method:: subnet_of(other)
+
+      Returns *True* if this network is a subnet of *other*.
+
+        >>> a = ip_network('192.168.1.0/24')
+        >>> b = ip_network('192.168.1.128/30')
+        >>> b.subnet_of(a)
+        True
+
+      .. versionadded:: 3.7
+
+   .. method:: supernet_of(other)
+
+      Returns *True* if this network is a supernet of *other*.
+
+        >>> a = ip_network('192.168.1.0/24')
+        >>> b = ip_network('192.168.1.128/30')
+        >>> a.supernet_of(b)
+        True
+
+      .. versionadded:: 3.7
+
    .. method:: compare_networks(other)
 
       Compare this network to *other*.  In this comparison only the network
@@ -621,6 +643,8 @@ so to avoid duplication they are only documented for :class:`IPv4Network`.
    .. method:: address_exclude(network)
    .. method:: subnets(prefixlen_diff=1, new_prefix=None)
    .. method:: supernet(prefixlen_diff=1, new_prefix=None)
+   .. method:: subnet_of(other)
+   .. method:: supernet_of(other)
    .. method:: compare_networks(other)
 
       Refer to the corresponding attribute documentation in
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
index 70746f8de85..e8ce4cef2de 100644
--- a/Lib/ipaddress.py
+++ b/Lib/ipaddress.py
@@ -776,8 +776,7 @@ def address_exclude(self, other):
         if not isinstance(other, _BaseNetwork):
             raise TypeError("%s is not a network object" % other)
 
-        if not (other.network_address >= self.network_address and
-                other.broadcast_address <= self.broadcast_address):
+        if not other.subnet_of(self):
             raise ValueError('%s not contained in %s' % (other, self))
         if other == self:
             return
@@ -788,12 +787,10 @@ def address_exclude(self, other):
 
         s1, s2 = self.subnets()
         while s1 != other and s2 != other:
-            if (other.network_address >= s1.network_address and
-                other.broadcast_address <= s1.broadcast_address):
+            if other.subnet_of(s1):
                 yield s2
                 s1, s2 = s1.subnets()
-            elif (other.network_address >= s2.network_address and
-                  other.broadcast_address <= s2.broadcast_address):
+            elif other.subnet_of(s2):
                 yield s1
                 s1, s2 = s2.subnets()
             else:
@@ -975,6 +972,26 @@ def is_multicast(self):
         return (self.network_address.is_multicast and
                 self.broadcast_address.is_multicast)
 
+    @staticmethod
+    def _is_subnet_of(a, b):
+        try:
+            # Always false if one is v4 and the other is v6.
+            if a._version != b._version:
+                raise TypeError(f"{a} and {b} are not of the same version")
+            return (b.network_address <= a.network_address and
+                    b.broadcast_address >= a.broadcast_address)
+        except AttributeError:
+            raise TypeError(f"Unable to test subnet containment "
+                            f"between {a} and {b}")
+
+    def subnet_of(self, other):
+        """Return True if this network is a subnet of other."""
+        return self._is_subnet_of(self, other)
+
+    def supernet_of(self, other):
+        """Return True if this network is a supernet of other."""
+        return self._is_subnet_of(other, self)
+
     @property
     def is_reserved(self):
         """Test if the address is otherwise IETF reserved.
diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py
index 5d9633024f7..dbf68b3f8f1 100644
--- a/Lib/test/test_ipaddress.py
+++ b/Lib/test/test_ipaddress.py
@@ -92,7 +92,6 @@ def pickle_test(self, addr):
                 y = pickle.loads(pickle.dumps(x, proto))
                 self.assertEqual(y, x)
 
-
 class CommonTestMixin_v4(CommonTestMixin):
 
     def test_leading_zeros(self):
@@ -477,6 +476,56 @@ class InterfaceTestCase_v4(BaseTestCase, NetmaskTestMixin_v4):
 class NetworkTestCase_v4(BaseTestCase, NetmaskTestMixin_v4):
     factory = ipaddress.IPv4Network
 
+    def test_subnet_of(self):
+        # containee left of container
+        self.assertFalse(
+            self.factory('10.0.0.0/30').subnet_of(
+                self.factory('10.0.1.0/24')))
+        # containee inside container
+        self.assertTrue(
+            self.factory('10.0.0.0/30').subnet_of(
+                self.factory('10.0.0.0/24')))
+        # containee right of container
+        self.assertFalse(
+            self.factory('10.0.0.0/30').subnet_of(
+                self.factory('10.0.1.0/24')))
+        # containee larger than container
+        self.assertFalse(
+            self.factory('10.0.1.0/24').subnet_of(
+                self.factory('10.0.0.0/30')))
+
+    def test_supernet_of(self):
+        # containee left of container
+        self.assertFalse(
+            self.factory('10.0.0.0/30').supernet_of(
+                self.factory('10.0.1.0/24')))
+        # containee inside container
+        self.assertFalse(
+            self.factory('10.0.0.0/30').supernet_of(
+                self.factory('10.0.0.0/24')))
+        # containee right of container
+        self.assertFalse(
+            self.factory('10.0.0.0/30').supernet_of(
+                self.factory('10.0.1.0/24')))
+        # containee larger than container
+        self.assertTrue(
+            self.factory('10.0.0.0/24').supernet_of(
+                self.factory('10.0.0.0/30')))
+
+    def test_subnet_of_mixed_types(self):
+        with self.assertRaises(TypeError):
+            ipaddress.IPv4Network('10.0.0.0/30').supernet_of(
+                ipaddress.IPv6Network('::1/128'))
+        with self.assertRaises(TypeError):
+            ipaddress.IPv6Network('::1/128').supernet_of(
+                ipaddress.IPv4Network('10.0.0.0/30'))
+        with self.assertRaises(TypeError):
+            ipaddress.IPv4Network('10.0.0.0/30').subnet_of(
+                ipaddress.IPv6Network('::1/128'))
+        with self.assertRaises(TypeError):
+            ipaddress.IPv6Network('::1/128').subnet_of(
+                ipaddress.IPv4Network('10.0.0.0/30'))
+
 
 class NetmaskTestMixin_v6(CommonTestMixin_v6):
     """Input validation on interfaces and networks is very similar"""
@@ -540,6 +589,42 @@ class InterfaceTestCase_v6(BaseTestCase, NetmaskTestMixin_v6):
 class NetworkTestCase_v6(BaseTestCase, NetmaskTestMixin_v6):
     factory = ipaddress.IPv6Network
 
+    def test_subnet_of(self):
+        # containee left of container
+        self.assertFalse(
+            self.factory('2000:999::/56').subnet_of(
+                self.factory('2000:aaa::/48')))
+        # containee inside container
+        self.assertTrue(
+            self.factory('2000:aaa::/56').subnet_of(
+                self.factory('2000:aaa::/48')))
+        # containee right of container
+        self.assertFalse(
+            self.factory('2000:bbb::/56').subnet_of(
+                self.factory('2000:aaa::/48')))
+        # containee larger than container
+        self.assertFalse(
+            self.factory('2000:aaa::/48').subnet_of(
+                self.factory('2000:aaa::/56')))
+
+    def test_supernet_of(self):
+        # containee left of container
+        self.assertFalse(
+            self.factory('2000:999::/56').supernet_of(
+                self.factory('2000:aaa::/48')))
+        # containee inside container
+        self.assertFalse(
+            self.factory('2000:aaa::/56').supernet_of(
+                self.factory('2000:aaa::/48')))
+        # containee right of container
+        self.assertFalse(
+            self.factory('2000:bbb::/56').supernet_of(
+                self.factory('2000:aaa::/48')))
+        # containee larger than container
+        self.assertTrue(
+            self.factory('2000:aaa::/48').supernet_of(
+                self.factory('2000:aaa::/56')))
+
 
 class FactoryFunctionErrors(BaseTestCase):
 
diff --git a/Misc/NEWS.d/next/Library/2017-10-21-09-13-16.bpo-20825.-1MBEy.rst b/Misc/NEWS.d/next/Library/2017-10-21-09-13-16.bpo-20825.-1MBEy.rst
new file mode 100644
index 00000000000..c1d23ec664b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-21-09-13-16.bpo-20825.-1MBEy.rst
@@ -0,0 +1,3 @@
+Add `subnet_of` and `superset_of` containment tests to
+:class:`ipaddress.IPv6Network` and :class:`ipaddress.IPv4Network`.
+Patch by Michel Albert and Cheryl Sabella.


From webhook-mailer at python.org  Sun Oct 22 17:41:54 2017
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Sun, 22 Oct 2017 21:41:54 -0000
Subject: [Python-checkins] Move exc state to generator. Fixes bpo-25612
 (#1773)
Message-ID: <mailman.9.1508708515.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/ae3087c6382011c47db82fea4d05f8bbf514265d
commit: ae3087c6382011c47db82fea4d05f8bbf514265d
branch: master
author: Mark Shannon <mark at hotpy.org>
committer: Antoine Pitrou <pitrou at free.fr>
date: 2017-10-22T23:41:51+02:00
summary:

Move exc state to generator. Fixes bpo-25612 (#1773)

Move exception state information from frame objects to coroutine (generator/thread) object where it belongs.

files:
A Misc/NEWS.d/next/C API/2017-10-22-13-12-28.bpo-25612.1jnWKT.rst
M Include/frameobject.h
M Include/genobject.h
M Include/pyerrors.h
M Include/pystate.h
M Lib/test/test_exceptions.py
M Lib/test/test_sys.py
M Objects/frameobject.c
M Objects/genobject.c
M Python/ceval.c
M Python/errors.c
M Python/pystate.c
M Python/sysmodule.c

diff --git a/Include/frameobject.h b/Include/frameobject.h
index dbe0a840df9..a95baf8867a 100644
--- a/Include/frameobject.h
+++ b/Include/frameobject.h
@@ -30,14 +30,6 @@ typedef struct _frame {
     char f_trace_lines;         /* Emit per-line trace events? */
     char f_trace_opcodes;       /* Emit per-opcode trace events? */
 
-    /* In a generator, we need to be able to swap between the exception
-       state inside the generator and the exception state of the calling
-       frame (which shouldn't be impacted when the generator "yields"
-       from an except handler).
-       These three fields exist exactly for that, and are unused for
-       non-generator frames. See the save_exc_state and swap_exc_state
-       functions in ceval.c for details of their use. */
-    PyObject *f_exc_type, *f_exc_value, *f_exc_traceback;
     /* Borrowed reference to a generator, or NULL */
     PyObject *f_gen;
 
diff --git a/Include/genobject.h b/Include/genobject.h
index b9db9f9c1c4..87fbe17d4ab 100644
--- a/Include/genobject.h
+++ b/Include/genobject.h
@@ -25,7 +25,8 @@ struct _frame; /* Avoid including frameobject.h */
     /* Name of the generator. */                                            \
     PyObject *prefix##_name;                                                \
     /* Qualified name of the generator. */                                  \
-    PyObject *prefix##_qualname;
+    PyObject *prefix##_qualname;                                            \
+    _PyErr_StackItem prefix##_exc_state;
 
 typedef struct {
     /* The gi_ prefix is intended to remind of generator-iterator. */
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index fcaba85488e..94182012246 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -78,6 +78,7 @@ PyAPI_FUNC(void) PyErr_SetNone(PyObject *);
 PyAPI_FUNC(void) PyErr_SetObject(PyObject *, PyObject *);
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(void) _PyErr_SetKeyError(PyObject *);
+_PyErr_StackItem *_PyErr_GetTopmostException(PyThreadState *tstate);
 #endif
 PyAPI_FUNC(void) PyErr_SetString(
     PyObject *exception,
diff --git a/Include/pystate.h b/Include/pystate.h
index 507a598297e..238008fce47 100644
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -123,6 +123,21 @@ typedef int (*Py_tracefunc)(PyObject *, struct _frame *, int, PyObject *);
 #ifdef Py_LIMITED_API
 typedef struct _ts PyThreadState;
 #else
+
+typedef struct _err_stackitem {
+    /* This struct represents an entry on the exception stack, which is a 
+     * per-coroutine state. (Coroutine in the computer science sense, 
+     * including the thread and generators).
+     * This ensures that the exception state is not impacted by "yields"
+     * from an except handler.
+     */
+    PyObject *exc_type, *exc_value, *exc_traceback;
+
+    struct _err_stackitem *previous_item;
+
+} _PyErr_StackItem;
+
+
 typedef struct _ts {
     /* See Python/ceval.c for comments explaining most fields */
 
@@ -147,13 +162,19 @@ typedef struct _ts {
     PyObject *c_profileobj;
     PyObject *c_traceobj;
 
+    /* The exception currently being raised */
     PyObject *curexc_type;
     PyObject *curexc_value;
     PyObject *curexc_traceback;
 
-    PyObject *exc_type;
-    PyObject *exc_value;
-    PyObject *exc_traceback;
+    /* The exception currently being handled, if no coroutines/generators
+     * are present. Always last element on the stack referred to be exc_info.
+     */
+    _PyErr_StackItem exc_state;
+
+    /* Pointer to the top of the stack of the exceptions currently
+     * being handled */
+    _PyErr_StackItem *exc_info;
 
     PyObject *dict;  /* Stores per-thread state */
 
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index a25f3bf03a5..ad4bc093841 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -1097,6 +1097,62 @@ def test_unhandled(self):
                     self.assertIn("test message", report)
                 self.assertTrue(report.endswith("\n"))
 
+    def test_yield_in_nested_try_excepts(self):
+        #Issue #25612
+        class MainError(Exception):
+            pass
+
+        class SubError(Exception):
+            pass
+
+        def main():
+            try:
+                raise MainError()
+            except MainError:
+                try:
+                    yield
+                except SubError:
+                    pass
+                raise
+
+        coro = main()
+        coro.send(None)
+        with self.assertRaises(MainError):
+            coro.throw(SubError())
+
+    def test_generator_doesnt_retain_old_exc2(self):
+        #Issue 28884#msg282532
+        def g():
+            try:
+                raise ValueError
+            except ValueError:
+                yield 1
+            self.assertEqual(sys.exc_info(), (None, None, None))
+            yield 2
+
+        gen = g()
+
+        try:
+            raise IndexError
+        except IndexError:
+            self.assertEqual(next(gen), 1)
+        self.assertEqual(next(gen), 2)
+
+    def test_raise_in_generator(self):
+        #Issue 25612#msg304117
+        def g():
+            yield 1
+            raise
+            yield 2
+
+        with self.assertRaises(ZeroDivisionError):
+            i = g()
+            try:
+                1/0
+            except:
+                next(i)
+                next(i)
+
 
 class ImportErrorTests(unittest.TestCase):
 
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index fd45abee67e..68726296128 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -971,7 +971,7 @@ class C(object): pass
         nfrees = len(x.f_code.co_freevars)
         extras = x.f_code.co_stacksize + x.f_code.co_nlocals +\
                   ncells + nfrees - 1
-        check(x, vsize('8P2c4P3ic' + CO_MAXBLOCKS*'3i' + 'P' + extras*'P'))
+        check(x, vsize('5P2c4P3ic' + CO_MAXBLOCKS*'3i' + 'P' + extras*'P'))
         # function
         def func(): pass
         check(func, size('12P'))
@@ -988,7 +988,7 @@ def bar(cls):
             check(bar, size('PP'))
         # generator
         def get_gen(): yield 1
-        check(get_gen(), size('Pb2PPP'))
+        check(get_gen(), size('Pb2PPP4P'))
         # iterator
         check(iter('abc'), size('lP'))
         # callable-iterator
diff --git a/Misc/NEWS.d/next/C API/2017-10-22-13-12-28.bpo-25612.1jnWKT.rst b/Misc/NEWS.d/next/C API/2017-10-22-13-12-28.bpo-25612.1jnWKT.rst
new file mode 100644
index 00000000000..102c2e32551
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2017-10-22-13-12-28.bpo-25612.1jnWKT.rst	
@@ -0,0 +1,3 @@
+Move the current exception state from the frame object to the co-routine.
+This simplifies the interpreter and fixes a couple of obscure bugs caused by
+having swap exception state when entering or exiting a generator.
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 8739596bfc3..6ab3a22950a 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -379,8 +379,7 @@ static PyGetSetDef frame_getsetlist[] = {
 
      * ob_type, ob_size, f_code, f_valuestack;
 
-     * f_locals, f_trace,
-       f_exc_type, f_exc_value, f_exc_traceback are NULL;
+     * f_locals, f_trace are NULL;
 
      * f_localsplus does not require re-allocation and
        the local variables in f_localsplus are NULL.
@@ -438,9 +437,6 @@ frame_dealloc(PyFrameObject *f)
     Py_DECREF(f->f_globals);
     Py_CLEAR(f->f_locals);
     Py_CLEAR(f->f_trace);
-    Py_CLEAR(f->f_exc_type);
-    Py_CLEAR(f->f_exc_value);
-    Py_CLEAR(f->f_exc_traceback);
 
     co = f->f_code;
     if (co->co_zombieframe == NULL)
@@ -469,9 +465,6 @@ frame_traverse(PyFrameObject *f, visitproc visit, void *arg)
     Py_VISIT(f->f_globals);
     Py_VISIT(f->f_locals);
     Py_VISIT(f->f_trace);
-    Py_VISIT(f->f_exc_type);
-    Py_VISIT(f->f_exc_value);
-    Py_VISIT(f->f_exc_traceback);
 
     /* locals */
     slots = f->f_code->co_nlocals + PyTuple_GET_SIZE(f->f_code->co_cellvars) + PyTuple_GET_SIZE(f->f_code->co_freevars);
@@ -502,9 +495,6 @@ frame_tp_clear(PyFrameObject *f)
     f->f_stacktop = NULL;
     f->f_executing = 0;
 
-    Py_CLEAR(f->f_exc_type);
-    Py_CLEAR(f->f_exc_value);
-    Py_CLEAR(f->f_exc_traceback);
     Py_CLEAR(f->f_trace);
 
     /* locals */
@@ -698,7 +688,6 @@ _PyFrame_New_NoTrack(PyThreadState *tstate, PyCodeObject *code,
             f->f_localsplus[i] = NULL;
         f->f_locals = NULL;
         f->f_trace = NULL;
-        f->f_exc_type = f->f_exc_value = f->f_exc_traceback = NULL;
     }
     f->f_stacktop = f->f_valuestack;
     f->f_builtins = builtins;
diff --git a/Objects/genobject.c b/Objects/genobject.c
index 5d5798c2f48..7793a54fb3d 100644
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -16,6 +16,15 @@ static char *NON_INIT_CORO_MSG = "can't send non-None value to a "
 static char *ASYNC_GEN_IGNORED_EXIT_MSG =
                                  "async generator ignored GeneratorExit";
 
+static inline int
+exc_state_traverse(_PyErr_StackItem *exc_state, visitproc visit, void *arg)
+{
+    Py_VISIT(exc_state->exc_type);
+    Py_VISIT(exc_state->exc_value);
+    Py_VISIT(exc_state->exc_traceback);
+    return 0;
+}
+
 static int
 gen_traverse(PyGenObject *gen, visitproc visit, void *arg)
 {
@@ -23,7 +32,7 @@ gen_traverse(PyGenObject *gen, visitproc visit, void *arg)
     Py_VISIT(gen->gi_code);
     Py_VISIT(gen->gi_name);
     Py_VISIT(gen->gi_qualname);
-    return 0;
+    return exc_state_traverse(&gen->gi_exc_state, visit, arg);
 }
 
 void
@@ -87,6 +96,21 @@ _PyGen_Finalize(PyObject *self)
     PyErr_Restore(error_type, error_value, error_traceback);
 }
 
+static inline void
+exc_state_clear(_PyErr_StackItem *exc_state)
+{
+    PyObject *t, *v, *tb;
+    t = exc_state->exc_type;
+    v = exc_state->exc_value;
+    tb = exc_state->exc_traceback;
+    exc_state->exc_type = NULL;
+    exc_state->exc_value = NULL;
+    exc_state->exc_traceback = NULL;
+    Py_XDECREF(t);
+    Py_XDECREF(v);
+    Py_XDECREF(tb);
+}
+
 static void
 gen_dealloc(PyGenObject *gen)
 {
@@ -116,6 +140,7 @@ gen_dealloc(PyGenObject *gen)
     Py_CLEAR(gen->gi_code);
     Py_CLEAR(gen->gi_name);
     Py_CLEAR(gen->gi_qualname);
+    exc_state_clear(&gen->gi_exc_state);
     PyObject_GC_Del(gen);
 }
 
@@ -187,7 +212,11 @@ gen_send_ex(PyGenObject *gen, PyObject *arg, int exc, int closing)
     f->f_back = tstate->frame;
 
     gen->gi_running = 1;
+    gen->gi_exc_state.previous_item = tstate->exc_info;
+    tstate->exc_info = &gen->gi_exc_state;
     result = PyEval_EvalFrameEx(f, exc);
+    tstate->exc_info = gen->gi_exc_state.previous_item;
+    gen->gi_exc_state.previous_item = NULL;
     gen->gi_running = 0;
 
     /* Don't keep the reference to f_back any longer than necessary.  It
@@ -281,16 +310,7 @@ gen_send_ex(PyGenObject *gen, PyObject *arg, int exc, int closing)
     if (!result || f->f_stacktop == NULL) {
         /* generator can't be rerun, so release the frame */
         /* first clean reference cycle through stored exception traceback */
-        PyObject *t, *v, *tb;
-        t = f->f_exc_type;
-        v = f->f_exc_value;
-        tb = f->f_exc_traceback;
-        f->f_exc_type = NULL;
-        f->f_exc_value = NULL;
-        f->f_exc_traceback = NULL;
-        Py_XDECREF(t);
-        Py_XDECREF(v);
-        Py_XDECREF(tb);
+        exc_state_clear(&gen->gi_exc_state);
         gen->gi_frame->f_gen = NULL;
         gen->gi_frame = NULL;
         Py_DECREF(f);
@@ -810,6 +830,10 @@ gen_new_with_qualname(PyTypeObject *type, PyFrameObject *f,
     gen->gi_code = (PyObject *)(f->f_code);
     gen->gi_running = 0;
     gen->gi_weakreflist = NULL;
+    gen->gi_exc_state.exc_type = NULL;
+    gen->gi_exc_state.exc_value = NULL;
+    gen->gi_exc_state.exc_traceback = NULL;
+    gen->gi_exc_state.previous_item = NULL;
     if (name != NULL)
         gen->gi_name = name;
     else
diff --git a/Python/ceval.c b/Python/ceval.c
index 0f7a40c45ce..f9a798c8565 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -511,9 +511,6 @@ enum why_code {
         WHY_SILENCED =  0x0080  /* Exception silenced by 'with' */
 };
 
-static void save_exc_state(PyThreadState *, PyFrameObject *);
-static void swap_exc_state(PyThreadState *, PyFrameObject *);
-static void restore_and_clear_exc_state(PyThreadState *, PyFrameObject *);
 static int do_raise(PyObject *, PyObject *);
 static int unpack_iterable(PyObject *, int, int, PyObject **);
 
@@ -813,17 +810,19 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
 #define UNWIND_EXCEPT_HANDLER(b) \
     do { \
         PyObject *type, *value, *traceback; \
+        _PyErr_StackItem *exc_info; \
         assert(STACK_LEVEL() >= (b)->b_level + 3); \
         while (STACK_LEVEL() > (b)->b_level + 3) { \
             value = POP(); \
             Py_XDECREF(value); \
         } \
-        type = tstate->exc_type; \
-        value = tstate->exc_value; \
-        traceback = tstate->exc_traceback; \
-        tstate->exc_type = POP(); \
-        tstate->exc_value = POP(); \
-        tstate->exc_traceback = POP(); \
+        exc_info = tstate->exc_info; \
+        type = exc_info->exc_type; \
+        value = exc_info->exc_value; \
+        traceback = exc_info->exc_traceback; \
+        exc_info->exc_type = POP(); \
+        exc_info->exc_value = POP(); \
+        exc_info->exc_traceback = POP(); \
         Py_XDECREF(type); \
         Py_XDECREF(value); \
         Py_XDECREF(traceback); \
@@ -910,16 +909,6 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
     f->f_stacktop = NULL;       /* remains NULL unless yield suspends frame */
     f->f_executing = 1;
 
-    if (co->co_flags & (CO_GENERATOR | CO_COROUTINE | CO_ASYNC_GENERATOR)) {
-        if (!throwflag && f->f_exc_type != NULL && f->f_exc_type != Py_None) {
-            /* We were in an except handler when we left,
-               restore the exception state which was put aside
-               (see YIELD_VALUE). */
-            swap_exc_state(tstate, f);
-        }
-        else
-            save_exc_state(tstate, f);
-    }
 
 #ifdef LLTRACE
     lltrace = _PyDict_GetItemId(f->f_globals, &PyId___ltrace__) != NULL;
@@ -3447,12 +3436,13 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
                 || b->b_type == SETUP_FINALLY)) {
                 PyObject *exc, *val, *tb;
                 int handler = b->b_handler;
+                _PyErr_StackItem *exc_info = tstate->exc_info;
                 /* Beware, this invalidates all b->b_* fields */
                 PyFrame_BlockSetup(f, EXCEPT_HANDLER, -1, STACK_LEVEL());
-                PUSH(tstate->exc_traceback);
-                PUSH(tstate->exc_value);
-                if (tstate->exc_type != NULL) {
-                    PUSH(tstate->exc_type);
+                PUSH(exc_info->exc_traceback);
+                PUSH(exc_info->exc_value);
+                if (exc_info->exc_type != NULL) {
+                    PUSH(exc_info->exc_type);
                 }
                 else {
                     Py_INCREF(Py_None);
@@ -3470,10 +3460,10 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
                 else
                     PyException_SetTraceback(val, Py_None);
                 Py_INCREF(exc);
-                tstate->exc_type = exc;
+                exc_info->exc_type = exc;
                 Py_INCREF(val);
-                tstate->exc_value = val;
-                tstate->exc_traceback = tb;
+                exc_info->exc_value = val;
+                exc_info->exc_traceback = tb;
                 if (tb == NULL)
                     tb = Py_None;
                 Py_INCREF(tb);
@@ -3516,28 +3506,6 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
     assert((retval != NULL) ^ (PyErr_Occurred() != NULL));
 
 fast_yield:
-    if (co->co_flags & (CO_GENERATOR | CO_COROUTINE | CO_ASYNC_GENERATOR)) {
-
-        /* The purpose of this block is to put aside the generator's exception
-           state and restore that of the calling frame. If the current
-           exception state is from the caller, we clear the exception values
-           on the generator frame, so they are not swapped back in latter. The
-           origin of the current exception state is determined by checking for
-           except handler blocks, which we must be in iff a new exception
-           state came into existence in this frame. (An uncaught exception
-           would have why == WHY_EXCEPTION, and we wouldn't be here). */
-        int i;
-        for (i = 0; i < f->f_iblock; i++) {
-            if (f->f_blockstack[i].b_type == EXCEPT_HANDLER) {
-                break;
-            }
-        }
-        if (i == f->f_iblock)
-            /* We did not create this exception. */
-            restore_and_clear_exc_state(tstate, f);
-        else
-            swap_exc_state(tstate, f);
-    }
 
     if (tstate->use_tracing) {
         if (tstate->c_tracefunc) {
@@ -4057,60 +4025,6 @@ special_lookup(PyObject *o, _Py_Identifier *id)
 }
 
 
-/* These 3 functions deal with the exception state of generators. */
-
-static void
-save_exc_state(PyThreadState *tstate, PyFrameObject *f)
-{
-    PyObject *type, *value, *traceback;
-    Py_XINCREF(tstate->exc_type);
-    Py_XINCREF(tstate->exc_value);
-    Py_XINCREF(tstate->exc_traceback);
-    type = f->f_exc_type;
-    value = f->f_exc_value;
-    traceback = f->f_exc_traceback;
-    f->f_exc_type = tstate->exc_type;
-    f->f_exc_value = tstate->exc_value;
-    f->f_exc_traceback = tstate->exc_traceback;
-    Py_XDECREF(type);
-    Py_XDECREF(value);
-    Py_XDECREF(traceback);
-}
-
-static void
-swap_exc_state(PyThreadState *tstate, PyFrameObject *f)
-{
-    PyObject *tmp;
-    tmp = tstate->exc_type;
-    tstate->exc_type = f->f_exc_type;
-    f->f_exc_type = tmp;
-    tmp = tstate->exc_value;
-    tstate->exc_value = f->f_exc_value;
-    f->f_exc_value = tmp;
-    tmp = tstate->exc_traceback;
-    tstate->exc_traceback = f->f_exc_traceback;
-    f->f_exc_traceback = tmp;
-}
-
-static void
-restore_and_clear_exc_state(PyThreadState *tstate, PyFrameObject *f)
-{
-    PyObject *type, *value, *tb;
-    type = tstate->exc_type;
-    value = tstate->exc_value;
-    tb = tstate->exc_traceback;
-    tstate->exc_type = f->f_exc_type;
-    tstate->exc_value = f->f_exc_value;
-    tstate->exc_traceback = f->f_exc_traceback;
-    f->f_exc_type = NULL;
-    f->f_exc_value = NULL;
-    f->f_exc_traceback = NULL;
-    Py_XDECREF(type);
-    Py_XDECREF(value);
-    Py_XDECREF(tb);
-}
-
-
 /* Logic for the raise statement (too complicated for inlining).
    This *consumes* a reference count to each of its arguments. */
 static int
@@ -4121,10 +4035,11 @@ do_raise(PyObject *exc, PyObject *cause)
     if (exc == NULL) {
         /* Reraise */
         PyThreadState *tstate = PyThreadState_GET();
+        _PyErr_StackItem *exc_info = _PyErr_GetTopmostException(tstate);
         PyObject *tb;
-        type = tstate->exc_type;
-        value = tstate->exc_value;
-        tb = tstate->exc_traceback;
+        type = exc_info->exc_type;
+        value = exc_info->exc_value;
+        tb = exc_info->exc_traceback;
         if (type == Py_None || type == NULL) {
             PyErr_SetString(PyExc_RuntimeError,
                             "No active exception to reraise");
diff --git a/Python/errors.c b/Python/errors.c
index 5709fddb584..51fc791f45b 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -53,6 +53,18 @@ PyErr_Restore(PyObject *type, PyObject *value, PyObject *traceback)
     Py_XDECREF(oldtraceback);
 }
 
+_PyErr_StackItem *
+_PyErr_GetTopmostException(PyThreadState *tstate)
+{
+    _PyErr_StackItem *exc_info = tstate->exc_info;
+    while ((exc_info->exc_type == NULL || exc_info->exc_type == Py_None) &&
+           exc_info->previous_item != NULL)
+    {
+        exc_info = exc_info->previous_item;
+    }
+    return exc_info;
+}
+
 static PyObject*
 _PyErr_CreateException(PyObject *exception, PyObject *value)
 {
@@ -83,7 +95,7 @@ PyErr_SetObject(PyObject *exception, PyObject *value)
     }
 
     Py_XINCREF(value);
-    exc_value = tstate->exc_value;
+    exc_value = _PyErr_GetTopmostException(tstate)->exc_value;
     if (exc_value != NULL && exc_value != Py_None) {
         /* Implicit exception chaining */
         Py_INCREF(exc_value);
@@ -335,9 +347,11 @@ PyErr_GetExcInfo(PyObject **p_type, PyObject **p_value, PyObject **p_traceback)
 {
     PyThreadState *tstate = PyThreadState_GET();
 
-    *p_type = tstate->exc_type;
-    *p_value = tstate->exc_value;
-    *p_traceback = tstate->exc_traceback;
+    _PyErr_StackItem *exc_info = _PyErr_GetTopmostException(tstate);
+    *p_type = exc_info->exc_type;
+    *p_value = exc_info->exc_value;
+    *p_traceback = exc_info->exc_traceback;
+
 
     Py_XINCREF(*p_type);
     Py_XINCREF(*p_value);
@@ -350,13 +364,13 @@ PyErr_SetExcInfo(PyObject *p_type, PyObject *p_value, PyObject *p_traceback)
     PyObject *oldtype, *oldvalue, *oldtraceback;
     PyThreadState *tstate = PyThreadState_GET();
 
-    oldtype = tstate->exc_type;
-    oldvalue = tstate->exc_value;
-    oldtraceback = tstate->exc_traceback;
+    oldtype = tstate->exc_info->exc_type;
+    oldvalue = tstate->exc_info->exc_value;
+    oldtraceback = tstate->exc_info->exc_traceback;
 
-    tstate->exc_type = p_type;
-    tstate->exc_value = p_value;
-    tstate->exc_traceback = p_traceback;
+    tstate->exc_info->exc_type = p_type;
+    tstate->exc_info->exc_value = p_value;
+    tstate->exc_info->exc_traceback = p_traceback;
 
     Py_XDECREF(oldtype);
     Py_XDECREF(oldvalue);
diff --git a/Python/pystate.c b/Python/pystate.c
index 3feae346d44..d85d604de5e 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -257,9 +257,11 @@ new_threadstate(PyInterpreterState *interp, int init)
         tstate->curexc_value = NULL;
         tstate->curexc_traceback = NULL;
 
-        tstate->exc_type = NULL;
-        tstate->exc_value = NULL;
-        tstate->exc_traceback = NULL;
+        tstate->exc_state.exc_type = NULL;
+        tstate->exc_state.exc_value = NULL;
+        tstate->exc_state.exc_traceback = NULL;
+        tstate->exc_state.previous_item = NULL;
+        tstate->exc_info = &tstate->exc_state;
 
         tstate->c_profilefunc = NULL;
         tstate->c_tracefunc = NULL;
@@ -444,9 +446,16 @@ PyThreadState_Clear(PyThreadState *tstate)
     Py_CLEAR(tstate->curexc_value);
     Py_CLEAR(tstate->curexc_traceback);
 
-    Py_CLEAR(tstate->exc_type);
-    Py_CLEAR(tstate->exc_value);
-    Py_CLEAR(tstate->exc_traceback);
+    Py_CLEAR(tstate->exc_state.exc_type);
+    Py_CLEAR(tstate->exc_state.exc_value);
+    Py_CLEAR(tstate->exc_state.exc_traceback);
+    
+    /* The stack of exception states should contain just this thread. */
+    assert(tstate->exc_info->previous_item == NULL);
+    if (Py_VerboseFlag && tstate->exc_info != &tstate->exc_state) {
+        fprintf(stderr,
+          "PyThreadState_Clear: warning: thread still has a generator\n");
+    }
 
     tstate->c_profilefunc = NULL;
     tstate->c_tracefunc = NULL;
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index e38a200c005..6dc8e08be7d 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -311,14 +311,13 @@ PyDoc_STRVAR(excepthook_doc,
 static PyObject *
 sys_exc_info(PyObject *self, PyObject *noargs)
 {
-    PyThreadState *tstate;
-    tstate = PyThreadState_GET();
+    _PyErr_StackItem *err_info = _PyErr_GetTopmostException(PyThreadState_GET());
     return Py_BuildValue(
         "(OOO)",
-        tstate->exc_type != NULL ? tstate->exc_type : Py_None,
-        tstate->exc_value != NULL ? tstate->exc_value : Py_None,
-        tstate->exc_traceback != NULL ?
-            tstate->exc_traceback : Py_None);
+        err_info->exc_type != NULL ? err_info->exc_type : Py_None,
+        err_info->exc_value != NULL ? err_info->exc_value : Py_None,
+        err_info->exc_traceback != NULL ?
+            err_info->exc_traceback : Py_None);
 }
 
 PyDoc_STRVAR(exc_info_doc,


From webhook-mailer at python.org  Sun Oct 22 22:01:22 2017
From: webhook-mailer at python.org (Gregory P. Smith)
Date: Mon, 23 Oct 2017 02:01:22 -0000
Subject: [Python-checkins] bpo-31756: subprocess.run should alias
 universal_newlines to text (#4049)
Message-ID: <mailman.10.1508724084.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/7fed7bd8bb628f0f09c6011871a4ce68afb41b18
commit: 7fed7bd8bb628f0f09c6011871a4ce68afb41b18
branch: master
author: andyclegg <andy2.0 at gmail.com>
committer: Gregory P. Smith <greg at krypto.org>
date: 2017-10-22T19:01:19-07:00
summary:

bpo-31756: subprocess.run should alias universal_newlines to text (#4049)

Improve human friendliness of the Popen API: Add text=False as a
keyword-only argument to subprocess.Popen along with a Popen
attribute .text_mode and set this based on the
encoding/errors/universal_newlines/text arguments.

The universal_newlines parameter and attribute are maintained for
backwards compatibility.

files:
A Misc/NEWS.d/next/Library/2017-10-20-12-57-52.bpo-31756.IxCvGB.rst
M Doc/library/subprocess.rst
M Lib/subprocess.py
M Lib/test/test_subprocess.py

diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index 21b1299d6f8..693355cce7f 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -61,7 +61,7 @@ compatibility with older versions, see the :ref:`call-function-trio` section.
 
    The *input* argument is passed to :meth:`Popen.communicate` and thus to the
    subprocess's stdin.  If used it must be a byte sequence, or a string if
-   *encoding* or *errors* is specified or *universal_newlines* is true.  When
+   *encoding* or *errors* is specified or *text* is true.  When
    used, the internal :class:`Popen` object is automatically created with
    ``stdin=PIPE``, and the *stdin* argument may not be used as well.
 
@@ -70,10 +70,11 @@ compatibility with older versions, see the :ref:`call-function-trio` section.
    exception hold the arguments, the exit code, and stdout and stderr if they
    were captured.
 
-   If *encoding* or *errors* are specified, or *universal_newlines* is true,
+   If *encoding* or *errors* are specified, or *text* is true,
    file objects for stdin, stdout and stderr are opened in text mode using the
    specified *encoding* and *errors* or the :class:`io.TextIOWrapper` default.
-   Otherwise, file objects are opened in binary mode.
+   The *universal_newlines* argument is equivalent  to *text* and is provided
+   for backwards compatibility. By default, file objects are opened in binary mode.
 
    Examples::
 
@@ -95,6 +96,10 @@ compatibility with older versions, see the :ref:`call-function-trio` section.
 
       Added *encoding* and *errors* parameters
 
+   .. versionchanged:: 3.7
+
+      Added the *text* parameter, as a more understandable alias of *universal_newlines*
+
 .. class:: CompletedProcess
 
    The return value from :func:`run`, representing a process that has finished.
@@ -114,8 +119,8 @@ compatibility with older versions, see the :ref:`call-function-trio` section.
    .. attribute:: stdout
 
       Captured stdout from the child process. A bytes sequence, or a string if
-      :func:`run` was called with an encoding or errors. ``None`` if stdout was not
-      captured.
+      :func:`run` was called with an encoding, errors, or text=True.
+      ``None`` if stdout was not captured.
 
       If you ran the process with ``stderr=subprocess.STDOUT``, stdout and
       stderr will be combined in this attribute, and :attr:`stderr` will be
@@ -124,8 +129,8 @@ compatibility with older versions, see the :ref:`call-function-trio` section.
    .. attribute:: stderr
 
       Captured stderr from the child process. A bytes sequence, or a string if
-      :func:`run` was called with an encoding or errors. ``None`` if stderr was not
-      captured.
+      :func:`run` was called with an encoding, errors, or text=True.
+      ``None`` if stderr was not captured.
 
    .. method:: check_returncode()
 
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index dd994e2aaf1..c7e568fafec 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -320,8 +320,11 @@ def check_output(*popenargs, timeout=None, **kwargs):
     ...              input=b"when in the course of fooman events\n")
     b'when in the course of barman events\n'
 
-    If universal_newlines=True is passed, the "input" argument must be a
-    string and the return value will be a string rather than bytes.
+    By default, all communication is in bytes, and therefore any "input"
+    should be bytes, and the return value wil be bytes.  If in text mode,
+    any "input" should be a string, and the return value will be a string
+    decoded according to locale encoding, or by "encoding" if set. Text mode
+    is triggered by setting any of text, encoding, errors or universal_newlines.
     """
     if 'stdout' in kwargs:
         raise ValueError('stdout argument not allowed, it will be overridden.')
@@ -384,15 +387,17 @@ def run(*popenargs, input=None, timeout=None, check=False, **kwargs):
     exception will be raised.
 
     There is an optional argument "input", allowing you to
-    pass a string to the subprocess's stdin.  If you use this argument
+    pass bytes or a string to the subprocess's stdin.  If you use this argument
     you may not also use the Popen constructor's "stdin" argument, as
     it will be used internally.
 
-    The other arguments are the same as for the Popen constructor.
+    By default, all communication is in bytes, and therefore any "input" should
+    be bytes, and the stdout and stderr will be bytes. If in text mode, any
+    "input" should be a string, and stdout and stderr will be strings decoded
+    according to locale encoding, or by "encoding" if set. Text mode is
+    triggered by setting any of text, encoding, errors or universal_newlines.
 
-    If universal_newlines=True is passed, the "input" argument must be a
-    string and stdout/stderr in the returned object will be strings rather than
-    bytes.
+    The other arguments are the same as for the Popen constructor.
     """
     if input is not None:
         if 'stdin' in kwargs:
@@ -513,7 +518,7 @@ def getstatusoutput(cmd):
     (-15, '')
     """
     try:
-        data = check_output(cmd, shell=True, universal_newlines=True, stderr=STDOUT)
+        data = check_output(cmd, shell=True, text=True, stderr=STDOUT)
         exitcode = 0
     except CalledProcessError as ex:
         data = ex.output
@@ -565,8 +570,10 @@ class Popen(object):
 
       env: Defines the environment variables for the new process.
 
-      universal_newlines: If true, use universal line endings for file
-          objects stdin, stdout and stderr.
+      text: If true, decode stdin, stdout and stderr using the given encoding
+          (if set) or the system default otherwise.
+
+      universal_newlines: Alias of text, provided for backwards compatibility.
 
       startupinfo and creationflags (Windows only)
 
@@ -587,10 +594,10 @@ class Popen(object):
     def __init__(self, args, bufsize=-1, executable=None,
                  stdin=None, stdout=None, stderr=None,
                  preexec_fn=None, close_fds=_PLATFORM_DEFAULT_CLOSE_FDS,
-                 shell=False, cwd=None, env=None, universal_newlines=False,
+                 shell=False, cwd=None, env=None, universal_newlines=None,
                  startupinfo=None, creationflags=0,
                  restore_signals=True, start_new_session=False,
-                 pass_fds=(), *, encoding=None, errors=None):
+                 pass_fds=(), *, encoding=None, errors=None, text=None):
         """Create new Popen instance."""
         _cleanup()
         # Held while anything is calling waitpid before returncode has been
@@ -642,10 +649,16 @@ def __init__(self, args, bufsize=-1, executable=None,
         self.stderr = None
         self.pid = None
         self.returncode = None
-        self.universal_newlines = universal_newlines
         self.encoding = encoding
         self.errors = errors
 
+        # Validate the combinations of text and universal_newlines
+        if (text is not None and universal_newlines is not None
+            and bool(universal_newlines) != bool(text)):
+            raise SubprocessError('Cannot disambiguate when both text '
+                                  'and universal_newlines are supplied but '
+                                  'different. Pass one or the other.')
+
         # Input and output objects. The general principle is like
         # this:
         #
@@ -677,25 +690,25 @@ def __init__(self, args, bufsize=-1, executable=None,
             if errread != -1:
                 errread = msvcrt.open_osfhandle(errread.Detach(), 0)
 
-        text_mode = encoding or errors or universal_newlines
+        self.text_mode = encoding or errors or text or universal_newlines
 
         self._closed_child_pipe_fds = False
 
         try:
             if p2cwrite != -1:
                 self.stdin = io.open(p2cwrite, 'wb', bufsize)
-                if text_mode:
+                if self.text_mode:
                     self.stdin = io.TextIOWrapper(self.stdin, write_through=True,
                             line_buffering=(bufsize == 1),
                             encoding=encoding, errors=errors)
             if c2pread != -1:
                 self.stdout = io.open(c2pread, 'rb', bufsize)
-                if text_mode:
+                if self.text_mode:
                     self.stdout = io.TextIOWrapper(self.stdout,
                             encoding=encoding, errors=errors)
             if errread != -1:
                 self.stderr = io.open(errread, 'rb', bufsize)
-                if text_mode:
+                if self.text_mode:
                     self.stderr = io.TextIOWrapper(self.stderr,
                             encoding=encoding, errors=errors)
 
@@ -735,6 +748,16 @@ def __init__(self, args, bufsize=-1, executable=None,
 
             raise
 
+    @property
+    def universal_newlines(self):
+        # universal_newlines as retained as an alias of text_mode for API
+        # compatability. bpo-31756
+        return self.text_mode
+
+    @universal_newlines.setter
+    def universal_newlines(self, universal_newlines):
+        self.text_mode = bool(universal_newlines)
+
     def _translate_newlines(self, data, encoding, errors):
         data = data.decode(encoding, errors)
         return data.replace("\r\n", "\n").replace("\r", "\n")
@@ -805,12 +828,16 @@ def communicate(self, input=None, timeout=None):
         reached.  Wait for process to terminate.
 
         The optional "input" argument should be data to be sent to the
-        child process (if self.universal_newlines is True, this should
-        be a string; if it is False, "input" should be bytes), or
-        None, if no data should be sent to the child.
-
-        communicate() returns a tuple (stdout, stderr).  These will be
-        bytes or, if self.universal_newlines was True, a string.
+        child process, or None, if no data should be sent to the child.
+        communicate() returns a tuple (stdout, stderr).
+
+        By default, all communication is in bytes, and therefore any
+        "input" should be bytes, and the (stdout, stderr) will be bytes.
+        If in text mode (indicated by self.text_mode), any "input" should
+        be a string, and (stdout, stderr) will be strings decoded
+        according to locale encoding, or by "encoding" if set. Text mode
+        is triggered by setting any of text, encoding, errors or
+        universal_newlines.
         """
 
         if self._communication_started and input:
@@ -1533,7 +1560,7 @@ def _communicate(self, input, endtime, orig_timeout):
 
             # Translate newlines, if requested.
             # This also turns bytes into strings.
-            if self.encoding or self.errors or self.universal_newlines:
+            if self.text_mode:
                 if stdout is not None:
                     stdout = self._translate_newlines(stdout,
                                                       self.stdout.encoding,
@@ -1553,8 +1580,7 @@ def _save_input(self, input):
             if self.stdin and self._input is None:
                 self._input_offset = 0
                 self._input = input
-                if input is not None and (
-                    self.encoding or self.errors or self.universal_newlines):
+                if input is not None and self.text_mode:
                     self._input = self._input.encode(self.stdin.encoding,
                                                      self.stdin.errors)
 
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 3ba5c028517..fff1b0db105 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -845,41 +845,44 @@ def test_writes_before_communicate(self):
         self.assertEqual(stdout, b"bananasplit")
         self.assertStderrEqual(stderr, b"")
 
-    def test_universal_newlines(self):
-        p = subprocess.Popen([sys.executable, "-c",
-                              'import sys,os;' + SETBINARY +
-                              'buf = sys.stdout.buffer;'
-                              'buf.write(sys.stdin.readline().encode());'
-                              'buf.flush();'
-                              'buf.write(b"line2\\n");'
-                              'buf.flush();'
-                              'buf.write(sys.stdin.read().encode());'
-                              'buf.flush();'
-                              'buf.write(b"line4\\n");'
-                              'buf.flush();'
-                              'buf.write(b"line5\\r\\n");'
-                              'buf.flush();'
-                              'buf.write(b"line6\\r");'
-                              'buf.flush();'
-                              'buf.write(b"\\nline7");'
-                              'buf.flush();'
-                              'buf.write(b"\\nline8");'],
-                             stdin=subprocess.PIPE,
-                             stdout=subprocess.PIPE,
-                             universal_newlines=1)
-        with p:
-            p.stdin.write("line1\n")
-            p.stdin.flush()
-            self.assertEqual(p.stdout.readline(), "line1\n")
-            p.stdin.write("line3\n")
-            p.stdin.close()
-            self.addCleanup(p.stdout.close)
-            self.assertEqual(p.stdout.readline(),
-                             "line2\n")
-            self.assertEqual(p.stdout.read(6),
-                             "line3\n")
-            self.assertEqual(p.stdout.read(),
-                             "line4\nline5\nline6\nline7\nline8")
+    def test_universal_newlines_and_text(self):
+        args = [
+            sys.executable, "-c",
+            'import sys,os;' + SETBINARY +
+            'buf = sys.stdout.buffer;'
+            'buf.write(sys.stdin.readline().encode());'
+            'buf.flush();'
+            'buf.write(b"line2\\n");'
+            'buf.flush();'
+            'buf.write(sys.stdin.read().encode());'
+            'buf.flush();'
+            'buf.write(b"line4\\n");'
+            'buf.flush();'
+            'buf.write(b"line5\\r\\n");'
+            'buf.flush();'
+            'buf.write(b"line6\\r");'
+            'buf.flush();'
+            'buf.write(b"\\nline7");'
+            'buf.flush();'
+            'buf.write(b"\\nline8");']
+
+        for extra_kwarg in ('universal_newlines', 'text'):
+            p = subprocess.Popen(args, **{'stdin': subprocess.PIPE,
+                                          'stdout': subprocess.PIPE,
+                                          extra_kwarg: True})
+            with p:
+                p.stdin.write("line1\n")
+                p.stdin.flush()
+                self.assertEqual(p.stdout.readline(), "line1\n")
+                p.stdin.write("line3\n")
+                p.stdin.close()
+                self.addCleanup(p.stdout.close)
+                self.assertEqual(p.stdout.readline(),
+                                 "line2\n")
+                self.assertEqual(p.stdout.read(6),
+                                 "line3\n")
+                self.assertEqual(p.stdout.read(),
+                                 "line4\nline5\nline6\nline7\nline8")
 
     def test_universal_newlines_communicate(self):
         # universal newlines through communicate()
diff --git a/Misc/NEWS.d/next/Library/2017-10-20-12-57-52.bpo-31756.IxCvGB.rst b/Misc/NEWS.d/next/Library/2017-10-20-12-57-52.bpo-31756.IxCvGB.rst
new file mode 100644
index 00000000000..99064e8cb76
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-20-12-57-52.bpo-31756.IxCvGB.rst
@@ -0,0 +1,3 @@
+Add a ``subprocess.Popen(text=False)`` keyword argument to `subprocess`
+functions to be more explicit about when the library should attempt to
+decode outputs into text. Patch by Andrew Clegg.


From solipsis at pitrou.net  Mon Oct 23 05:04:22 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 23 Oct 2017 09:04:22 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=10
Message-ID: <20171023090422.89772.E826CEA85ED0670D@psf.io>

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

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


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

From webhook-mailer at python.org  Mon Oct 23 08:00:46 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Mon, 23 Oct 2017 12:00:46 -0000
Subject: [Python-checkins] [3.6] bpo-31572: Get rid of using
 _PyObject_HasAttrId() in pickle. (GH-3729). (#4081)
Message-ID: <mailman.11.1508760049.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/77af0a3bcab666a356eea2927a8031a7578d60d2
commit: 77af0a3bcab666a356eea2927a8031a7578d60d2
branch: 3.6
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-23T15:00:41+03:00
summary:

[3.6] bpo-31572: Get rid of using _PyObject_HasAttrId() in pickle. (GH-3729). (#4081)

(cherry picked from commit 04e36af9b88cd5e80fc818e51d46f07252a2ff3f)

files:
M Modules/_pickle.c

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index ef0a03b1079..bc1af548072 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -4198,19 +4198,23 @@ _pickle_Pickler___init___impl(PicklerObject *self, PyObject *file,
     self->fast = 0;
     self->fast_nesting = 0;
     self->fast_memo = NULL;
-    self->pers_func = NULL;
-    if (_PyObject_HasAttrId((PyObject *)self, &PyId_persistent_id)) {
-        self->pers_func = _PyObject_GetAttrId((PyObject *)self,
-                                              &PyId_persistent_id);
-        if (self->pers_func == NULL)
+
+    self->pers_func = _PyObject_GetAttrId((PyObject *)self,
+                                          &PyId_persistent_id);
+    if (self->pers_func == NULL) {
+        if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
             return -1;
+        }
+        PyErr_Clear();
     }
-    self->dispatch_table = NULL;
-    if (_PyObject_HasAttrId((PyObject *)self, &PyId_dispatch_table)) {
-        self->dispatch_table = _PyObject_GetAttrId((PyObject *)self,
-                                                   &PyId_dispatch_table);
-        if (self->dispatch_table == NULL)
+
+    self->dispatch_table = _PyObject_GetAttrId((PyObject *)self,
+                                               &PyId_dispatch_table);
+    if (self->dispatch_table == NULL) {
+        if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
             return -1;
+        }
+        PyErr_Clear();
     }
 
     return 0;
@@ -5165,22 +5169,24 @@ load_frozenset(UnpicklerObject *self)
 static PyObject *
 instantiate(PyObject *cls, PyObject *args)
 {
-    PyObject *result = NULL;
-    _Py_IDENTIFIER(__getinitargs__);
     /* Caller must assure args are a tuple.  Normally, args come from
        Pdata_poptuple which packs objects from the top of the stack
        into a newly created tuple. */
     assert(PyTuple_Check(args));
-    if (Py_SIZE(args) > 0 || !PyType_Check(cls) ||
-        _PyObject_HasAttrId(cls, &PyId___getinitargs__)) {
-        result = PyObject_CallObject(cls, args);
-    }
-    else {
+    if (!PyTuple_GET_SIZE(args) && PyType_Check(cls)) {
+        _Py_IDENTIFIER(__getinitargs__);
         _Py_IDENTIFIER(__new__);
-
-        result = _PyObject_CallMethodId(cls, &PyId___new__, "O", cls);
+        PyObject *func = _PyObject_GetAttrId(cls, &PyId___getinitargs__);
+        if (func == NULL) {
+            if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
+                return NULL;
+            }
+            PyErr_Clear();
+            return _PyObject_CallMethodIdObjArgs(cls, &PyId___new__, cls, NULL);
+        }
+        Py_DECREF(func);
     }
-    return result;
+    return PyObject_CallObject(cls, args);
 }
 
 static int
@@ -6626,17 +6632,14 @@ _pickle_Unpickler___init___impl(UnpicklerObject *self, PyObject *file,
         return -1;
 
     self->fix_imports = fix_imports;
-    if (self->fix_imports == -1)
-        return -1;
 
-    if (_PyObject_HasAttrId((PyObject *)self, &PyId_persistent_load)) {
-        self->pers_func = _PyObject_GetAttrId((PyObject *)self,
-                                              &PyId_persistent_load);
-        if (self->pers_func == NULL)
-            return 1;
-    }
-    else {
-        self->pers_func = NULL;
+    self->pers_func = _PyObject_GetAttrId((PyObject *)self,
+                                          &PyId_persistent_load);
+    if (self->pers_func == NULL) {
+        if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
+            return -1;
+        }
+        PyErr_Clear();
     }
 
     self->stack = (Pdata *)Pdata_New();


From webhook-mailer at python.org  Mon Oct 23 09:05:49 2017
From: webhook-mailer at python.org (xdegaye)
Date: Mon, 23 Oct 2017 13:05:49 -0000
Subject: [Python-checkins] [3.6] bpo-30695: Add set_nomemory(start,
 stop) to _testcapi (GH-2406) (#4083)
Message-ID: <mailman.12.1508763951.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/aaf6a3dbbdb9754f98d480b468adfcae0f66e3a2
commit: aaf6a3dbbdb9754f98d480b468adfcae0f66e3a2
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: xdegaye <xdegaye at gmail.com>
date: 2017-10-23T15:05:46+02:00
summary:

[3.6] bpo-30695: Add set_nomemory(start, stop) to _testcapi (GH-2406) (#4083)

(cherry picked from commit 85f643023fed3d4e2fb8e399f9ad57f3a65ef237)

files:
A Misc/NEWS.d/next/Tests/2017-06-30-11-20-20.bpo-30695.lo7FQX.rst
M Lib/test/test_capi.py
M Modules/_testcapimodule.c

diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
index 216851c2d36..3a29b69f957 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -13,7 +13,7 @@
 import unittest
 from test import support
 from test.support import MISSING_C_DOCSTRINGS
-from test.support.script_helper import assert_python_failure
+from test.support.script_helper import assert_python_failure, assert_python_ok
 try:
     import _posixsubprocess
 except ImportError:
@@ -241,6 +241,38 @@ def test_return_result_with_error(self):
     def test_buildvalue_N(self):
         _testcapi.test_buildvalue_N()
 
+    def test_set_nomemory(self):
+        code = """if 1:
+            import _testcapi
+
+            class C(): pass
+
+            # The first loop tests both functions and that remove_mem_hooks()
+            # can be called twice in a row. The second loop checks a call to
+            # set_nomemory() after a call to remove_mem_hooks(). The third
+            # loop checks the start and stop arguments of set_nomemory().
+            for outer_cnt in range(1, 4):
+                start = 10 * outer_cnt
+                for j in range(100):
+                    if j == 0:
+                        if outer_cnt != 3:
+                            _testcapi.set_nomemory(start)
+                        else:
+                            _testcapi.set_nomemory(start, start + 1)
+                    try:
+                        C()
+                    except MemoryError as e:
+                        if outer_cnt != 3:
+                            _testcapi.remove_mem_hooks()
+                        print('MemoryError', outer_cnt, j)
+                        _testcapi.remove_mem_hooks()
+                        break
+        """
+        rc, out, err = assert_python_ok('-c', code)
+        self.assertIn(b'MemoryError 1 10', out)
+        self.assertIn(b'MemoryError 2 20', out)
+        self.assertIn(b'MemoryError 3 30', out)
+
 
 @unittest.skipUnless(threading, 'Threading required for this test.')
 class TestPendingCalls(unittest.TestCase):
diff --git a/Misc/NEWS.d/next/Tests/2017-06-30-11-20-20.bpo-30695.lo7FQX.rst b/Misc/NEWS.d/next/Tests/2017-06-30-11-20-20.bpo-30695.lo7FQX.rst
new file mode 100644
index 00000000000..a57bbe73c27
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2017-06-30-11-20-20.bpo-30695.lo7FQX.rst
@@ -0,0 +1,2 @@
+Add the `set_nomemory(start, stop)` and `remove_mem_hooks()` functions to
+the _testcapi module.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 2eda03cb73a..00626ccba49 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -3437,6 +3437,130 @@ test_pyobject_setallocators(PyObject *self)
     return test_setallocators(PYMEM_DOMAIN_OBJ);
 }
 
+/* Most part of the following code is inherited from the pyfailmalloc project
+ * written by Victor Stinner. */
+static struct {
+    int installed;
+    PyMemAllocatorEx raw;
+    PyMemAllocatorEx mem;
+    PyMemAllocatorEx obj;
+} FmHook;
+
+static struct {
+    int start;
+    int stop;
+    Py_ssize_t count;
+} FmData;
+
+static int
+fm_nomemory(void)
+{
+    FmData.count++;
+    if (FmData.count > FmData.start &&
+            (FmData.stop <= 0 || FmData.count <= FmData.stop)) {
+        return 1;
+    }
+    return 0;
+}
+
+static void *
+hook_fmalloc(void *ctx, size_t size)
+{
+    PyMemAllocatorEx *alloc = (PyMemAllocatorEx *)ctx;
+    if (fm_nomemory()) {
+        return NULL;
+    }
+    return alloc->malloc(alloc->ctx, size);
+}
+
+static void *
+hook_fcalloc(void *ctx, size_t nelem, size_t elsize)
+{
+    PyMemAllocatorEx *alloc = (PyMemAllocatorEx *)ctx;
+    if (fm_nomemory()) {
+        return NULL;
+    }
+    return alloc->calloc(alloc->ctx, nelem, elsize);
+}
+
+static void *
+hook_frealloc(void *ctx, void *ptr, size_t new_size)
+{
+    PyMemAllocatorEx *alloc = (PyMemAllocatorEx *)ctx;
+    if (fm_nomemory()) {
+        return NULL;
+    }
+    return alloc->realloc(alloc->ctx, ptr, new_size);
+}
+
+static void
+hook_ffree(void *ctx, void *ptr)
+{
+    PyMemAllocatorEx *alloc = (PyMemAllocatorEx *)ctx;
+    alloc->free(alloc->ctx, ptr);
+}
+
+static void
+fm_setup_hooks(void)
+{
+    PyMemAllocatorEx alloc;
+
+    if (FmHook.installed) {
+        return;
+    }
+    FmHook.installed = 1;
+
+    alloc.malloc = hook_fmalloc;
+    alloc.calloc = hook_fcalloc;
+    alloc.realloc = hook_frealloc;
+    alloc.free = hook_ffree;
+    PyMem_GetAllocator(PYMEM_DOMAIN_RAW, &FmHook.raw);
+    PyMem_GetAllocator(PYMEM_DOMAIN_MEM, &FmHook.mem);
+    PyMem_GetAllocator(PYMEM_DOMAIN_OBJ, &FmHook.obj);
+
+    alloc.ctx = &FmHook.raw;
+    PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &alloc);
+
+    alloc.ctx = &FmHook.mem;
+    PyMem_SetAllocator(PYMEM_DOMAIN_MEM, &alloc);
+
+    alloc.ctx = &FmHook.obj;
+    PyMem_SetAllocator(PYMEM_DOMAIN_OBJ, &alloc);
+}
+
+static void
+fm_remove_hooks(void)
+{
+    if (FmHook.installed) {
+        FmHook.installed = 0;
+        PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &FmHook.raw);
+        PyMem_SetAllocator(PYMEM_DOMAIN_MEM, &FmHook.mem);
+        PyMem_SetAllocator(PYMEM_DOMAIN_OBJ, &FmHook.obj);
+    }
+}
+
+static PyObject*
+set_nomemory(PyObject *self, PyObject *args)
+{
+    /* Memory allocation fails after 'start' allocation requests, and until
+     * 'stop' allocation requests except when 'stop' is negative or equal
+     * to 0 (default) in which case allocation failures never stop. */
+    FmData.count = 0;
+    FmData.stop = 0;
+    if (!PyArg_ParseTuple(args, "i|i", &FmData.start, &FmData.stop)) {
+        return NULL;
+    }
+    fm_setup_hooks();
+    Py_RETURN_NONE;
+}
+
+static PyObject*
+remove_mem_hooks(PyObject *self)
+{
+    fm_remove_hooks();
+    Py_RETURN_NONE;
+}
+
 PyDoc_STRVAR(docstring_empty,
 ""
 );
@@ -4318,6 +4442,10 @@ static PyMethodDef TestMethods[] = {
      (PyCFunction)test_pymem_setallocators, METH_NOARGS},
     {"test_pyobject_setallocators",
      (PyCFunction)test_pyobject_setallocators, METH_NOARGS},
+    {"set_nomemory", (PyCFunction)set_nomemory, METH_VARARGS,
+     PyDoc_STR("set_nomemory(start:int, stop:int = 0)")},
+    {"remove_mem_hooks", (PyCFunction)remove_mem_hooks, METH_NOARGS,
+     PyDoc_STR("Remove memory hooks.")},
     {"no_docstring",
         (PyCFunction)test_with_docstring, METH_NOARGS},
     {"docstring_empty",


From webhook-mailer at python.org  Mon Oct 23 10:12:35 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Mon, 23 Oct 2017 14:12:35 -0000
Subject: [Python-checkins] bpo-31752: Fix possible crash in timedelta
 constructor called with custom integers. (#3947)
Message-ID: <mailman.13.1508767960.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/4ffd4653a7ec9c97775472276cf5e159e2366bb2
commit: 4ffd4653a7ec9c97775472276cf5e159e2366bb2
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-23T17:12:28+03:00
summary:

bpo-31752: Fix possible crash in timedelta constructor called with custom integers. (#3947)

Bad remainder in divmod() in intermediate calculations caused an assertion failure.

files:
A Misc/NEWS.d/next/Library/2017-10-11-00-45-01.bpo-31752.DhWevN.rst
M Lib/test/datetimetester.py
M Modules/_datetimemodule.c

diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index a042efd878b..4edfb42d355 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -886,6 +886,26 @@ def as_integer_ratio(self):
             with self.assertRaises(ValueError):
                 timedelta() * get_bad_float(bad_ratio)
 
+    def test_issue31752(self):
+        # The interpreter shouldn't crash because divmod() returns negative
+        # remainder.
+        class BadInt(int):
+            def __mul__(self, other):
+                return Prod()
+
+        class Prod:
+            def __radd__(self, other):
+                return Sum()
+
+        class Sum(int):
+            def __divmod__(self, other):
+                # negative remainder
+                return (0, -1)
+
+        timedelta(microseconds=BadInt(1))
+        timedelta(hours=BadInt(1))
+        timedelta(weeks=BadInt(1))
+
 
 #############################################################################
 # date tests
diff --git a/Misc/NEWS.d/next/Library/2017-10-11-00-45-01.bpo-31752.DhWevN.rst b/Misc/NEWS.d/next/Library/2017-10-11-00-45-01.bpo-31752.DhWevN.rst
new file mode 100644
index 00000000000..4ec140b5361
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-11-00-45-01.bpo-31752.DhWevN.rst
@@ -0,0 +1 @@
+Fix possible crash in timedelta constructor called with custom integers.
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index fc2cdba70c5..09b557958a0 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -1537,6 +1537,7 @@ delta_to_microseconds(PyDateTime_Delta *self)
     if (x2 == NULL)
         goto Done;
     result = PyNumber_Add(x1, x2);
+    assert(result == NULL || PyLong_CheckExact(result));
 
 Done:
     Py_XDECREF(x1);
@@ -1559,6 +1560,7 @@ microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type)
     PyObject *num = NULL;
     PyObject *result = NULL;
 
+    assert(PyLong_CheckExact(pyus));
     tuple = PyNumber_Divmod(pyus, us_per_second);
     if (tuple == NULL)
         goto Done;
@@ -2081,11 +2083,13 @@ accum(const char* tag, PyObject *sofar, PyObject *num, PyObject *factor,
     assert(num != NULL);
 
     if (PyLong_Check(num)) {
-        prod = PyNumber_Multiply(num, factor);
+        prod = PyNumber_Multiply(factor, num);
         if (prod == NULL)
             return NULL;
+        assert(PyLong_CheckExact(prod));
         sum = PyNumber_Add(sofar, prod);
         Py_DECREF(prod);
+        assert(sum == NULL || PyLong_CheckExact(sum));
         return sum;
     }
 
@@ -2128,7 +2132,7 @@ accum(const char* tag, PyObject *sofar, PyObject *num, PyObject *factor,
          * fractional part requires float arithmetic, and may
          * lose a little info.
          */
-        assert(PyLong_Check(factor));
+        assert(PyLong_CheckExact(factor));
         dnum = PyLong_AsDouble(factor);
 
         dnum *= fracpart;
@@ -2143,6 +2147,7 @@ accum(const char* tag, PyObject *sofar, PyObject *num, PyObject *factor,
         Py_DECREF(sum);
         Py_DECREF(x);
         *leftover += fracpart;
+        assert(y == NULL || PyLong_CheckExact(y));
         return y;
     }
 


From webhook-mailer at python.org  Mon Oct 23 11:20:16 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Mon, 23 Oct 2017 15:20:16 -0000
Subject: [Python-checkins] bpo-31752: Fix possible crash in timedelta
 constructor called with custom integers. (GH-3947) (#4086)
Message-ID: <mailman.14.1508772020.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/6e45d7b90accbbdfef353c41ab0a78a3e4742803
commit: 6e45d7b90accbbdfef353c41ab0a78a3e4742803
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-23T18:20:13+03:00
summary:

bpo-31752: Fix possible crash in timedelta constructor called with custom integers. (GH-3947) (#4086)

Bad remainder in divmod() in intermediate calculations caused an assertion failure.
(cherry picked from commit 4ffd4653a7ec9c97775472276cf5e159e2366bb2)

files:
A Misc/NEWS.d/next/Library/2017-10-11-00-45-01.bpo-31752.DhWevN.rst
M Lib/test/datetimetester.py
M Modules/_datetimemodule.c

diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index 77df1b3744d..c00e38cb0c0 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -866,6 +866,26 @@ def as_integer_ratio(self):
             with self.assertRaises(ValueError):
                 timedelta() * get_bad_float(bad_ratio)
 
+    def test_issue31752(self):
+        # The interpreter shouldn't crash because divmod() returns negative
+        # remainder.
+        class BadInt(int):
+            def __mul__(self, other):
+                return Prod()
+
+        class Prod:
+            def __radd__(self, other):
+                return Sum()
+
+        class Sum(int):
+            def __divmod__(self, other):
+                # negative remainder
+                return (0, -1)
+
+        timedelta(microseconds=BadInt(1))
+        timedelta(hours=BadInt(1))
+        timedelta(weeks=BadInt(1))
+
 
 #############################################################################
 # date tests
diff --git a/Misc/NEWS.d/next/Library/2017-10-11-00-45-01.bpo-31752.DhWevN.rst b/Misc/NEWS.d/next/Library/2017-10-11-00-45-01.bpo-31752.DhWevN.rst
new file mode 100644
index 00000000000..4ec140b5361
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-11-00-45-01.bpo-31752.DhWevN.rst
@@ -0,0 +1 @@
+Fix possible crash in timedelta constructor called with custom integers.
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index d44bb3e047f..fe92b93cb4e 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -1533,6 +1533,7 @@ delta_to_microseconds(PyDateTime_Delta *self)
     if (x2 == NULL)
         goto Done;
     result = PyNumber_Add(x1, x2);
+    assert(result == NULL || PyLong_CheckExact(result));
 
 Done:
     Py_XDECREF(x1);
@@ -1555,6 +1556,7 @@ microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type)
     PyObject *num = NULL;
     PyObject *result = NULL;
 
+    assert(PyLong_CheckExact(pyus));
     tuple = PyNumber_Divmod(pyus, us_per_second);
     if (tuple == NULL)
         goto Done;
@@ -2108,11 +2110,13 @@ accum(const char* tag, PyObject *sofar, PyObject *num, PyObject *factor,
     assert(num != NULL);
 
     if (PyLong_Check(num)) {
-        prod = PyNumber_Multiply(num, factor);
+        prod = PyNumber_Multiply(factor, num);
         if (prod == NULL)
             return NULL;
+        assert(PyLong_CheckExact(prod));
         sum = PyNumber_Add(sofar, prod);
         Py_DECREF(prod);
+        assert(sum == NULL || PyLong_CheckExact(sum));
         return sum;
     }
 
@@ -2155,7 +2159,7 @@ accum(const char* tag, PyObject *sofar, PyObject *num, PyObject *factor,
          * fractional part requires float arithmetic, and may
          * lose a little info.
          */
-        assert(PyLong_Check(factor));
+        assert(PyLong_CheckExact(factor));
         dnum = PyLong_AsDouble(factor);
 
         dnum *= fracpart;
@@ -2170,6 +2174,7 @@ accum(const char* tag, PyObject *sofar, PyObject *num, PyObject *factor,
         Py_DECREF(sum);
         Py_DECREF(x);
         *leftover += fracpart;
+        assert(y == NULL || PyLong_CheckExact(y));
         return y;
     }
 


From webhook-mailer at python.org  Mon Oct 23 12:08:44 2017
From: webhook-mailer at python.org (xdegaye)
Date: Mon, 23 Oct 2017 16:08:44 -0000
Subject: [Python-checkins] bpo-30817: Fix PyErr_PrintEx() when no memory
 (#2526)
Message-ID: <mailman.15.1508774927.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/66caacf2f0d6213b049a3097556e28e30440b900
commit: 66caacf2f0d6213b049a3097556e28e30440b900
branch: master
author: xdegaye <xdegaye at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-23T18:08:41+02:00
summary:

bpo-30817: Fix PyErr_PrintEx() when no memory (#2526)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-07-01-15-11-13.bpo-30817.j7ZvN_.rst
M Lib/test/test_exceptions.py
M Python/pythonrun.c

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index ad4bc093841..cef8d44ffaa 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -10,7 +10,7 @@
 
 from test.support import (TESTFN, captured_stderr, check_impl_detail,
                           check_warnings, cpython_only, gc_collect, run_unittest,
-                          no_tracing, unlink, import_module)
+                          no_tracing, unlink, import_module, script_helper)
 
 class NaiveException(Exception):
     def __init__(self, x):
@@ -1097,6 +1097,23 @@ def test_unhandled(self):
                     self.assertIn("test message", report)
                 self.assertTrue(report.endswith("\n"))
 
+    @cpython_only
+    def test_memory_error_in_PyErr_PrintEx(self):
+        code = """if 1:
+            import _testcapi
+            class C(): pass
+            _testcapi.set_nomemory(0, %d)
+            C()
+        """
+
+        # Issue #30817: Abort in PyErr_PrintEx() when no memory.
+        # Span a large range of tests as the CPython code always evolves with
+        # changes that add or remove memory allocations.
+        for i in range(1, 20):
+            rc, out, err = script_helper.assert_python_failure("-c", code % i)
+            self.assertIn(rc, (1, 120))
+            self.assertIn(b'MemoryError', err)
+
     def test_yield_in_nested_try_excepts(self):
         #Issue #25612
         class MainError(Exception):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-07-01-15-11-13.bpo-30817.j7ZvN_.rst b/Misc/NEWS.d/next/Core and Builtins/2017-07-01-15-11-13.bpo-30817.j7ZvN_.rst
new file mode 100644
index 00000000000..f50aeefa847
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-07-01-15-11-13.bpo-30817.j7ZvN_.rst	
@@ -0,0 +1,2 @@
+`PyErr_PrintEx()` clears now the ignored exception that may be raised by
+`_PySys_SetObjectId()`, for example when no memory.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 25e2da44d95..17ec182b74c 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -630,9 +630,15 @@ PyErr_PrintEx(int set_sys_last_vars)
         return;
     /* Now we know v != NULL too */
     if (set_sys_last_vars) {
-        _PySys_SetObjectId(&PyId_last_type, exception);
-        _PySys_SetObjectId(&PyId_last_value, v);
-        _PySys_SetObjectId(&PyId_last_traceback, tb);
+        if (_PySys_SetObjectId(&PyId_last_type, exception) < 0) {
+            PyErr_Clear();
+        }
+        if (_PySys_SetObjectId(&PyId_last_value, v) < 0) {
+            PyErr_Clear();
+        }
+        if (_PySys_SetObjectId(&PyId_last_traceback, tb) < 0) {
+            PyErr_Clear();
+        }
     }
     hook = _PySys_GetObjectId(&PyId_excepthook);
     if (hook) {


From webhook-mailer at python.org  Mon Oct 23 12:57:07 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Mon, 23 Oct 2017 16:57:07 -0000
Subject: [Python-checkins] [2.7] bpo-31752: Fix possible crash in timedelta
 constructor called with custom integers. (GH-3947) (#4088)
Message-ID: <mailman.16.1508777832.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/5ef883b096895a84123760859f0f34ad37bf2277
commit: 5ef883b096895a84123760859f0f34ad37bf2277
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-23T19:57:04+03:00
summary:

[2.7] bpo-31752: Fix possible crash in timedelta constructor called with custom integers. (GH-3947) (#4088)

Bad remainder in divmod() in intermediate calculations caused an assertion failure..
(cherry picked from commit 4ffd4653a7ec9c97775472276cf5e159e2366bb2)

files:
A Misc/NEWS.d/next/Library/2017-10-11-00-45-01.bpo-31752.DhWevN.rst
M Lib/test/test_datetime.py
M Modules/datetimemodule.c

diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py
index 20abe74bbc1..f56c3f5fe3d 100644
--- a/Lib/test/test_datetime.py
+++ b/Lib/test/test_datetime.py
@@ -492,6 +492,46 @@ def as_hours(self):
         self.assertEqual(str(t3), str(t4))
         self.assertEqual(t4.as_hours(), -1)
 
+    def test_issue31752(self):
+        # The interpreter shouldn't crash because divmod() returns negative
+        # remainder.
+        class BadInt(int):
+            def __mul__(self, other):
+                return Prod()
+
+        class BadLong(long):
+            def __mul__(self, other):
+                return Prod()
+
+        class Prod:
+            def __radd__(self, other):
+                return Sum()
+
+        class Sum(int):
+            def __divmod__(self, other):
+                # negative remainder
+                return (0, -1)
+
+        timedelta(microseconds=BadInt(1))
+        timedelta(hours=BadInt(1))
+        timedelta(weeks=BadInt(1))
+        timedelta(microseconds=BadLong(1))
+        timedelta(hours=BadLong(1))
+        timedelta(weeks=BadLong(1))
+
+        class Sum(long):
+            def __divmod__(self, other):
+                # negative remainder
+                return (0, -1)
+
+        timedelta(microseconds=BadInt(1))
+        timedelta(hours=BadInt(1))
+        timedelta(weeks=BadInt(1))
+        timedelta(microseconds=BadLong(1))
+        timedelta(hours=BadLong(1))
+        timedelta(weeks=BadLong(1))
+
+
 #############################################################################
 # date tests
 
diff --git a/Misc/NEWS.d/next/Library/2017-10-11-00-45-01.bpo-31752.DhWevN.rst b/Misc/NEWS.d/next/Library/2017-10-11-00-45-01.bpo-31752.DhWevN.rst
new file mode 100644
index 00000000000..4ec140b5361
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-11-00-45-01.bpo-31752.DhWevN.rst
@@ -0,0 +1 @@
+Fix possible crash in timedelta constructor called with custom integers.
diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c
index 34b8ed41b8d..e818c5cfdc4 100644
--- a/Modules/datetimemodule.c
+++ b/Modules/datetimemodule.c
@@ -1537,6 +1537,7 @@ delta_to_microseconds(PyDateTime_Delta *self)
     if (x2 == NULL)
         goto Done;
     result = PyNumber_Add(x1, x2);
+    assert(result == NULL || PyInt_CheckExact(result) || PyLong_CheckExact(result));
 
 Done:
     Py_XDECREF(x1);
@@ -1559,6 +1560,7 @@ microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type)
     PyObject *num = NULL;
     PyObject *result = NULL;
 
+    assert(PyInt_CheckExact(pyus) || PyLong_CheckExact(pyus));
     tuple = PyNumber_Divmod(pyus, us_per_second);
     if (tuple == NULL)
         goto Done;
@@ -1851,11 +1853,13 @@ accum(const char* tag, PyObject *sofar, PyObject *num, PyObject *factor,
     assert(num != NULL);
 
     if (PyInt_Check(num) || PyLong_Check(num)) {
-        prod = PyNumber_Multiply(num, factor);
+        prod = PyNumber_Multiply(factor, num);
         if (prod == NULL)
             return NULL;
+        assert(PyInt_CheckExact(prod) || PyLong_CheckExact(prod));
         sum = PyNumber_Add(sofar, prod);
         Py_DECREF(prod);
+        assert(sum == NULL || PyInt_CheckExact(sum) || PyLong_CheckExact(sum));
         return sum;
     }
 
@@ -1898,7 +1902,7 @@ accum(const char* tag, PyObject *sofar, PyObject *num, PyObject *factor,
          * fractional part requires float arithmetic, and may
          * lose a little info.
          */
-        assert(PyInt_Check(factor) || PyLong_Check(factor));
+        assert(PyInt_CheckExact(factor) || PyLong_CheckExact(factor));
         if (PyInt_Check(factor))
             dnum = (double)PyInt_AsLong(factor);
         else
@@ -1916,6 +1920,7 @@ accum(const char* tag, PyObject *sofar, PyObject *num, PyObject *factor,
         Py_DECREF(sum);
         Py_DECREF(x);
         *leftover += fracpart;
+        assert(y == NULL || PyInt_CheckExact(y) || PyLong_CheckExact(y));
         return y;
     }
 


From webhook-mailer at python.org  Mon Oct 23 13:10:51 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Mon, 23 Oct 2017 17:10:51 -0000
Subject: [Python-checkins] bpo-30722: Make redemo work with Python 3.6+
 (GH-2311)
Message-ID: <mailman.17.1508778654.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/62adc55aff0b78447568f73bd1abc610d2784bf8
commit: 62adc55aff0b78447568f73bd1abc610d2784bf8
branch: master
author: Christoph Sarnowski <pixelbrei at gmail.com>
committer: Berker Peksag <berker.peksag at gmail.com>
date: 2017-10-23T20:10:48+03:00
summary:

bpo-30722: Make redemo work with Python 3.6+ (GH-2311)

files:
A Misc/NEWS.d/next/Tools-Demos/2017-10-23-19-45-52.bpo-30722.ioRlAu.rst
M Tools/demo/redemo.py

diff --git a/Misc/NEWS.d/next/Tools-Demos/2017-10-23-19-45-52.bpo-30722.ioRlAu.rst b/Misc/NEWS.d/next/Tools-Demos/2017-10-23-19-45-52.bpo-30722.ioRlAu.rst
new file mode 100644
index 00000000000..2d20c4ba991
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2017-10-23-19-45-52.bpo-30722.ioRlAu.rst
@@ -0,0 +1,9 @@
+Make redemo work with Python 3.6 and newer versions.
+
+In Python 3.6, flags like re.DOTALL became members of an enum.IntFlag so
+usages like ``getattr(re, 'DOTALL')`` are invalid.
+
+Also, remove the ``LOCALE`` option since it doesn't work with string
+patterns in Python 3.
+
+Patch by Christoph Sarnowski.
diff --git a/Tools/demo/redemo.py b/Tools/demo/redemo.py
index 8335d4c8720..256a63e0a00 100755
--- a/Tools/demo/redemo.py
+++ b/Tools/demo/redemo.py
@@ -75,7 +75,6 @@ def addoptions(self):
         self.boxes = []
         self.vars = []
         for name in ('IGNORECASE',
-                     'LOCALE',
                      'MULTILINE',
                      'DOTALL',
                      'VERBOSE'):
@@ -83,7 +82,7 @@ def addoptions(self):
                 frame = Frame(self.master)
                 frame.pack(fill=X)
                 self.frames.append(frame)
-            val = getattr(re, name)
+            val = getattr(re, name).value
             var = IntVar()
             box = Checkbutton(frame,
                     variable=var, text=name,


From webhook-mailer at python.org  Mon Oct 23 13:40:39 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Mon, 23 Oct 2017 17:40:39 -0000
Subject: [Python-checkins] bpo-30722: Make redemo work with Python 3.6+
 (GH-2311)
Message-ID: <mailman.18.1508780441.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/a5f9d24c171c7e3a3715161fd16b747c7dcaf76f
commit: a5f9d24c171c7e3a3715161fd16b747c7dcaf76f
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Berker Peksag <berker.peksag at gmail.com>
date: 2017-10-23T20:40:36+03:00
summary:

bpo-30722: Make redemo work with Python 3.6+ (GH-2311)

(cherry picked from commit 62adc55aff0b78447568f73bd1abc610d2784bf8)

files:
A Misc/NEWS.d/next/Tools-Demos/2017-10-23-19-45-52.bpo-30722.ioRlAu.rst
M Tools/demo/redemo.py

diff --git a/Misc/NEWS.d/next/Tools-Demos/2017-10-23-19-45-52.bpo-30722.ioRlAu.rst b/Misc/NEWS.d/next/Tools-Demos/2017-10-23-19-45-52.bpo-30722.ioRlAu.rst
new file mode 100644
index 00000000000..2d20c4ba991
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2017-10-23-19-45-52.bpo-30722.ioRlAu.rst
@@ -0,0 +1,9 @@
+Make redemo work with Python 3.6 and newer versions.
+
+In Python 3.6, flags like re.DOTALL became members of an enum.IntFlag so
+usages like ``getattr(re, 'DOTALL')`` are invalid.
+
+Also, remove the ``LOCALE`` option since it doesn't work with string
+patterns in Python 3.
+
+Patch by Christoph Sarnowski.
diff --git a/Tools/demo/redemo.py b/Tools/demo/redemo.py
index 8335d4c8720..256a63e0a00 100755
--- a/Tools/demo/redemo.py
+++ b/Tools/demo/redemo.py
@@ -75,7 +75,6 @@ def addoptions(self):
         self.boxes = []
         self.vars = []
         for name in ('IGNORECASE',
-                     'LOCALE',
                      'MULTILINE',
                      'DOTALL',
                      'VERBOSE'):
@@ -83,7 +82,7 @@ def addoptions(self):
                 frame = Frame(self.master)
                 frame.pack(fill=X)
                 self.frames.append(frame)
-            val = getattr(re, name)
+            val = getattr(re, name).value
             var = IntVar()
             box = Checkbutton(frame,
                     variable=var, text=name,


From webhook-mailer at python.org  Mon Oct 23 16:57:58 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 23 Oct 2017 20:57:58 -0000
Subject: [Python-checkins] bpo-31653: Remove deadcode in semlock_acquire()
 (#4091)
Message-ID: <mailman.19.1508792283.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/828ca59208af0b1b52a328676c5cc0c5e2e999b0
commit: 828ca59208af0b1b52a328676c5cc0c5e2e999b0
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-23T13:57:51-07:00
summary:

bpo-31653: Remove deadcode in semlock_acquire() (#4091)

Fix the following Coverity warning:

>>>     CID 1420038:  Control flow issues  (DEADCODE)
>>>     Execution cannot reach this statement: "res = sem_trywait(self->han...".
321                     res = sem_trywait(self->handle);

The deadcode was introduced by the commit
c872d39d324cd6f1a71b73e10406bbaed192d35f.

files:
M Modules/_multiprocessing/semaphore.c

diff --git a/Modules/_multiprocessing/semaphore.c b/Modules/_multiprocessing/semaphore.c
index 337e8943212..0092b139346 100644
--- a/Modules/_multiprocessing/semaphore.c
+++ b/Modules/_multiprocessing/semaphore.c
@@ -315,12 +315,12 @@ semlock_acquire(SemLockObject *self, PyObject *args, PyObject *kwds)
         /* Couldn't acquire immediately, need to block */
         do {
             Py_BEGIN_ALLOW_THREADS
-            if (blocking && timeout_obj == Py_None)
+            if (timeout_obj == Py_None) {
                 res = sem_wait(self->handle);
-            else if (!blocking)
-                res = sem_trywait(self->handle);
-            else
+            }
+            else {
                 res = sem_timedwait(self->handle, &deadline);
+            }
             Py_END_ALLOW_THREADS
             err = errno;
             if (res == MP_EXCEPTION_HAS_BEEN_SET)


From webhook-mailer at python.org  Mon Oct 23 17:27:17 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Mon, 23 Oct 2017 21:27:17 -0000
Subject: [Python-checkins] bpo-31847: Fix commented out tests in
 test_syntax. (#4084)
Message-ID: <mailman.20.1508794040.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/3b66ebe7727dba68c2c6ccf0cd85a4c31255b9b4
commit: 3b66ebe7727dba68c2c6ccf0cd85a4c31255b9b4
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-24T00:27:14+03:00
summary:

bpo-31847: Fix commented out tests in test_syntax. (#4084)

SyntaxError now is raised instead of SyntaxWarning.

files:
M Lib/test/test_syntax.py

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 5d398e6688b..7ce3d75a892 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -415,6 +415,15 @@
      ...
    SyntaxError: name 'x' is used prior to nonlocal declaration
 
+   >>> def f():
+   ...     x = 1
+   ...     def g():
+   ...         x = 2
+   ...         nonlocal x
+   Traceback (most recent call last):
+     ...
+   SyntaxError: name 'x' is assigned to before nonlocal declaration
+
    >>> def f(x):
    ...     nonlocal x
    Traceback (most recent call last):
@@ -440,24 +449,7 @@
      ...
    SyntaxError: nonlocal declaration not allowed at module level
 
-TODO(jhylton): Figure out how to test SyntaxWarning with doctest.
-
-##   >>> def f(x):
-##   ...     def f():
-##   ...         print(x)
-##   ...         nonlocal x
-##   Traceback (most recent call last):
-##     ...
-##   SyntaxWarning: name 'x' is assigned to before nonlocal declaration
-
-##   >>> def f():
-##   ...     x = 1
-##   ...     nonlocal x
-##   Traceback (most recent call last):
-##     ...
-##   SyntaxWarning: name 'x' is assigned to before nonlocal declaration
-
- From https://bugs.python.org/issue25973
+From https://bugs.python.org/issue25973
    >>> class A:
    ...     def f(self):
    ...         nonlocal __x


From lp_benchmark_robot at intel.com  Mon Oct 23 17:28:56 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Mon, 23 Oct 2017 14:28:56 -0700
Subject: [Python-checkins] [11 up,
 54 flat] Results for Python (master branch) 2017-10-23
Message-ID: <4489d6e1-1c61-467f-bd04-a099bd075372@orsmsx106.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-23 08:12:24-07:00.
  - commit:		4ffd465
  - previous commit:	525f40d
  - revision date:	2017-10-23 17:12:28+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.039% |  -0.270%   |  +4.734%   |  +8.606%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |             call_method| 0.799% |  +4.941%   |  +20.956%  |  +6.263%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |       call_method_slots| 1.559% |  +4.308%   |  +21.078%  |  +7.778%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |     call_method_unknown| 1.339% |  +4.625%   |  +20.429%  |  +6.866%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |             call_simple| 2.961% |  +7.705%   |  +6.167%   |  +9.566%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 2.108% |  +2.957%   |  +10.758%  |  +9.478%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |                   chaos| 0.666% |  +3.777%   |  +8.701%   |  +9.108%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.486% |  -0.221%   |  +3.714%   |  +6.295%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.307% |  -1.236%   |  +7.516%   |  +19.427%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.381% |  +0.697%   |  +9.240%   |  +13.778%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.186% |  +2.482%   |  +5.231%   |  +5.730%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.562% |  +0.831%   |  +5.912%   |  +4.043%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.637% |  +1.029%   |  +3.753%   |  +5.927%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |             genshi_text| 1.165% |  +6.877%   |  +13.403%  |  +7.350%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.713% |  +3.066%   |  +8.859%   |  +9.223%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.656% |  +2.331%   |  +7.490%   |  +10.977%  |
+-----+------------------------+--------+------------+------------+------------+
| :-) |                  hexiom| 0.346% |  +2.284%   |  +10.339%  |  +11.418%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 2.604% |  +1.819%   |  +9.487%   |  +8.845%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 2.179% |  -0.001%   |  +3.070%   |  +9.446%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 4.713% |  -7.291%   |  -4.067%   |  +17.152%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.810% |  +2.193%   |  +8.866%   |  +10.959%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.869% |  -0.868%   |  +46.457%  |  +13.524%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.869% |  +2.305%   |  +9.819%   |  +11.873%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.328% |  -0.764%   |  +18.194%  |  +9.922%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 1.583% |  +0.333%   |  +8.766%   |  +10.411%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.384% |  +0.912%   |  +3.873%   |  +5.235%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 1.430% |  -0.205%   |  -1.024%   |  +3.011%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |                 nqueens| 0.782% |  +5.503%   |  +6.615%   |  +6.212%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |                 pathlib| 1.132% |  +5.554%   |  +7.429%   |  +8.472%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 0.953% |  -0.980%   |  +0.330%   |  +22.225%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.581% |  -1.463%   |  +0.685%   |  +22.064%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.620% |  -1.053%   |  +4.137%   |  +19.294%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.687% |  +2.859%   |  +12.526%  |  +9.575%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.114% |  +0.017%   |  +0.320%   |  +10.056%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.123% |  +0.319%   |  +11.171%  |  +5.077%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.088% |  +0.144%   |  +2.479%   |  +5.109%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.165% |  +2.643%   |  +11.097%  |  +11.862%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.725% |  +2.488%   |  +2.387%   |  +13.478%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.297% |  +0.315%   |  -1.575%   |  +11.624%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.836% |  +0.164%   |  -2.271%   |  +2.892%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |                regex_v8| 2.612% |  +4.859%   |  +10.527%  |  +0.573%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.640% |  +2.702%   |  +9.041%   |  +14.227%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.534% |  +1.425%   |  +1.496%   |  -0.050%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.598% |  +2.045%   |  +27.592%  |  +8.369%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 3.097% |  +1.123%   |  +4.683%   |  +5.118%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.815% |  +2.413%   |  +14.215%  |  +8.849%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) | scimark_sparse_mat_mult| 0.315% |  +4.278%   |  +2.350%   |  -4.568%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 1.095% |  -0.157%   |  +2.439%   |  +5.486%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.029% |  +0.121%   |  +7.092%   |  +7.836%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.089% |  +1.866%   |  +7.777%   |  +4.253%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 3.213% |  +1.571%   |  +19.888%  |  +8.088%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.815% |  +1.333%   |  +12.255%  |  +8.569%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.288% |  +1.795%   |  +10.640%  |  +6.127%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.161% |  +1.861%   |  +11.757%  |  +9.623%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.410% |  +0.060%   |  +11.962%  |  +11.754%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 3.254% |  +3.018%   |  +23.987%  |  +10.407%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.071% |  +1.882%   |  +6.851%   |  +5.954%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 0.888% |  +1.553%   |  +2.531%   |  -1.214%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 5.850% |  +4.906%   |  +11.235%  |  +17.618%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 1.794% |  +2.961%   |  +1.955%   |  +15.913%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 2.223% |  +1.517%   |  +8.035%   |  +7.099%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.329% |  +1.116%   |  +4.805%   |  +9.270%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.576% |  +2.182%   |  +2.477%   |  +7.185%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 3.525% |  +1.621%   |  -6.389%   |  +12.705%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.287% |  +2.123%   |  +6.084%   |  +9.307%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/11-up-54-flat-results-for-python-master-branch-2017-10-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  Mon Oct 23 18:08:05 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Mon, 23 Oct 2017 22:08:05 -0000
Subject: [Python-checkins] bpo-31847: Fix commented out tests in
 test_syntax. (GH-4084) (#4095)
Message-ID: <mailman.21.1508796488.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/d7604f5d0621c23d037455acd682d0d489455d54
commit: d7604f5d0621c23d037455acd682d0d489455d54
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-24T01:08:03+03:00
summary:

bpo-31847: Fix commented out tests in test_syntax. (GH-4084) (#4095)

SyntaxError now is raised instead of SyntaxWarning.
(cherry picked from commit 3b66ebe7727dba68c2c6ccf0cd85a4c31255b9b4)

files:
M Lib/test/test_syntax.py

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 7f7e6dafcf9..b7095a2cdb0 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -384,6 +384,15 @@
      ...
    SyntaxError: name 'x' is used prior to nonlocal declaration
 
+   >>> def f():
+   ...     x = 1
+   ...     def g():
+   ...         x = 2
+   ...         nonlocal x
+   Traceback (most recent call last):
+     ...
+   SyntaxError: name 'x' is assigned to before nonlocal declaration
+
    >>> def f(x):
    ...     nonlocal x
    Traceback (most recent call last):
@@ -409,24 +418,7 @@
      ...
    SyntaxError: nonlocal declaration not allowed at module level
 
-TODO(jhylton): Figure out how to test SyntaxWarning with doctest.
-
-##   >>> def f(x):
-##   ...     def f():
-##   ...         print(x)
-##   ...         nonlocal x
-##   Traceback (most recent call last):
-##     ...
-##   SyntaxWarning: name 'x' is assigned to before nonlocal declaration
-
-##   >>> def f():
-##   ...     x = 1
-##   ...     nonlocal x
-##   Traceback (most recent call last):
-##     ...
-##   SyntaxWarning: name 'x' is assigned to before nonlocal declaration
-
- From https://bugs.python.org/issue25973
+From https://bugs.python.org/issue25973
    >>> class A:
    ...     def f(self):
    ...         nonlocal __x


From webhook-mailer at python.org  Tue Oct 24 02:54:22 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Tue, 24 Oct 2017 06:54:22 -0000
Subject: [Python-checkins] fixes bpo-31834: Use optimized code for BLAKE2
 only with SSSE3+ (#4066)
Message-ID: <mailman.22.1508828066.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/1aa00ff383c43335e4a5044274617dbf59bc839e
commit: 1aa00ff383c43335e4a5044274617dbf59bc839e
branch: master
author: Micha? G?rny <mgorny at gentoo.org>
committer: Benjamin Peterson <benjamin at python.org>
date: 2017-10-23T23:54:19-07:00
summary:

fixes bpo-31834: Use optimized code for BLAKE2 only with SSSE3+ (#4066)

Rework the code choosing BLAKE2 code paths from using the optimized
variant on all x86_64 machines to using it when SSSE3 or better
supported instructions sets are available.

Firstly, this solves the problem of using pure SSE2 code path on x86_64
machines. As reported in the bug, this code is slower than the reference
code on all tested x86_64 machines. Furthermore, on Athlon64 that lacks
SSSE3, it is even 2.5 times slower than the reference code! Checking
for SSSE3 therefore ensures that the optimized implementation will only
be used when it has a chance of performing better.

Secondly, this makes it possible to use SSSE3+ optimizations on 32-bit
x86 systems. This allows for even 2 times speed gain on modern 32-bit
x86 systems (tested in a 32-bit chroot).

files:
A Misc/NEWS.d/next/Library/2017-10-23-23-27-52.bpo-31834.InwC6O.rst
M Modules/_blake2/blake2b_impl.c
M Modules/_blake2/blake2s_impl.c
M setup.py

diff --git a/Misc/NEWS.d/next/Library/2017-10-23-23-27-52.bpo-31834.InwC6O.rst b/Misc/NEWS.d/next/Library/2017-10-23-23-27-52.bpo-31834.InwC6O.rst
new file mode 100644
index 00000000000..0fe3950e69d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-23-23-27-52.bpo-31834.InwC6O.rst
@@ -0,0 +1,2 @@
+Use optimized code for BLAKE2 only with SSSE3+. The pure SSE2 implementation
+is slower than the pure C reference implementation.
diff --git a/Modules/_blake2/blake2b_impl.c b/Modules/_blake2/blake2b_impl.c
index b1ae3e9b628..3c2a035f3d7 100644
--- a/Modules/_blake2/blake2b_impl.c
+++ b/Modules/_blake2/blake2b_impl.c
@@ -26,7 +26,9 @@
 #include "impl/blake2.h"
 #include "impl/blake2-impl.h" /* for secure_zero_memory() and store48() */
 
-#ifdef BLAKE2_USE_SSE
+/* pure SSE2 implementation is very slow, so only use the more optimized SSSE3+
+ * https://bugs.python.org/issue31834 */
+#if defined(__SSSE3__) || defined(__SSE4_1__) || defined(__AVX__) || defined(__XOP__)
 #include "impl/blake2b.c"
 #else
 #include "impl/blake2b-ref.c"
diff --git a/Modules/_blake2/blake2s_impl.c b/Modules/_blake2/blake2s_impl.c
index 3615a383db3..2c5697299fc 100644
--- a/Modules/_blake2/blake2s_impl.c
+++ b/Modules/_blake2/blake2s_impl.c
@@ -26,7 +26,9 @@
 #include "impl/blake2.h"
 #include "impl/blake2-impl.h" /* for secure_zero_memory() and store48() */
 
-#ifdef BLAKE2_USE_SSE
+/* pure SSE2 implementation is very slow, so only use the more optimized SSSE3+
+ * https://bugs.python.org/issue31834 */
+#if defined(__SSSE3__) || defined(__SSE4_1__) || defined(__AVX__) || defined(__XOP__)
 #include "impl/blake2s.c"
 #else
 #include "impl/blake2s-ref.c"
diff --git a/setup.py b/setup.py
index 11c4ec67f43..51e5d7eff7f 100644
--- a/setup.py
+++ b/setup.py
@@ -922,19 +922,10 @@ def detect_modules(self):
                                         'Modules/_blake2/impl/*'))
         blake2_deps.append('hashlib.h')
 
-        blake2_macros = []
-        if (not cross_compiling and
-                os.uname().machine == "x86_64" and
-                sys.maxsize >  2**32):
-            # Every x86_64 machine has at least SSE2.  Check for sys.maxsize
-            # in case that kernel is 64-bit but userspace is 32-bit.
-            blake2_macros.append(('BLAKE2_USE_SSE', '1'))
-
         exts.append( Extension('_blake2',
                                ['_blake2/blake2module.c',
                                 '_blake2/blake2b_impl.c',
                                 '_blake2/blake2s_impl.c'],
-                               define_macros=blake2_macros,
                                depends=blake2_deps) )
 
         sha3_deps = glob(os.path.join(os.getcwd(), srcdir,


From webhook-mailer at python.org  Tue Oct 24 03:59:24 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 24 Oct 2017 07:59:24 -0000
Subject: [Python-checkins] [2.7] bpo-31667: Fix gettext related links.
 (GH-3860) (#4100)
Message-ID: <mailman.23.1508831966.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/ef346a2473376c888ff160db9623eaa9871db2ac
commit: ef346a2473376c888ff160db9623eaa9871db2ac
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-24T10:59:17+03:00
summary:

[2.7] bpo-31667: Fix gettext related links. (GH-3860) (#4100)

* Fix incorrect links.
* Remove redundant links.
* Add signatures and index entries for gettext related
functions in the locale module.
(cherry picked from commit c02a1f4ad8fcdbffad2911c5a31c71a17a89d713)

files:
M Doc/library/gettext.rst
M Doc/library/locale.rst

diff --git a/Doc/library/gettext.rst b/Doc/library/gettext.rst
index f885afb5bef..4b4883a7e33 100644
--- a/Doc/library/gettext.rst
+++ b/Doc/library/gettext.rst
@@ -149,7 +149,7 @@ Class-based API
 
 The class-based API of the :mod:`gettext` module gives you more flexibility and
 greater convenience than the GNU :program:`gettext` API.  It is the recommended
-way of localizing your Python applications and modules.  :mod:`gettext` defines
+way of localizing your Python applications and modules.  :mod:`!gettext` defines
 a "translations" class which implements the parsing of GNU :file:`.mo` format
 files, and has methods for returning either standard 8-bit strings or Unicode
 strings. Instances of this "translations" class can also install themselves  in
@@ -239,7 +239,7 @@ Translation classes are what actually implement the translation of original
 source file message strings to translated message strings. The base class used
 by all translation classes is :class:`NullTranslations`; this provides the basic
 interface you can use to write your own specialized translation classes.  Here
-are the methods of :class:`NullTranslations`:
+are the methods of :class:`!NullTranslations`:
 
 
 .. class:: NullTranslations([fp])
@@ -268,14 +268,14 @@ are the methods of :class:`NullTranslations`:
 
    .. method:: gettext(message)
 
-      If a fallback has been set, forward :meth:`gettext` to the
+      If a fallback has been set, forward :meth:`!gettext` to the
       fallback. Otherwise, return the translated message.  Overridden in derived
       classes.
 
 
    .. method:: lgettext(message)
 
-      If a fallback has been set, forward :meth:`lgettext` to the
+      If a fallback has been set, forward :meth:`!lgettext` to the
       fallback. Otherwise, return the translated message.  Overridden in derived
       classes.
 
@@ -284,14 +284,14 @@ are the methods of :class:`NullTranslations`:
 
    .. method:: ugettext(message)
 
-      If a fallback has been set, forward :meth:`ugettext` to the
+      If a fallback has been set, forward :meth:`!ugettext` to the
       fallback. Otherwise, return the translated message as a Unicode
       string. Overridden in derived classes.
 
 
    .. method:: ngettext(singular, plural, n)
 
-      If a fallback has been set, forward :meth:`ngettext` to the
+      If a fallback has been set, forward :meth:`!ngettext` to the
       fallback. Otherwise, return the translated message.  Overridden in derived
       classes.
 
@@ -300,7 +300,7 @@ are the methods of :class:`NullTranslations`:
 
    .. method:: lngettext(singular, plural, n)
 
-      If a fallback has been set, forward :meth:`lngettext` to the
+      If a fallback has been set, forward :meth:`!lngettext` to the
       fallback. Otherwise, return the translated message.  Overridden in derived
       classes.
 
@@ -309,7 +309,7 @@ are the methods of :class:`NullTranslations`:
 
    .. method:: ungettext(singular, plural, n)
 
-      If a fallback has been set, forward :meth:`ungettext` to the fallback.
+      If a fallback has been set, forward :meth:`!ungettext` to the fallback.
       Otherwise, return the translated message as a Unicode string. Overridden
       in derived classes.
 
diff --git a/Doc/library/locale.rst b/Doc/library/locale.rst
index 0b0268537a4..e16f131b57d 100644
--- a/Doc/library/locale.rst
+++ b/Doc/library/locale.rst
@@ -552,17 +552,23 @@ library.
 Access to message catalogs
 --------------------------
 
+.. function:: gettext(msg)
+.. function:: dgettext(domain, msg)
+.. function:: dcgettext(domain, msg, category)
+.. function:: textdomain(domain)
+.. function:: bindtextdomain(domain, dir)
+
 The locale module exposes the C library's gettext interface on systems that
-provide this interface.  It consists of the functions :func:`gettext`,
-:func:`dgettext`, :func:`dcgettext`, :func:`textdomain`, :func:`bindtextdomain`,
-and :func:`bind_textdomain_codeset`.  These are similar to the same functions in
+provide this interface.  It consists of the functions :func:`!gettext`,
+:func:`!dgettext`, :func:`!dcgettext`, :func:`!textdomain`, :func:`!bindtextdomain`,
+and :func:`!bind_textdomain_codeset`.  These are similar to the same functions in
 the :mod:`gettext` module, but use the C library's binary format for message
 catalogs, and the C library's search algorithms for locating message catalogs.
 
 Python applications should normally find no need to invoke these functions, and
 should use :mod:`gettext` instead.  A known exception to this rule are
 applications that link with additional C libraries which internally invoke
-:c:func:`gettext` or :func:`dcgettext`.  For these applications, it may be
+:c:func:`gettext` or :c:func:`dcgettext`.  For these applications, it may be
 necessary to bind the text domain, so that the libraries can properly locate
 their message catalogs.
 


From webhook-mailer at python.org  Tue Oct 24 04:29:56 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 24 Oct 2017 08:29:56 -0000
Subject: [Python-checkins] bpo-31810: Add smelly.py to check exported
 symbols (#4057)
Message-ID: <mailman.24.1508833799.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/87d332dcdbffe8ff60d99f74b1ad241c0967b055
commit: 87d332dcdbffe8ff60d99f74b1ad241c0967b055
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-24T01:29:53-07:00
summary:

bpo-31810: Add smelly.py to check exported symbols (#4057)

* Add Tools/scripts/smelly.py: script checking if all symbols
  exported by libpython start with "Py" or "_Py".
* Modify "make smelly" to run smelly.py: the command now fails with a
  non-zero exit code if libpython leaks a "smelly" symbol.
* Travis CI now runs "make smelly"

files:
A Tools/scripts/smelly.py
M .travis.yml
M Makefile.pre.in

diff --git a/.travis.yml b/.travis.yml
index 185846029c2..c207bd72da2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,6 +91,8 @@ script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./python Tools/scripts/patchcheck.py --travis $TRAVIS_PULL_REQUEST; fi
   # `-r -w` implicitly provided through `make buildbottest`.
   - make buildbottest TESTOPTS="-j4 -uall,-cpu"
+  # Check that all symbols exported by libpython start with "Py" or "_Py"
+  - make smelly
 
 notifications:
   email: false
diff --git a/Makefile.pre.in b/Makefile.pre.in
index e8df8f7355e..6dacb872e0c 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1659,10 +1659,9 @@ distclean: clobber
 				     -o -name '*.bak' ')' \
 				     -exec rm -f {} ';'
 
-# Check for smelly exported symbols (not starting with Py/_Py)
+# Check that all symbols exported by libpython start with "Py" or "_Py"
 smelly: @DEF_MAKE_RULE@
-	nm -p $(LIBRARY) | \
-		sed -n "/ [TDB] /s/.* //p" | grep -v "^_*Py" | sort -u; \
+	$(RUNSHARED) ./$(BUILDPYTHON) Tools/scripts/smelly.py
 
 # Find files with funny names
 funny:
diff --git a/Tools/scripts/smelly.py b/Tools/scripts/smelly.py
new file mode 100755
index 00000000000..212eedb30bc
--- /dev/null
+++ b/Tools/scripts/smelly.py
@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+# Script checking that all symbols exported by libpython start with Py or _Py
+
+import subprocess
+import sys
+import sysconfig
+
+
+def get_exported_symbols():
+    LIBRARY = sysconfig.get_config_var('LIBRARY')
+    if not LIBRARY:
+        raise Exception("failed to get LIBRARY")
+
+    args = ('nm', '-p', LIBRARY)
+    print("+ %s" % ' '.join(args))
+    proc = subprocess.run(args, stdout=subprocess.PIPE, universal_newlines=True)
+    if proc.returncode:
+        sys.stdout.write(proc.stdout)
+        sys.exit(proc.returncode)
+
+    stdout = proc.stdout.rstrip()
+    if not stdout:
+        raise Exception("command output is empty")
+    return stdout
+
+
+def get_smelly_symbols(stdout):
+    symbols = []
+    ignored_symtypes = set()
+    for line in stdout.splitlines():
+        # Split line '0000000000001b80 D PyTextIOWrapper_Type'
+        if not line:
+            continue
+
+        parts = line.split(maxsplit=2)
+        if len(parts) < 3:
+            continue
+
+        symtype = parts[1].strip()
+        # Ignore private symbols.
+        #
+        # If lowercase, the symbol is usually local; if uppercase, the symbol
+        # is global (external).  There are however a few lowercase symbols that
+        # are shown for special global symbols ("u", "v" and "w").
+        if symtype.islower() and symtype not in "uvw":
+            ignored_symtypes.add(symtype)
+            continue
+
+        symbol = parts[-1]
+        if symbol.startswith(('Py', '_Py')):
+            continue
+        symbol = '%s (type: %s)' % (symbol, symtype)
+        symbols.append(symbol)
+
+    if ignored_symtypes:
+        print("Ignored symbol types: %s" % ', '.join(sorted(ignored_symtypes)))
+        print()
+    return symbols
+
+
+def main():
+    nm_output = get_exported_symbols()
+    symbols = get_smelly_symbols(nm_output)
+
+    if not symbols:
+        print("OK: no smelly symbol found")
+        sys.exit(0)
+
+    symbols.sort()
+    for symbol in symbols:
+        print("Smelly symbol: %s" % symbol)
+    print()
+    print("ERROR: Found %s smelly symbols!" % len(symbols))
+    sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()


From webhook-mailer at python.org  Tue Oct 24 05:02:03 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 24 Oct 2017 09:02:03 -0000
Subject: [Python-checkins] bpo-31827: Remove os.stat_float_times() (GH-4061)
Message-ID: <mailman.25.1508835727.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/01b5aab7bfb11ee5476ef52d24495598cbe7c99a
commit: 01b5aab7bfb11ee5476ef52d24495598cbe7c99a
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-24T02:02:00-07:00
summary:

bpo-31827: Remove os.stat_float_times() (GH-4061)

files:
A Misc/NEWS.d/next/Library/2017-10-20-16-12-01.bpo-31827.7R8s8s.rst
M Doc/library/os.path.rst
M Doc/library/os.rst
M Doc/whatsnew/3.7.rst
M Lib/test/test_os.py
M Modules/posixmodule.c
M Tools/c-globals/ignored-globals.txt

diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
index 38a93315770..06d4ecedd86 100644
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -192,23 +192,17 @@ the :mod:`glob` module.)
 
 .. function:: getatime(path)
 
-   Return the time of last access of *path*.  The return value is a number giving
+   Return the time of last access of *path*.  The return value is a floating point number giving
    the number of seconds since the epoch (see the  :mod:`time` module).  Raise
    :exc:`OSError` if the file does not exist or is inaccessible.
 
-   If :func:`os.stat_float_times` returns ``True``, the result is a floating point
-   number.
-
 
 .. function:: getmtime(path)
 
-   Return the time of last modification of *path*.  The return value is a number
+   Return the time of last modification of *path*.  The return value is a floating point number
    giving the number of seconds since the epoch (see the  :mod:`time` module).
    Raise :exc:`OSError` if the file does not exist or is inaccessible.
 
-   If :func:`os.stat_float_times` returns ``True``, the result is a floating point
-   number.
-
    .. versionchanged:: 3.6
       Accepts a :term:`path-like object`.
 
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 86add0cb8e1..95c81137230 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2335,8 +2335,6 @@ features:
       * the time of creation on Windows, expressed in nanoseconds as an
         integer.
 
-   See also the :func:`stat_float_times` function.
-
    .. note::
 
       The exact meaning and resolution of the :attr:`st_atime`,
@@ -2431,33 +2429,6 @@ features:
       Added the :attr:`st_file_attributes` member on Windows.
 
 
-.. function:: stat_float_times([newvalue])
-
-   Determine whether :class:`stat_result` represents time stamps as float objects.
-   If *newvalue* is ``True``, future calls to :func:`~os.stat` return floats, if it is
-   ``False``, future calls return ints. If *newvalue* is omitted, return the
-   current setting.
-
-   For compatibility with older Python versions, accessing :class:`stat_result` as
-   a tuple always returns integers.
-
-   Python now returns float values by default. Applications which do not work
-   correctly with floating point time stamps can use this function to restore the
-   old behaviour.
-
-   The resolution of the timestamps (that is the smallest possible fraction)
-   depends on the system. Some systems only support second resolution; on these
-   systems, the fraction will always be zero.
-
-   It is recommended that this setting is only changed at program startup time in
-   the *__main__* module; libraries should never change this setting. If an
-   application uses a library that works incorrectly if floating point time stamps
-   are processed, this application should turn the feature off until the library
-   has been corrected.
-
-   .. deprecated:: 3.3
-
-
 .. function:: statvfs(path)
 
    Perform a :c:func:`statvfs` system call on the given path.  The return value is
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index 11b99e2d1c4..5bff3a4181a 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -507,6 +507,10 @@ Removed
 API and Feature Removals
 ------------------------
 
+* The ``os.stat_float_times()`` function has been removed. It was introduced in
+  Python 2.3 for backward compatibility with Python 2.2, and was deprecated
+  since Python 3.1.
+
 * Unknown escapes consisting of ``'\'`` and an ASCII letter in replacement
   templates for :func:`re.sub` were deprecated in Python 3.5, and will now
   cause an error.
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index d7d08cece3c..18edbcda652 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -81,12 +81,6 @@
 HAVE_WHEEL_GROUP = sys.platform.startswith('freebsd') and os.getgid() == 0
 
 
- at contextlib.contextmanager
-def ignore_deprecation_warnings(msg_regex, quiet=False):
-    with support.check_warnings((msg_regex, DeprecationWarning), quiet=quiet):
-        yield
-
-
 def requires_os_func(name):
     return unittest.skipUnless(hasattr(os, name), 'requires os.%s' % name)
 
@@ -488,17 +482,6 @@ def setUp(self):
         os.mkdir(self.dirname)
         create_file(self.fname)
 
-        def restore_float_times(state):
-            with ignore_deprecation_warnings('stat_float_times'):
-                os.stat_float_times(state)
-
-        # ensure that st_atime and st_mtime are float
-        with ignore_deprecation_warnings('stat_float_times'):
-            old_float_times = os.stat_float_times(-1)
-            self.addCleanup(restore_float_times, old_float_times)
-
-            os.stat_float_times(True)
-
     def support_subsecond(self, filename):
         # Heuristic to check if the filesystem supports timestamp with
         # subsecond resolution: check if float and int timestamps are different
diff --git a/Misc/NEWS.d/next/Library/2017-10-20-16-12-01.bpo-31827.7R8s8s.rst b/Misc/NEWS.d/next/Library/2017-10-20-16-12-01.bpo-31827.7R8s8s.rst
new file mode 100644
index 00000000000..ae007234d33
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-20-16-12-01.bpo-31827.7R8s8s.rst
@@ -0,0 +1,3 @@
+Remove the os.stat_float_times() function. It was introduced in Python 2.3
+for backward compatibility with Python 2.2, and was deprecated since Python
+3.1.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 639e45021f2..c7d8b00e6f9 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -1934,36 +1934,6 @@ statresult_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 }
 
 
-
-/* If true, st_?time is float. */
-static int _stat_float_times = 1;
-
-PyDoc_STRVAR(stat_float_times__doc__,
-"stat_float_times([newval]) -> oldval\n\n\
-Determine whether os.[lf]stat represents time stamps as float objects.\n\
-\n\
-If value is True, future calls to stat() return floats; if it is False,\n\
-future calls return ints.\n\
-If value is omitted, return the current setting.\n");
-
-/* AC 3.5: the public default value should be None, not ready for that yet */
-static PyObject*
-stat_float_times(PyObject* self, PyObject *args)
-{
-    int newval = -1;
-    if (!PyArg_ParseTuple(args, "|i:stat_float_times", &newval))
-        return NULL;
-    if (PyErr_WarnEx(PyExc_DeprecationWarning,
-                     "stat_float_times() is deprecated",
-                     1))
-        return NULL;
-    if (newval == -1)
-        /* Return old value */
-        return PyBool_FromLong(_stat_float_times);
-    _stat_float_times = newval;
-    Py_RETURN_NONE;
-}
-
 static PyObject *billion = NULL;
 
 static void
@@ -1986,14 +1956,9 @@ fill_time(PyObject *v, int index, time_t sec, unsigned long nsec)
     if (!ns_total)
         goto exit;
 
-    if (_stat_float_times) {
-        float_s = PyFloat_FromDouble(sec + 1e-9*nsec);
-        if (!float_s)
-            goto exit;
-    }
-    else {
-        float_s = s;
-        Py_INCREF(float_s);
+    float_s = PyFloat_FromDouble(sec + 1e-9*nsec);
+    if (!float_s) {
+        goto exit;
     }
 
     PyStructSequence_SET_ITEM(v, index, s);
@@ -2084,11 +2049,7 @@ _pystat_fromstructstat(STRUCT_STAT *st)
 #else
       bnsec = 0;
 #endif
-      if (_stat_float_times) {
-        val = PyFloat_FromDouble(bsec + 1e-9*bnsec);
-      } else {
-        val = PyLong_FromLong((long)bsec);
-      }
+      val = PyFloat_FromDouble(bsec + 1e-9*bnsec);
       PyStructSequence_SET_ITEM(v, ST_BIRTHTIME_IDX,
                                 val);
     }
@@ -12452,7 +12413,6 @@ static PyMethodDef posix_methods[] = {
     OS_RENAME_METHODDEF
     OS_REPLACE_METHODDEF
     OS_RMDIR_METHODDEF
-    {"stat_float_times", stat_float_times, METH_VARARGS, stat_float_times__doc__},
     OS_SYMLINK_METHODDEF
     OS_SYSTEM_METHODDEF
     OS_UMASK_METHODDEF
diff --git a/Tools/c-globals/ignored-globals.txt b/Tools/c-globals/ignored-globals.txt
index 4fafba6eefa..7b5add865c1 100644
--- a/Tools/c-globals/ignored-globals.txt
+++ b/Tools/c-globals/ignored-globals.txt
@@ -122,7 +122,6 @@ user_signals
 posix_constants_confstr
 posix_constants_pathconf
 posix_constants_sysconf
-_stat_float_times  # deprecated, __main__-only
 structseq_new
 ticks_per_second
 


From solipsis at pitrou.net  Tue Oct 24 05:05:10 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 24 Oct 2017 09:05:10 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=9
Message-ID: <20171024090509.98729.5502FE9602D06A0B@psf.io>

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

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


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

From webhook-mailer at python.org  Tue Oct 24 05:22:24 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 24 Oct 2017 09:22:24 -0000
Subject: [Python-checkins] bpo-31812: Add documentation translations to
 What's New in Python 3.7. (GH-4064)
Message-ID: <mailman.26.1508836949.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/809d173c2005ed76f5b6cb178a0cce3f88121883
commit: 809d173c2005ed76f5b6cb178a0cce3f88121883
branch: master
author: Julien Palard <julien at palard.fr>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-10-24T02:22:22-07:00
summary:

bpo-31812: Add documentation translations to What's New in Python 3.7. (GH-4064)

files:
M Doc/whatsnew/3.7.rst

diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index 5bff3a4181a..80f73b6f37f 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -608,3 +608,24 @@ CPython bytecode changes
 
 * Added two new opcodes: :opcode:`LOAD_METHOD` and :opcode:`CALL_METHOD`.
   (Contributed by Yury Selivanov and INADA Naoki in :issue:`26110`.)
+
+
+Documentation
+=============
+
+.. _whatsnew37-pep545:
+
+PEP 545: Python Documentation Translations
+------------------------------------------
+
+:pep:`545` describes the process to translate Python documentation,
+and two translations have been added:
+
+- Japanese: https://docs.python.org/ja/ and associated github
+  repository: https://github.com/python/python-docs-ja
+
+- French: https://docs.python.org/fr/ and associated github
+  repository: https://github.com/python/python-docs-fr
+
+(Contributed by Julien Palard, Inada Naoki, and Victor Stinner in
+:issue:`issue26546`.)


From webhook-mailer at python.org  Tue Oct 24 06:33:39 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 24 Oct 2017 10:33:39 -0000
Subject: [Python-checkins] bpo-31174: Fix test_tools.test_unparse (#4102)
Message-ID: <mailman.27.1508841222.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/8e482bea21cb942804234e36d3c6c896aabd32da
commit: 8e482bea21cb942804234e36d3c6c896aabd32da
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-24T03:33:36-07:00
summary:

bpo-31174: Fix test_tools.test_unparse (#4102)

test_unparse.DirectoryTestCase now stores the names sample to always
test the same files. It prevents false alarms when hunting reference
leaks.

files:
A Misc/NEWS.d/next/Tests/2017-10-24-11-36-10.bpo-31174.xCvXcr.rst
M Lib/test/test_tools/test_unparse.py

diff --git a/Lib/test/test_tools/test_unparse.py b/Lib/test/test_tools/test_unparse.py
index 65dee1b5ae4..bab49df3312 100644
--- a/Lib/test/test_tools/test_unparse.py
+++ b/Lib/test/test_tools/test_unparse.py
@@ -263,12 +263,14 @@ def test_dict_unpacking_in_dict(self):
 
 class DirectoryTestCase(ASTTestCase):
     """Test roundtrip behaviour on all files in Lib and Lib/test."""
+    NAMES = None
 
     # test directories, relative to the root of the distribution
     test_directories = 'Lib', os.path.join('Lib', 'test')
 
-    def test_files(self):
-        # get names of files to test
+    def get_names(self):
+        if DirectoryTestCase.NAMES is not None:
+            return DirectoryTestCase.NAMES
 
         names = []
         for d in self.test_directories:
@@ -280,6 +282,15 @@ def test_files(self):
         # Test limited subset of files unless the 'cpu' resource is specified.
         if not test.support.is_resource_enabled("cpu"):
             names = random.sample(names, 10)
+            # bpo-31174: Store the names sample to always test the same files.
+            # It prevents false alarms when hunting reference leaks.
+            DirectoryTestCase.NAMES = names
+
+        return names
+
+    def test_files(self):
+        # get names of files to test
+        names = self.get_names()
 
         for filename in names:
             if test.support.verbose:
diff --git a/Misc/NEWS.d/next/Tests/2017-10-24-11-36-10.bpo-31174.xCvXcr.rst b/Misc/NEWS.d/next/Tests/2017-10-24-11-36-10.bpo-31174.xCvXcr.rst
new file mode 100644
index 00000000000..e0980649087
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2017-10-24-11-36-10.bpo-31174.xCvXcr.rst
@@ -0,0 +1,3 @@
+Fix test_tools.test_unparse: DirectoryTestCase now stores the names sample
+to always test the same files. It prevents false alarms when hunting
+reference leaks.


From webhook-mailer at python.org  Tue Oct 24 07:18:07 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 24 Oct 2017 11:18:07 -0000
Subject: [Python-checkins] bpo-31174: Fix test_tools.test_unparse (GH-4102)
 (#4104)
Message-ID: <mailman.28.1508843887.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/d8f78a1fbc0a34224289d436ad67f608fa553f0c
commit: d8f78a1fbc0a34224289d436ad67f608fa553f0c
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-10-24T04:18:00-07:00
summary:

bpo-31174: Fix test_tools.test_unparse (GH-4102) (#4104)

test_unparse.DirectoryTestCase now stores the names sample to always
test the same files. It prevents false alarms when hunting reference
leaks.
(cherry picked from commit 8e482bea21cb942804234e36d3c6c896aabd32da)

files:
A Misc/NEWS.d/next/Tests/2017-10-24-11-36-10.bpo-31174.xCvXcr.rst
M Lib/test/test_tools/test_unparse.py

diff --git a/Lib/test/test_tools/test_unparse.py b/Lib/test/test_tools/test_unparse.py
index 65dee1b5ae4..bab49df3312 100644
--- a/Lib/test/test_tools/test_unparse.py
+++ b/Lib/test/test_tools/test_unparse.py
@@ -263,12 +263,14 @@ def test_dict_unpacking_in_dict(self):
 
 class DirectoryTestCase(ASTTestCase):
     """Test roundtrip behaviour on all files in Lib and Lib/test."""
+    NAMES = None
 
     # test directories, relative to the root of the distribution
     test_directories = 'Lib', os.path.join('Lib', 'test')
 
-    def test_files(self):
-        # get names of files to test
+    def get_names(self):
+        if DirectoryTestCase.NAMES is not None:
+            return DirectoryTestCase.NAMES
 
         names = []
         for d in self.test_directories:
@@ -280,6 +282,15 @@ def test_files(self):
         # Test limited subset of files unless the 'cpu' resource is specified.
         if not test.support.is_resource_enabled("cpu"):
             names = random.sample(names, 10)
+            # bpo-31174: Store the names sample to always test the same files.
+            # It prevents false alarms when hunting reference leaks.
+            DirectoryTestCase.NAMES = names
+
+        return names
+
+    def test_files(self):
+        # get names of files to test
+        names = self.get_names()
 
         for filename in names:
             if test.support.verbose:
diff --git a/Misc/NEWS.d/next/Tests/2017-10-24-11-36-10.bpo-31174.xCvXcr.rst b/Misc/NEWS.d/next/Tests/2017-10-24-11-36-10.bpo-31174.xCvXcr.rst
new file mode 100644
index 00000000000..e0980649087
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2017-10-24-11-36-10.bpo-31174.xCvXcr.rst
@@ -0,0 +1,3 @@
+Fix test_tools.test_unparse: DirectoryTestCase now stores the names sample
+to always test the same files. It prevents false alarms when hunting
+reference leaks.


From webhook-mailer at python.org  Tue Oct 24 08:42:39 2017
From: webhook-mailer at python.org (Yury Selivanov)
Date: Tue, 24 Oct 2017 12:42:39 -0000
Subject: [Python-checkins] bpo-30639: Lazily compute repr for error (#2132)
Message-ID: <mailman.29.1508848963.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/e968bc735794a7123f28f26d68fdf5dc8c845280
commit: e968bc735794a7123f28f26d68fdf5dc8c845280
branch: master
author: Thomas Kluyver <takowl at gmail.com>
committer: Yury Selivanov <yury at magic.io>
date: 2017-10-24T08:42:36-04:00
summary:

bpo-30639: Lazily compute repr for error (#2132)

files:
A Misc/NEWS.d/next/Library/2017-10-24-12-24-56.bpo-30639.ptNM9a.rst
M Lib/inspect.py
M Lib/test/test_inspect.py

diff --git a/Lib/inspect.py b/Lib/inspect.py
index 9a843d6420e..6d6fde9ee40 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -662,8 +662,9 @@ def getfile(object):
         object = object.f_code
     if iscode(object):
         return object.co_filename
-    raise TypeError('{!r} is not a module, class, method, '
-                    'function, traceback, frame, or code object'.format(object))
+    raise TypeError('module, class, method, function, traceback, frame, or '
+                    'code object was expected, got {}'.format(
+                    type(object).__name__))
 
 def getmodulename(path):
     """Return the module name for a given file, or None."""
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 819fcc58537..e64215d4677 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -463,6 +463,14 @@ class C(metaclass=CM):
         with self.assertRaises(TypeError):
             inspect.getfile(C)
 
+    def test_getfile_broken_repr(self):
+        class ErrorRepr:
+            def __repr__(self):
+                raise Exception('xyz')
+        er = ErrorRepr()
+        with self.assertRaises(TypeError):
+            inspect.getfile(er)
+
     def test_getmodule_recursion(self):
         from types import ModuleType
         name = '__inspect_dummy'
diff --git a/Misc/NEWS.d/next/Library/2017-10-24-12-24-56.bpo-30639.ptNM9a.rst b/Misc/NEWS.d/next/Library/2017-10-24-12-24-56.bpo-30639.ptNM9a.rst
new file mode 100644
index 00000000000..c6aeb2356f6
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-24-12-24-56.bpo-30639.ptNM9a.rst
@@ -0,0 +1,2 @@
+:func:`inspect.getfile` no longer computes the repr of unknown objects to
+display in an error message, to protect against badly behaved custom reprs.


From webhook-mailer at python.org  Tue Oct 24 08:58:29 2017
From: webhook-mailer at python.org (Nick Coghlan)
Date: Tue, 24 Oct 2017 12:58:29 -0000
Subject: [Python-checkins] Fix wording about Py_tss_NEEDS_INIT in docs
 (GH-4096)
Message-ID: <mailman.30.1508849910.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/831d61d56c5b0f15cfcfd5083638aa111cddb72b
commit: 831d61d56c5b0f15cfcfd5083638aa111cddb72b
branch: master
author: Masayuki Yamamoto <ma3yuki.8mamo10 at gmail.com>
committer: Nick Coghlan <ncoghlan at gmail.com>
date: 2017-10-24T22:58:16+10:00
summary:

Fix wording about Py_tss_NEEDS_INIT in docs (GH-4096)

Make more sense to replace the word "default value" with
"initializer" for Py_tss_NEEDS_INIT.

files:
M Doc/c-api/init.rst

diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index 7792058683d..dc1939db17e 100644
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -1246,7 +1246,7 @@ CPython interpreter.  This API uses a new type :c:type:`Py_tss_t` instead of
 
 .. c:macro:: Py_tss_NEEDS_INIT
 
-   This macro expands to the default value for :c:type:`Py_tss_t` variables.
+   This macro expands to the initializer for :c:type:`Py_tss_t` variables.
    Note that this macro won't be defined with :ref:`Py_LIMITED_API <stable>`.
 
 


From webhook-mailer at python.org  Tue Oct 24 10:42:39 2017
From: webhook-mailer at python.org (xdegaye)
Date: Tue, 24 Oct 2017 14:42:39 -0000
Subject: [Python-checkins] [3.6] bpo-30817: Fix PyErr_PrintEx() when no
 memory (GH-2526). (#4107)
Message-ID: <mailman.31.1508856162.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/d5d79545b73110b2f4c2b66d150409514e2ca8e0
commit: d5d79545b73110b2f4c2b66d150409514e2ca8e0
branch: 3.6
author: xdegaye <xdegaye at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-24T16:42:33+02:00
summary:

[3.6] bpo-30817: Fix PyErr_PrintEx() when no memory (GH-2526). (#4107)

(cherry picked from commit 66caacf2f0d6213b049a3097556e28e30440b900)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-07-01-15-11-13.bpo-30817.j7ZvN_.rst
M Lib/test/test_exceptions.py
M Python/pythonrun.c

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 53851cb6cfd..7eb08b746c0 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -10,7 +10,7 @@
 
 from test.support import (TESTFN, captured_stderr, check_impl_detail,
                           check_warnings, cpython_only, gc_collect, run_unittest,
-                          no_tracing, unlink, import_module)
+                          no_tracing, unlink, import_module, script_helper)
 
 class NaiveException(Exception):
     def __init__(self, x):
@@ -1104,6 +1104,23 @@ def test_unhandled(self):
                     self.assertIn("test message", report)
                 self.assertTrue(report.endswith("\n"))
 
+    @cpython_only
+    def test_memory_error_in_PyErr_PrintEx(self):
+        code = """if 1:
+            import _testcapi
+            class C(): pass
+            _testcapi.set_nomemory(0, %d)
+            C()
+        """
+
+        # Issue #30817: Abort in PyErr_PrintEx() when no memory.
+        # Span a large range of tests as the CPython code always evolves with
+        # changes that add or remove memory allocations.
+        for i in range(1, 20):
+            rc, out, err = script_helper.assert_python_failure("-c", code % i)
+            self.assertIn(rc, (1, 120))
+            self.assertIn(b'MemoryError', err)
+
 
 class ImportErrorTests(unittest.TestCase):
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-07-01-15-11-13.bpo-30817.j7ZvN_.rst b/Misc/NEWS.d/next/Core and Builtins/2017-07-01-15-11-13.bpo-30817.j7ZvN_.rst
new file mode 100644
index 00000000000..f50aeefa847
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-07-01-15-11-13.bpo-30817.j7ZvN_.rst	
@@ -0,0 +1,2 @@
+`PyErr_PrintEx()` clears now the ignored exception that may be raised by
+`_PySys_SetObjectId()`, for example when no memory.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index bf651d0ff8d..6a9722bee5f 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -624,9 +624,15 @@ PyErr_PrintEx(int set_sys_last_vars)
         return;
     /* Now we know v != NULL too */
     if (set_sys_last_vars) {
-        _PySys_SetObjectId(&PyId_last_type, exception);
-        _PySys_SetObjectId(&PyId_last_value, v);
-        _PySys_SetObjectId(&PyId_last_traceback, tb);
+        if (_PySys_SetObjectId(&PyId_last_type, exception) < 0) {
+            PyErr_Clear();
+        }
+        if (_PySys_SetObjectId(&PyId_last_value, v) < 0) {
+            PyErr_Clear();
+        }
+        if (_PySys_SetObjectId(&PyId_last_traceback, tb) < 0) {
+            PyErr_Clear();
+        }
     }
     hook = _PySys_GetObjectId(&PyId_excepthook);
     if (hook) {


From webhook-mailer at python.org  Tue Oct 24 12:36:20 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 24 Oct 2017 16:36:20 -0000
Subject: [Python-checkins] bpo-31664: Add support for the Blowfish method in
 crypt. (#3854)
Message-ID: <mailman.32.1508862985.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/eab3ff72ebe79416cc032b8508ae13332955a157
commit: eab3ff72ebe79416cc032b8508ae13332955a157
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-24T19:36:17+03:00
summary:

bpo-31664: Add support for the Blowfish method in crypt. (#3854)

files:
A Misc/NEWS.d/next/Library/2017-10-04-20-36-28.bpo-31664.4VDUzo.rst
M Doc/library/crypt.rst
M Doc/whatsnew/3.7.rst
M Lib/crypt.py
M Lib/test/test_crypt.py

diff --git a/Doc/library/crypt.rst b/Doc/library/crypt.rst
index dbd42740384..9877b711a9a 100644
--- a/Doc/library/crypt.rst
+++ b/Doc/library/crypt.rst
@@ -41,17 +41,24 @@ are available on all platforms):
 .. data:: METHOD_SHA512
 
    A Modular Crypt Format method with 16 character salt and 86 character
-   hash.  This is the strongest method.
+   hash based on the SHA-512 hash function.  This is the strongest method.
 
 .. data:: METHOD_SHA256
 
    Another Modular Crypt Format method with 16 character salt and 43
-   character hash.
+   character hash based on the SHA-256 hash function.
+
+.. data:: METHOD_BLOWFISH
+
+   Another Modular Crypt Format method with 22 character salt and 31
+   character hash based on the Blowfish cipher.
+
+   .. versionadded:: 3.7
 
 .. data:: METHOD_MD5
 
    Another Modular Crypt Format method with 8 character salt and 22
-   character hash.
+   character hash based on the MD5 hash function.
 
 .. data:: METHOD_CRYPT
 
@@ -109,19 +116,25 @@ The :mod:`crypt` module defines the following functions:
       Accept ``crypt.METHOD_*`` values in addition to strings for *salt*.
 
 
-.. function:: mksalt(method=None)
+.. function:: mksalt(method=None, *, log_rounds=12)
 
    Return a randomly generated salt of the specified method.  If no
    *method* is given, the strongest method available as returned by
    :func:`methods` is used.
 
-   The return value is a string either of 2 characters in length for
-   ``crypt.METHOD_CRYPT``, or 19 characters starting with ``$digit$`` and
-   16 random characters from the set ``[./a-zA-Z0-9]``, suitable for
-   passing as the *salt* argument to :func:`crypt`.
+   The return value is a string suitable for passing as the *salt* argument
+   to :func:`crypt`.
+
+   *log_rounds* specifies the binary logarithm of the number of rounds
+   for ``crypt.METHOD_BLOWFISH``, and is ignored otherwise.  ``8`` specifies
+   ``256`` rounds.
 
    .. versionadded:: 3.3
 
+   .. versionchanged:: 3.7
+      Added the *log_rounds* parameter.
+
+
 Examples
 --------
 
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index 80f73b6f37f..46121dcf300 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -229,6 +229,12 @@ contextlib
 :func:`contextlib.asynccontextmanager` has been added. (Contributed by
 Jelle Zijlstra in :issue:`29679`.)
 
+crypt
+-----
+
+Added support for the Blowfish method.
+(Contributed by Serhiy Storchaka in :issue:`31664`.)
+
 dis
 ---
 
diff --git a/Lib/crypt.py b/Lib/crypt.py
index fbc5f4cc355..4d73202b468 100644
--- a/Lib/crypt.py
+++ b/Lib/crypt.py
@@ -19,7 +19,7 @@ def __repr__(self):
         return '<crypt.METHOD_{}>'.format(self.name)
 
 
-def mksalt(method=None):
+def mksalt(method=None, *, log_rounds=12):
     """Generate a salt for the specified method.
 
     If not specified, the strongest available method will be used.
@@ -27,7 +27,12 @@ def mksalt(method=None):
     """
     if method is None:
         method = methods[0]
-    s = '${}$'.format(method.ident) if method.ident else ''
+    if not method.ident:
+        s = ''
+    elif method.ident[0] == '2':
+        s = f'${method.ident}${log_rounds:02d}$'
+    else:
+        s = f'${method.ident}$'
     s += ''.join(_sr.choice(_saltchars) for char in range(method.salt_chars))
     return s
 
@@ -48,14 +53,31 @@ def crypt(word, salt=None):
 
 
 #  available salting/crypto methods
-METHOD_CRYPT = _Method('CRYPT', None, 2, 13)
-METHOD_MD5 = _Method('MD5', '1', 8, 34)
-METHOD_SHA256 = _Method('SHA256', '5', 16, 63)
-METHOD_SHA512 = _Method('SHA512', '6', 16, 106)
-
 methods = []
-for _method in (METHOD_SHA512, METHOD_SHA256, METHOD_MD5, METHOD_CRYPT):
-    _result = crypt('', _method)
-    if _result and len(_result) == _method.total_size:
-        methods.append(_method)
-del _result, _method
+
+def _add_method(name, *args):
+    method = _Method(name, *args)
+    globals()['METHOD_' + name] = method
+    salt = mksalt(method, log_rounds=4)
+    result = crypt('', salt)
+    if result and len(result) == method.total_size:
+        methods.append(method)
+        return True
+    return False
+
+_add_method('SHA512', '6', 16, 106)
+_add_method('SHA256', '5', 16, 63)
+
+# Choose the strongest supported version of Blowfish hashing.
+# Early versions have flaws.  Version 'a' fixes flaws of
+# the initial implementation, 'b' fixes flaws of 'a'.
+# 'y' is the same as 'b', for compatibility
+# with openwall crypt_blowfish.
+for _v in 'b', 'y', 'a', '':
+    if _add_method('BLOWFISH', '2' + _v, 22, 59 + len(_v)):
+        break
+
+_add_method('MD5', '1', 8, 34)
+_add_method('CRYPT', None, 2, 13)
+
+del _v, _add_method
diff --git a/Lib/test/test_crypt.py b/Lib/test/test_crypt.py
index e4f58979c13..8db1aefdf1e 100644
--- a/Lib/test/test_crypt.py
+++ b/Lib/test/test_crypt.py
@@ -1,3 +1,4 @@
+import sys
 from test import support
 import unittest
 
@@ -6,28 +7,58 @@
 class CryptTestCase(unittest.TestCase):
 
     def test_crypt(self):
-        c = crypt.crypt('mypassword', 'ab')
-        if support.verbose:
-            print('Test encryption: ', c)
+        cr = crypt.crypt('mypassword')
+        cr2 = crypt.crypt('mypassword', cr)
+        self.assertEqual(cr2, cr)
+        cr = crypt.crypt('mypassword', 'ab')
+        if cr is not None:
+            cr2 = crypt.crypt('mypassword', cr)
+            self.assertEqual(cr2, cr)
 
     def test_salt(self):
         self.assertEqual(len(crypt._saltchars), 64)
         for method in crypt.methods:
             salt = crypt.mksalt(method)
-            self.assertEqual(len(salt),
-                    method.salt_chars + (3 if method.ident else 0))
+            self.assertIn(len(salt) - method.salt_chars, {0, 1, 3, 4, 6, 7})
+            if method.ident:
+                self.assertIn(method.ident, salt[:len(salt)-method.salt_chars])
 
     def test_saltedcrypt(self):
         for method in crypt.methods:
-            pw = crypt.crypt('assword', method)
-            self.assertEqual(len(pw), method.total_size)
-            pw = crypt.crypt('assword', crypt.mksalt(method))
-            self.assertEqual(len(pw), method.total_size)
+            cr = crypt.crypt('assword', method)
+            self.assertEqual(len(cr), method.total_size)
+            cr2 = crypt.crypt('assword', cr)
+            self.assertEqual(cr2, cr)
+            cr = crypt.crypt('assword', crypt.mksalt(method))
+            self.assertEqual(len(cr), method.total_size)
 
     def test_methods(self):
-        # Guarantee that METHOD_CRYPT is the last method in crypt.methods.
         self.assertTrue(len(crypt.methods) >= 1)
-        self.assertEqual(crypt.METHOD_CRYPT, crypt.methods[-1])
+        if sys.platform.startswith('openbsd'):
+            self.assertEqual(crypt.methods, [crypt.METHOD_BLOWFISH])
+        else:
+            self.assertEqual(crypt.methods[-1], crypt.METHOD_CRYPT)
+
+    @unittest.skipUnless(crypt.METHOD_BLOWFISH in crypt.methods,
+                        'requires support of Blowfish')
+    def test_log_rounds(self):
+        self.assertEqual(len(crypt._saltchars), 64)
+        for log_rounds in range(4, 11):
+            salt = crypt.mksalt(crypt.METHOD_BLOWFISH, log_rounds=log_rounds)
+            self.assertIn('$%02d$' % log_rounds, salt)
+            self.assertIn(len(salt) - crypt.METHOD_BLOWFISH.salt_chars, {6, 7})
+            cr = crypt.crypt('mypassword', salt)
+            self.assertTrue(cr)
+            cr2 = crypt.crypt('mypassword', cr)
+            self.assertEqual(cr2, cr)
+
+    @unittest.skipUnless(crypt.METHOD_BLOWFISH in crypt.methods,
+                        'requires support of Blowfish')
+    def test_invalid_log_rounds(self):
+        for log_rounds in (1, -1, 999):
+            salt = crypt.mksalt(crypt.METHOD_BLOWFISH, log_rounds=log_rounds)
+            self.assertIsNone(crypt.crypt('mypassword', salt))
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Library/2017-10-04-20-36-28.bpo-31664.4VDUzo.rst b/Misc/NEWS.d/next/Library/2017-10-04-20-36-28.bpo-31664.4VDUzo.rst
new file mode 100644
index 00000000000..bd8474977d8
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-04-20-36-28.bpo-31664.4VDUzo.rst
@@ -0,0 +1 @@
+Added support for the Blowfish hashing in the crypt module.


From webhook-mailer at python.org  Tue Oct 24 13:17:15 2017
From: webhook-mailer at python.org (Alexander Belopolsky)
Date: Tue, 24 Oct 2017 17:17:15 -0000
Subject: [Python-checkins] Closes bpo-28292: Implemented
 Calendar.itermonthdays3() and itermonthdays4(). (#4079)
Message-ID: <mailman.33.1508865437.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/fdd9b217c60b454ac6a82f02c8b0b551caeac88b
commit: fdd9b217c60b454ac6a82f02c8b0b551caeac88b
branch: master
author: Alexander Belopolsky <abalkin at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-10-24T13:17:10-04:00
summary:

Closes bpo-28292: Implemented Calendar.itermonthdays3() and itermonthdays4(). (#4079)

Calendar.itermonthdates() will now consistently raise an exception when a date falls outside of the 0001-01-01 through 9999-12-31 range. To support applications that cannot tolerate such exceptions, the new methods itermonthdays3() and itermonthdays4() are added. The new methods return tuples and are not restricted by the range supported by datetime.date.

Thanks @serhiy-storchaka for suggesting the itermonthdays4() method and for the review.

files:
A Misc/NEWS.d/next/Library/2017-10-23-20-03-36.bpo-28292.1Gkim2.rst
M Doc/library/calendar.rst
M Lib/calendar.py
M Lib/test/test_calendar.py

diff --git a/Doc/library/calendar.rst b/Doc/library/calendar.rst
index a415b4792a6..8fe93fd4de3 100644
--- a/Doc/library/calendar.rst
+++ b/Doc/library/calendar.rst
@@ -53,17 +53,40 @@ it's the base calendar for all computations.
       month that are required to get a complete week.
 
 
+   .. method:: itermonthdays(year, month)
+
+      Return an iterator for the month *month* in the year *year* similar to
+      :meth:`itermonthdates`, but not restricted by the :class:`datetime.date`
+      range. Days returned will simply be day of the month numbers.  For the
+      days outside of the specified month, the day number is ``0``.
+
+
    .. method:: itermonthdays2(year, month)
 
       Return an iterator for the month *month* in the year *year* similar to
-      :meth:`itermonthdates`. Days returned will be tuples consisting of a day
+      :meth:`itermonthdates`, but not restricted by the :class:`datetime.date`
+      range. Days returned will be tuples consisting of a day of the month
       number and a week day number.
 
 
-   .. method:: itermonthdays(year, month)
+   .. method:: itermonthdays3(year, month)
+
+      Return an iterator for the month *month* in the year *year* similar to
+      :meth:`itermonthdates`, but not restricted by the :class:`datetime.date`
+      range. Days returned will be tuples consisting of a year, a month and a day
+      of the month numbers.
+
+      .. versionadded:: 3.7
+
+
+   .. method:: itermonthdays4(year, month)
 
       Return an iterator for the month *month* in the year *year* similar to
-      :meth:`itermonthdates`. Days returned will simply be day numbers.
+      :meth:`itermonthdates`, but not restricted by the :class:`datetime.date`
+      range. Days returned will be tuples consisting of a year, a month, a day
+      of the month, and a day of the week numbers.
+
+      .. versionadded:: 3.7
 
 
    .. method:: monthdatescalendar(year, month)
diff --git a/Lib/calendar.py b/Lib/calendar.py
index 0218e2d3977..fb594e0f5b0 100644
--- a/Lib/calendar.py
+++ b/Lib/calendar.py
@@ -126,6 +126,24 @@ def monthrange(year, month):
     return day1, ndays
 
 
+def monthlen(year, month):
+    return mdays[month] + (month == February and isleap(year))
+
+
+def prevmonth(year, month):
+    if month == 1:
+        return year-1, 12
+    else:
+        return year, month-1
+
+
+def nextmonth(year, month):
+    if month == 12:
+        return year+1, 1
+    else:
+        return year, month+1
+
+
 class Calendar(object):
     """
     Base calendar class. This class doesn't do any formatting. It simply
@@ -157,20 +175,20 @@ def itermonthdates(self, year, month):
         values and will always iterate through complete weeks, so it will yield
         dates outside the specified month.
         """
-        date = datetime.date(year, month, 1)
-        # Go back to the beginning of the week
-        days = (date.weekday() - self.firstweekday) % 7
-        date -= datetime.timedelta(days=days)
-        oneday = datetime.timedelta(days=1)
-        while True:
-            yield date
-            try:
-                date += oneday
-            except OverflowError:
-                # Adding one day could fail after datetime.MAXYEAR
-                break
-            if date.month != month and date.weekday() == self.firstweekday:
-                break
+        for y, m, d in self.itermonthdays3(year, month):
+            yield datetime.date(y, m, d)
+
+    def itermonthdays(self, year, month):
+        """
+        Like itermonthdates(), but will yield day numbers. For days outside
+        the specified month the day number is 0.
+        """
+        day1, ndays = monthrange(year, month)
+        days_before = (day1 - self.firstweekday) % 7
+        yield from repeat(0, days_before)
+        yield from range(1, ndays + 1)
+        days_after = (self.firstweekday - day1 - ndays) % 7
+        yield from repeat(0, days_after)
 
     def itermonthdays2(self, year, month):
         """
@@ -180,17 +198,31 @@ def itermonthdays2(self, year, month):
         for i, d in enumerate(self.itermonthdays(year, month), self.firstweekday):
             yield d, i % 7
 
-    def itermonthdays(self, year, month):
+    def itermonthdays3(self, year, month):
         """
-        Like itermonthdates(), but will yield day numbers. For days outside
-        the specified month the day number is 0.
+        Like itermonthdates(), but will yield (year, month, day) tuples.  Can be
+        used for dates outside of datetime.date range.
         """
         day1, ndays = monthrange(year, month)
         days_before = (day1 - self.firstweekday) % 7
-        yield from repeat(0, days_before)
-        yield from range(1, ndays + 1)
         days_after = (self.firstweekday - day1 - ndays) % 7
-        yield from repeat(0, days_after)
+        y, m = prevmonth(year, month)
+        end = monthlen(y, m) + 1
+        for d in range(end-days_before, end):
+            yield y, m, d
+        for d in range(1, ndays + 1):
+            yield year, month, d
+        y, m = nextmonth(year, month)
+        for d in range(1, days_after + 1):
+            yield y, m, d
+
+    def itermonthdays4(self, year, month):
+        """
+        Like itermonthdates(), but will yield (year, month, day, day_of_week) tuples.
+        Can be used for dates outside of datetime.date range.
+        """
+        for i, (y, m, d) in enumerate(self.itermonthdays3(year, month)):
+            yield y, m, d, (self.firstweekday + i) % 7
 
     def monthdatescalendar(self, year, month):
         """
diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
index c777f648356..ad8b6bb6b93 100644
--- a/Lib/test/test_calendar.py
+++ b/Lib/test/test_calendar.py
@@ -502,10 +502,15 @@ def test_locale_calendars(self):
         new_october = calendar.TextCalendar().formatmonthname(2010, 10, 10)
         self.assertEqual(old_october, new_october)
 
-    def test_itermonthdates(self):
-        # ensure itermonthdates doesn't overflow after datetime.MAXYEAR
-        # see #15421
-        list(calendar.Calendar().itermonthdates(datetime.MAXYEAR, 12))
+    def test_itermonthdays3(self):
+        # ensure itermonthdays3 doesn't overflow after datetime.MAXYEAR
+        list(calendar.Calendar().itermonthdays3(datetime.MAXYEAR, 12))
+
+    def test_itermonthdays4(self):
+        cal = calendar.Calendar(firstweekday=3)
+        days = list(cal.itermonthdays4(2001, 2))
+        self.assertEqual(days[0], (2001, 2, 1, 3))
+        self.assertEqual(days[-1], (2001, 2, 28, 2))
 
     def test_itermonthdays(self):
         for firstweekday in range(7):
@@ -846,7 +851,8 @@ def test__all__(self):
         blacklist = {'mdays', 'January', 'February', 'EPOCH',
                      'MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY',
                      'SATURDAY', 'SUNDAY', 'different_locale', 'c',
-                     'prweek', 'week', 'format', 'formatstring', 'main'}
+                     'prweek', 'week', 'format', 'formatstring', 'main',
+                     'monthlen', 'prevmonth', 'nextmonth'}
         support.check__all__(self, calendar, blacklist=blacklist)
 
 
diff --git a/Misc/NEWS.d/next/Library/2017-10-23-20-03-36.bpo-28292.1Gkim2.rst b/Misc/NEWS.d/next/Library/2017-10-23-20-03-36.bpo-28292.1Gkim2.rst
new file mode 100644
index 00000000000..e0eb53ea51c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-23-20-03-36.bpo-28292.1Gkim2.rst
@@ -0,0 +1,5 @@
+Calendar.itermonthdates() will now consistently raise an exception when a
+date falls outside of the 0001-01-01 through 9999-12-31 range.  To support
+applications that cannot tolerate such exceptions, the new methods
+itermonthdays3() and itermonthdays4() are added.  The new methods return
+tuples and are not restricted by the range supported by datetime.date.


From webhook-mailer at python.org  Tue Oct 24 16:11:49 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 24 Oct 2017 20:11:49 -0000
Subject: [Python-checkins] bpo-25287: Backport new tests for crypt and skip
 test_crypt on OpenBSD. (#4111)
Message-ID: <mailman.34.1508875912.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/f52dff611cff2fb9e90340b4787eda50ab2d40c6
commit: f52dff611cff2fb9e90340b4787eda50ab2d40c6
branch: 3.6
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-24T23:11:42+03:00
summary:

bpo-25287: Backport new tests for crypt and skip test_crypt on OpenBSD. (#4111)

files:
M Lib/test/test_crypt.py

diff --git a/Lib/test/test_crypt.py b/Lib/test/test_crypt.py
index e4f58979c13..44a3ad44892 100644
--- a/Lib/test/test_crypt.py
+++ b/Lib/test/test_crypt.py
@@ -1,33 +1,45 @@
+import sys
 from test import support
 import unittest
 
 crypt = support.import_module('crypt')
 
+if sys.platform.startswith('openbsd'):
+    raise unittest.SkipTest('The only supported method on OpenBSD is Blowfish')
+
 class CryptTestCase(unittest.TestCase):
 
     def test_crypt(self):
-        c = crypt.crypt('mypassword', 'ab')
-        if support.verbose:
-            print('Test encryption: ', c)
+        cr = crypt.crypt('mypassword')
+        cr2 = crypt.crypt('mypassword', cr)
+        self.assertEqual(cr2, cr)
+        cr = crypt.crypt('mypassword', 'ab')
+        if cr is not None:
+            cr2 = crypt.crypt('mypassword', cr)
+            self.assertEqual(cr2, cr)
 
     def test_salt(self):
         self.assertEqual(len(crypt._saltchars), 64)
         for method in crypt.methods:
             salt = crypt.mksalt(method)
-            self.assertEqual(len(salt),
-                    method.salt_chars + (3 if method.ident else 0))
+            self.assertIn(len(salt) - method.salt_chars, {0, 1, 3, 4, 6, 7})
+            if method.ident:
+                self.assertIn(method.ident, salt[:len(salt)-method.salt_chars])
 
     def test_saltedcrypt(self):
         for method in crypt.methods:
-            pw = crypt.crypt('assword', method)
-            self.assertEqual(len(pw), method.total_size)
-            pw = crypt.crypt('assword', crypt.mksalt(method))
-            self.assertEqual(len(pw), method.total_size)
+            cr = crypt.crypt('assword', method)
+            self.assertEqual(len(cr), method.total_size)
+            cr2 = crypt.crypt('assword', cr)
+            self.assertEqual(cr2, cr)
+            cr = crypt.crypt('assword', crypt.mksalt(method))
+            self.assertEqual(len(cr), method.total_size)
 
     def test_methods(self):
         # Guarantee that METHOD_CRYPT is the last method in crypt.methods.
         self.assertTrue(len(crypt.methods) >= 1)
         self.assertEqual(crypt.METHOD_CRYPT, crypt.methods[-1])
 
+
 if __name__ == "__main__":
     unittest.main()


From webhook-mailer at python.org  Tue Oct 24 16:31:46 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 24 Oct 2017 20:31:46 -0000
Subject: [Python-checkins] bpo-31690: Allow the inline flags "a", "L",
 and "u" to be used as group flags for RE. (#3885)
Message-ID: <mailman.35.1508877110.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/3557b05c5a7dfd7d97ddfd3b79aefd53d25e5132
commit: 3557b05c5a7dfd7d97ddfd3b79aefd53d25e5132
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-24T23:31:42+03:00
summary:

bpo-31690: Allow the inline flags "a", "L", and "u" to be used as group flags for RE. (#3885)

files:
A Misc/NEWS.d/next/Library/2017-10-05-15-14-46.bpo-31690.f0XteV.rst
M Doc/library/re.rst
M Doc/whatsnew/3.7.rst
M Lib/sre_compile.py
M Lib/sre_constants.py
M Lib/sre_parse.py
M Lib/test/test_re.py
M Modules/_sre.c
M Modules/sre.h
M Modules/sre_constants.h
M Modules/sre_lib.h

diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index 3dd3a0f80d2..e0cb626305d 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -245,16 +245,32 @@ The special characters are:
    *cannot* be retrieved after performing a match or referenced later in the
    pattern.
 
-``(?imsx-imsx:...)``
-   (Zero or more letters from the set ``'i'``, ``'m'``, ``'s'``, ``'x'``,
-   optionally followed by ``'-'`` followed by one or more letters from the
-   same set.)  The letters set or removes the corresponding flags:
-   :const:`re.I` (ignore case), :const:`re.M` (multi-line), :const:`re.S`
-   (dot matches all), and :const:`re.X` (verbose), for the part of the
-   expression.  (The flags are described in :ref:`contents-of-module-re`.)
+``(?aiLmsux-imsx:...)``
+   (Zero or more letters from the set ``'a'``, ``'i'``, ``'L'``, ``'m'``,
+   ``'s'``, ``'u'``, ``'x'``, optionally followed by ``'-'`` followed by
+   one or more letters from the ``'i'``, ``'m'``, ``'s'``, ``'x'``.)
+   The letters set or remove the corresponding flags:
+   :const:`re.A` (ASCII-only matching), :const:`re.I` (ignore case),
+   :const:`re.L` (locale dependent), :const:`re.M` (multi-line),
+   :const:`re.S` (dot matches all), :const:`re.U` (Unicode matching),
+   and :const:`re.X` (verbose), for the part of the expression.
+   (The flags are described in :ref:`contents-of-module-re`.)
+
+   The letters ``'a'``, ``'L'`` and ``'u'`` are mutually exclusive when used
+   as inline flags, so they can't be combined or follow ``'-'``.  Instead,
+   when one of them appears in an inline group, it overrides the matching mode
+   in the enclosing group.  In Unicode patterns ``(?a:...)`` switches to
+   ASCII-only matching, and ``(?u:...)`` switches to Unicode matching
+   (default).  In byte pattern ``(?L:...)`` switches to locale depending
+   matching, and ``(?a:...)`` switches to ASCII-only matching (default).
+   This override is only in effect for the narrow inline group, and the
+   original matching mode is restored outside of the group.
 
    .. versionadded:: 3.6
 
+   .. versionchanged:: 3.7
+      The letters ``'a'``, ``'L'`` and ``'u'`` also can be used in a group.
+
 ``(?P<name>...)``
    Similar to regular parentheses, but the substring matched by the group is
    accessible via the symbolic group name *name*.  Group names must be valid
@@ -384,9 +400,7 @@ character ``'$'``.
       Matches any Unicode decimal digit (that is, any character in
       Unicode character category [Nd]).  This includes ``[0-9]``, and
       also many other digit characters.  If the :const:`ASCII` flag is
-      used only ``[0-9]`` is matched (but the flag affects the entire
-      regular expression, so in such cases using an explicit ``[0-9]``
-      may be a better choice).
+      used only ``[0-9]`` is matched.
 
    For 8-bit (bytes) patterns:
       Matches any decimal digit; this is equivalent to ``[0-9]``.
@@ -394,9 +408,7 @@ character ``'$'``.
 ``\D``
    Matches any character which is not a decimal digit. This is
    the opposite of ``\d``. If the :const:`ASCII` flag is used this
-   becomes the equivalent of ``[^0-9]`` (but the flag affects the entire
-   regular expression, so in such cases using an explicit ``[^0-9]`` may
-   be a better choice).
+   becomes the equivalent of ``[^0-9]``.
 
 ``\s``
    For Unicode (str) patterns:
@@ -404,9 +416,7 @@ character ``'$'``.
       ``[ \t\n\r\f\v]``, and also many other characters, for example the
       non-breaking spaces mandated by typography rules in many
       languages). If the :const:`ASCII` flag is used, only
-      ``[ \t\n\r\f\v]`` is matched (but the flag affects the entire
-      regular expression, so in such cases using an explicit
-      ``[ \t\n\r\f\v]`` may be a better choice).
+      ``[ \t\n\r\f\v]`` is matched.
 
    For 8-bit (bytes) patterns:
       Matches characters considered whitespace in the ASCII character set;
@@ -415,18 +425,14 @@ character ``'$'``.
 ``\S``
    Matches any character which is not a whitespace character. This is
    the opposite of ``\s``. If the :const:`ASCII` flag is used this
-   becomes the equivalent of ``[^ \t\n\r\f\v]`` (but the flag affects the entire
-   regular expression, so in such cases using an explicit ``[^ \t\n\r\f\v]`` may
-   be a better choice).
+   becomes the equivalent of ``[^ \t\n\r\f\v]``.
 
 ``\w``
    For Unicode (str) patterns:
       Matches Unicode word characters; this includes most characters
       that can be part of a word in any language, as well as numbers and
       the underscore. If the :const:`ASCII` flag is used, only
-      ``[a-zA-Z0-9_]`` is matched (but the flag affects the entire
-      regular expression, so in such cases using an explicit
-      ``[a-zA-Z0-9_]`` may be a better choice).
+      ``[a-zA-Z0-9_]`` is matched.
 
    For 8-bit (bytes) patterns:
       Matches characters considered alphanumeric in the ASCII character set;
@@ -437,9 +443,7 @@ character ``'$'``.
 ``\W``
    Matches any character which is not a word character. This is
    the opposite of ``\w``. If the :const:`ASCII` flag is used this
-   becomes the equivalent of ``[^a-zA-Z0-9_]`` (but the flag affects the
-   entire regular expression, so in such cases using an explicit
-   ``[^a-zA-Z0-9_]`` may be a better choice).  If the :const:`LOCALE` flag is
+   becomes the equivalent of ``[^a-zA-Z0-9_]``.  If the :const:`LOCALE` flag is
    used, matches characters considered alphanumeric in the current locale
    and the underscore.
 
@@ -563,9 +567,7 @@ form.
    letter I with dot above), '?' (U+0131, Latin small letter dotless i),
    '?' (U+017F, Latin small letter long s) and '?' (U+212A, Kelvin sign).
    If the :const:`ASCII` flag is used, only letters 'a' to 'z'
-   and 'A' to 'Z' are matched (but the flag affects the entire regular
-   expression, so in such cases using an explicit ``(?-i:[a-zA-Z])`` may be
-   a better choice).
+   and 'A' to 'Z' are matched.
 
 .. data:: L
           LOCALE
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index 46121dcf300..17e4e0a8813 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -296,6 +296,13 @@ pdb
 argument.  If given, this is printed to the console just before debugging
 begins.
 
+re
+--
+
+The flags :const:`re.ASCII`, :const:`re.LOCALE` and :const:`re.UNICODE`
+can be set within the scope of a group.
+(Contributed by Serhiy Storchaka in :issue:`31690`.)
+
 string
 ------
 
diff --git a/Lib/sre_compile.py b/Lib/sre_compile.py
index 144620c6d1b..e5216b792f6 100644
--- a/Lib/sre_compile.py
+++ b/Lib/sre_compile.py
@@ -62,6 +62,12 @@
 _ignorecase_fixes = {i: tuple(j for j in t if i != j)
                      for t in _equivalences for i in t}
 
+def _combine_flags(flags, add_flags, del_flags,
+                   TYPE_FLAGS=sre_parse.TYPE_FLAGS):
+    if add_flags & TYPE_FLAGS:
+        flags &= ~TYPE_FLAGS
+    return (flags | add_flags) & ~del_flags
+
 def _compile(code, pattern, flags):
     # internal: compile a (sub)pattern
     emit = code.append
@@ -87,15 +93,21 @@ def _compile(code, pattern, flags):
                 emit(op)
                 emit(av)
             elif flags & SRE_FLAG_LOCALE:
-                emit(OP_LOC_IGNORE[op])
+                emit(OP_LOCALE_IGNORE[op])
                 emit(av)
             elif not iscased(av):
                 emit(op)
                 emit(av)
             else:
                 lo = tolower(av)
-                if fixes and lo in fixes:
-                    emit(IN_IGNORE)
+                if not fixes:  # ascii
+                    emit(OP_IGNORE[op])
+                    emit(lo)
+                elif lo not in fixes:
+                    emit(OP_UNICODE_IGNORE[op])
+                    emit(lo)
+                else:
+                    emit(IN_UNI_IGNORE)
                     skip = _len(code); emit(0)
                     if op is NOT_LITERAL:
                         emit(NEGATE)
@@ -104,17 +116,16 @@ def _compile(code, pattern, flags):
                         emit(k)
                     emit(FAILURE)
                     code[skip] = _len(code) - skip
-                else:
-                    emit(OP_IGNORE[op])
-                    emit(lo)
         elif op is IN:
             charset, hascased = _optimize_charset(av, iscased, tolower, fixes)
             if flags & SRE_FLAG_IGNORECASE and flags & SRE_FLAG_LOCALE:
                 emit(IN_LOC_IGNORE)
-            elif hascased:
+            elif not hascased:
+                emit(IN)
+            elif not fixes:  # ascii
                 emit(IN_IGNORE)
             else:
-                emit(IN)
+                emit(IN_UNI_IGNORE)
             skip = _len(code); emit(0)
             _compile_charset(charset, flags, code)
             code[skip] = _len(code) - skip
@@ -153,8 +164,8 @@ def _compile(code, pattern, flags):
             if group:
                 emit(MARK)
                 emit((group-1)*2)
-            # _compile_info(code, p, (flags | add_flags) & ~del_flags)
-            _compile(code, p, (flags | add_flags) & ~del_flags)
+            # _compile_info(code, p, _combine_flags(flags, add_flags, del_flags))
+            _compile(code, p, _combine_flags(flags, add_flags, del_flags))
             if group:
                 emit(MARK)
                 emit((group-1)*2+1)
@@ -210,10 +221,14 @@ def _compile(code, pattern, flags):
                 av = CH_UNICODE[av]
             emit(av)
         elif op is GROUPREF:
-            if flags & SRE_FLAG_IGNORECASE:
-                emit(OP_IGNORE[op])
-            else:
+            if not flags & SRE_FLAG_IGNORECASE:
                 emit(op)
+            elif flags & SRE_FLAG_LOCALE:
+                emit(GROUPREF_LOC_IGNORE)
+            elif not fixes:  # ascii
+                emit(GROUPREF_IGNORE)
+            else:
+                emit(GROUPREF_UNI_IGNORE)
             emit(av-1)
         elif op is GROUPREF_EXISTS:
             emit(op)
@@ -240,7 +255,7 @@ def _compile_charset(charset, flags, code):
             pass
         elif op is LITERAL:
             emit(av)
-        elif op is RANGE or op is RANGE_IGNORE:
+        elif op is RANGE or op is RANGE_UNI_IGNORE:
             emit(av[0])
             emit(av[1])
         elif op is CHARSET:
@@ -309,9 +324,9 @@ def _optimize_charset(charset, iscased=None, fixup=None, fixes=None):
                     hascased = True
                     # There are only two ranges of cased non-BMP characters:
                     # 10400-1044F (Deseret) and 118A0-118DF (Warang Citi),
-                    # and for both ranges RANGE_IGNORE works.
+                    # and for both ranges RANGE_UNI_IGNORE works.
                     if op is RANGE:
-                        op = RANGE_IGNORE
+                        op = RANGE_UNI_IGNORE
                 tail.append((op, av))
             break
 
@@ -456,7 +471,7 @@ def _get_literal_prefix(pattern, flags):
             prefixappend(av)
         elif op is SUBPATTERN:
             group, add_flags, del_flags, p = av
-            flags1 = (flags | add_flags) & ~del_flags
+            flags1 = _combine_flags(flags, add_flags, del_flags)
             if flags1 & SRE_FLAG_IGNORECASE and flags1 & SRE_FLAG_LOCALE:
                 break
             prefix1, prefix_skip1, got_all = _get_literal_prefix(p, flags1)
@@ -482,7 +497,7 @@ def _get_charset_prefix(pattern, flags):
         if op is not SUBPATTERN:
             break
         group, add_flags, del_flags, pattern = av
-        flags = (flags | add_flags) & ~del_flags
+        flags = _combine_flags(flags, add_flags, del_flags)
         if flags & SRE_FLAG_IGNORECASE and flags & SRE_FLAG_LOCALE:
             return None
 
@@ -631,6 +646,7 @@ def print_2(*args):
                 print_(op)
             elif op in (LITERAL, NOT_LITERAL,
                         LITERAL_IGNORE, NOT_LITERAL_IGNORE,
+                        LITERAL_UNI_IGNORE, NOT_LITERAL_UNI_IGNORE,
                         LITERAL_LOC_IGNORE, NOT_LITERAL_LOC_IGNORE):
                 arg = code[i]
                 i += 1
@@ -647,12 +663,12 @@ def print_2(*args):
                 arg = str(CHCODES[arg])
                 assert arg[:9] == 'CATEGORY_'
                 print_(op, arg[9:])
-            elif op in (IN, IN_IGNORE, IN_LOC_IGNORE):
+            elif op in (IN, IN_IGNORE, IN_UNI_IGNORE, IN_LOC_IGNORE):
                 skip = code[i]
                 print_(op, skip, to=i+skip)
                 dis_(i+1, i+skip)
                 i += skip
-            elif op in (RANGE, RANGE_IGNORE):
+            elif op in (RANGE, RANGE_UNI_IGNORE):
                 lo, hi = code[i: i+2]
                 i += 2
                 print_(op, '%#02x %#02x (%r-%r)' % (lo, hi, chr(lo), chr(hi)))
@@ -671,7 +687,8 @@ def print_2(*args):
                     print_2(_hex_code(code[i: i + 256//_CODEBITS]))
                     i += 256//_CODEBITS
                 level -= 1
-            elif op in (MARK, GROUPREF, GROUPREF_IGNORE):
+            elif op in (MARK, GROUPREF, GROUPREF_IGNORE, GROUPREF_UNI_IGNORE,
+                        GROUPREF_LOC_IGNORE):
                 arg = code[i]
                 i += 1
                 print_(op, arg)
diff --git a/Lib/sre_constants.py b/Lib/sre_constants.py
index 1daa7bd00f4..13deb00bc81 100644
--- a/Lib/sre_constants.py
+++ b/Lib/sre_constants.py
@@ -13,7 +13,7 @@
 
 # update when constants are added or removed
 
-MAGIC = 20170530
+MAGIC = 20171005
 
 from _sre import MAXREPEAT, MAXGROUPS
 
@@ -84,25 +84,37 @@ def _makecodes(names):
     CALL
     CATEGORY
     CHARSET BIGCHARSET
-    GROUPREF GROUPREF_EXISTS GROUPREF_IGNORE
-    IN IN_IGNORE
+    GROUPREF GROUPREF_EXISTS
+    IN
     INFO
     JUMP
-    LITERAL LITERAL_IGNORE
+    LITERAL
     MARK
     MAX_UNTIL
     MIN_UNTIL
-    NOT_LITERAL NOT_LITERAL_IGNORE
+    NOT_LITERAL
     NEGATE
     RANGE
     REPEAT
     REPEAT_ONE
     SUBPATTERN
     MIN_REPEAT_ONE
-    RANGE_IGNORE
+
+    GROUPREF_IGNORE
+    IN_IGNORE
+    LITERAL_IGNORE
+    NOT_LITERAL_IGNORE
+
+    GROUPREF_LOC_IGNORE
+    IN_LOC_IGNORE
     LITERAL_LOC_IGNORE
     NOT_LITERAL_LOC_IGNORE
-    IN_LOC_IGNORE
+
+    GROUPREF_UNI_IGNORE
+    IN_UNI_IGNORE
+    LITERAL_UNI_IGNORE
+    NOT_LITERAL_UNI_IGNORE
+    RANGE_UNI_IGNORE
 
     MIN_REPEAT MAX_REPEAT
 """)
@@ -113,7 +125,9 @@ def _makecodes(names):
     AT_BEGINNING AT_BEGINNING_LINE AT_BEGINNING_STRING
     AT_BOUNDARY AT_NON_BOUNDARY
     AT_END AT_END_LINE AT_END_STRING
+
     AT_LOC_BOUNDARY AT_LOC_NON_BOUNDARY
+
     AT_UNI_BOUNDARY AT_UNI_NON_BOUNDARY
 """)
 
@@ -123,7 +137,9 @@ def _makecodes(names):
     CATEGORY_SPACE CATEGORY_NOT_SPACE
     CATEGORY_WORD CATEGORY_NOT_WORD
     CATEGORY_LINEBREAK CATEGORY_NOT_LINEBREAK
+
     CATEGORY_LOC_WORD CATEGORY_LOC_NOT_WORD
+
     CATEGORY_UNI_DIGIT CATEGORY_UNI_NOT_DIGIT
     CATEGORY_UNI_SPACE CATEGORY_UNI_NOT_SPACE
     CATEGORY_UNI_WORD CATEGORY_UNI_NOT_WORD
@@ -133,18 +149,20 @@ def _makecodes(names):
 
 # replacement operations for "ignore case" mode
 OP_IGNORE = {
-    GROUPREF: GROUPREF_IGNORE,
-    IN: IN_IGNORE,
     LITERAL: LITERAL_IGNORE,
     NOT_LITERAL: NOT_LITERAL_IGNORE,
-    RANGE: RANGE_IGNORE,
 }
 
-OP_LOC_IGNORE = {
+OP_LOCALE_IGNORE = {
     LITERAL: LITERAL_LOC_IGNORE,
     NOT_LITERAL: NOT_LITERAL_LOC_IGNORE,
 }
 
+OP_UNICODE_IGNORE = {
+    LITERAL: LITERAL_UNI_IGNORE,
+    NOT_LITERAL: NOT_LITERAL_UNI_IGNORE,
+}
+
 AT_MULTILINE = {
     AT_BEGINNING: AT_BEGINNING_LINE,
     AT_END: AT_END_LINE
diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
index 545252074f6..85274122938 100644
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -65,8 +65,8 @@
     "u": SRE_FLAG_UNICODE,
 }
 
-GLOBAL_FLAGS = (SRE_FLAG_ASCII | SRE_FLAG_LOCALE | SRE_FLAG_UNICODE |
-                SRE_FLAG_DEBUG | SRE_FLAG_TEMPLATE)
+TYPE_FLAGS = SRE_FLAG_ASCII | SRE_FLAG_LOCALE | SRE_FLAG_UNICODE
+GLOBAL_FLAGS = SRE_FLAG_DEBUG | SRE_FLAG_TEMPLATE
 
 class Verbose(Exception):
     pass
@@ -822,7 +822,19 @@ def _parse_flags(source, state, char):
     del_flags = 0
     if char != "-":
         while True:
-            add_flags |= FLAGS[char]
+            flag = FLAGS[char]
+            if source.istext:
+                if char == 'L':
+                    msg = "bad inline flags: cannot use 'L' flag with a str pattern"
+                    raise source.error(msg)
+            else:
+                if char == 'u':
+                    msg = "bad inline flags: cannot use 'u' flag with a bytes pattern"
+                    raise source.error(msg)
+            add_flags |= flag
+            if (flag & TYPE_FLAGS) and (add_flags & TYPE_FLAGS) != flag:
+                msg = "bad inline flags: flags 'a', 'u' and 'L' are incompatible"
+                raise source.error(msg)
             char = sourceget()
             if char is None:
                 raise source.error("missing -, : or )")
@@ -844,7 +856,11 @@ def _parse_flags(source, state, char):
             msg = "unknown flag" if char.isalpha() else "missing flag"
             raise source.error(msg, len(char))
         while True:
-            del_flags |= FLAGS[char]
+            flag = FLAGS[char]
+            if flag & TYPE_FLAGS:
+                msg = "bad inline flags: cannot turn off flags 'a', 'u' and 'L'"
+                raise source.error(msg)
+            del_flags |= flag
             char = sourceget()
             if char is None:
                 raise source.error("missing :")
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index 9cb426a04dc..fc015e4ed9b 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -1470,11 +1470,11 @@ def test_ascii_and_unicode_flag(self):
             self.assertIsNone(pat.match(b'\xe0'))
         # Incompatibilities
         self.assertRaises(ValueError, re.compile, br'\w', re.UNICODE)
-        self.assertRaises(ValueError, re.compile, br'(?u)\w')
+        self.assertRaises(re.error, re.compile, br'(?u)\w')
         self.assertRaises(ValueError, re.compile, r'\w', re.UNICODE | re.ASCII)
         self.assertRaises(ValueError, re.compile, r'(?u)\w', re.ASCII)
         self.assertRaises(ValueError, re.compile, r'(?a)\w', re.UNICODE)
-        self.assertRaises(ValueError, re.compile, r'(?au)\w')
+        self.assertRaises(re.error, re.compile, r'(?au)\w')
 
     def test_locale_flag(self):
         import locale
@@ -1516,11 +1516,11 @@ def test_locale_flag(self):
             self.assertIsNone(pat.match(bletter))
         # Incompatibilities
         self.assertRaises(ValueError, re.compile, '', re.LOCALE)
-        self.assertRaises(ValueError, re.compile, '(?L)')
+        self.assertRaises(re.error, re.compile, '(?L)')
         self.assertRaises(ValueError, re.compile, b'', re.LOCALE | re.ASCII)
         self.assertRaises(ValueError, re.compile, b'(?L)', re.ASCII)
         self.assertRaises(ValueError, re.compile, b'(?a)', re.LOCALE)
-        self.assertRaises(ValueError, re.compile, b'(?aL)')
+        self.assertRaises(re.error, re.compile, b'(?aL)')
 
     def test_scoped_flags(self):
         self.assertTrue(re.match(r'(?i:a)b', 'Ab'))
@@ -1535,12 +1535,18 @@ def test_scoped_flags(self):
         self.assertTrue(re.match(r'(?-x: a) b', ' ab', re.VERBOSE))
         self.assertIsNone(re.match(r'(?-x: a) b', 'ab', re.VERBOSE))
 
-        self.checkPatternError(r'(?a:\w)',
-                               'bad inline flags: cannot turn on global flag', 3)
+        self.assertTrue(re.match(r'\w(?a:\W)\w', '\xe0\xe0\xe0'))
+        self.assertTrue(re.match(r'(?a:\W(?u:\w)\W)', '\xe0\xe0\xe0'))
+        self.assertTrue(re.match(r'\W(?u:\w)\W', '\xe0\xe0\xe0', re.ASCII))
+
         self.checkPatternError(r'(?a)(?-a:\w)',
-                               'bad inline flags: cannot turn off global flag', 8)
+                "bad inline flags: cannot turn off flags 'a', 'u' and 'L'", 8)
         self.checkPatternError(r'(?i-i:a)',
-                               'bad inline flags: flag turned on and off', 5)
+                'bad inline flags: flag turned on and off', 5)
+        self.checkPatternError(r'(?au:a)',
+                "bad inline flags: flags 'a', 'u' and 'L' are incompatible", 4)
+        self.checkPatternError(br'(?aL:a)',
+                "bad inline flags: flags 'a', 'u' and 'L' are incompatible", 4)
 
         self.checkPatternError(r'(?-', 'missing flag', 3)
         self.checkPatternError(r'(?-+', 'missing flag', 3)
diff --git a/Misc/NEWS.d/next/Library/2017-10-05-15-14-46.bpo-31690.f0XteV.rst b/Misc/NEWS.d/next/Library/2017-10-05-15-14-46.bpo-31690.f0XteV.rst
new file mode 100644
index 00000000000..1505615d270
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-05-15-14-46.bpo-31690.f0XteV.rst
@@ -0,0 +1,2 @@
+Allow the flags re.ASCII, re.LOCALE, and re.UNICODE to be used as group flags
+for regular expressions.
diff --git a/Modules/_sre.c b/Modules/_sre.c
index c42ab2668fd..a9b6b50e84e 100644
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -97,12 +97,12 @@ static const char copyright[] =
 #define SRE_IS_WORD(ch)\
     ((ch) < 128 && (Py_ISALNUM(ch) || (ch) == '_'))
 
-static unsigned int sre_lower(unsigned int ch)
+static unsigned int sre_lower_ascii(unsigned int ch)
 {
     return ((ch) < 128 ? Py_TOLOWER(ch) : ch);
 }
 
-static unsigned int sre_upper(unsigned int ch)
+static unsigned int sre_upper_ascii(unsigned int ch)
 {
     return ((ch) < 128 ? Py_TOUPPER(ch) : ch);
 }
@@ -188,6 +188,15 @@ sre_category(SRE_CODE category, unsigned int ch)
     return 0;
 }
 
+LOCAL(int)
+char_loc_ignore(SRE_CODE pattern, SRE_CODE ch)
+{
+    return ch == pattern
+        || (SRE_CODE) sre_lower_locale(ch) == pattern
+        || (SRE_CODE) sre_upper_locale(ch) == pattern;
+}
+
+
 /* helpers */
 
 static void
@@ -286,7 +295,7 @@ _sre_ascii_iscased_impl(PyObject *module, int character)
 /*[clinic end generated code: output=4f454b630fbd19a2 input=9f0bd952812c7ed3]*/
 {
     unsigned int ch = (unsigned int)character;
-    return ch != sre_lower(ch) || ch != sre_upper(ch);
+    return ch != sre_lower_ascii(ch) || ch != sre_upper_ascii(ch);
 }
 
 /*[clinic input]
@@ -317,7 +326,7 @@ static int
 _sre_ascii_tolower_impl(PyObject *module, int character)
 /*[clinic end generated code: output=228294ed6ff2a612 input=272c609b5b61f136]*/
 {
-    return sre_lower(character);
+    return sre_lower_ascii(character);
 }
 
 /*[clinic input]
@@ -448,19 +457,6 @@ state_init(SRE_STATE* state, PatternObject* pattern, PyObject* string,
     state->pos = start;
     state->endpos = end;
 
-    if (pattern->flags & SRE_FLAG_LOCALE) {
-        state->lower = sre_lower_locale;
-        state->upper = sre_upper_locale;
-    }
-    else if (pattern->flags & SRE_FLAG_UNICODE) {
-        state->lower = sre_lower_unicode;
-        state->upper = sre_upper_unicode;
-    }
-    else {
-        state->lower = sre_lower;
-        state->upper = sre_upper;
-    }
-
     return string;
   err:
     PyMem_Del(state->mark);
@@ -1533,7 +1529,7 @@ _validate_charset(SRE_CODE *code, SRE_CODE *end)
             break;
 
         case SRE_OP_RANGE:
-        case SRE_OP_RANGE_IGNORE:
+        case SRE_OP_RANGE_UNI_IGNORE:
             GET_ARG;
             GET_ARG;
             break;
@@ -1630,6 +1626,8 @@ _validate_inner(SRE_CODE *code, SRE_CODE *end, Py_ssize_t groups)
         case SRE_OP_NOT_LITERAL:
         case SRE_OP_LITERAL_IGNORE:
         case SRE_OP_NOT_LITERAL_IGNORE:
+        case SRE_OP_LITERAL_UNI_IGNORE:
+        case SRE_OP_NOT_LITERAL_UNI_IGNORE:
         case SRE_OP_LITERAL_LOC_IGNORE:
         case SRE_OP_NOT_LITERAL_LOC_IGNORE:
             GET_ARG;
@@ -1669,6 +1667,7 @@ _validate_inner(SRE_CODE *code, SRE_CODE *end, Py_ssize_t groups)
 
         case SRE_OP_IN:
         case SRE_OP_IN_IGNORE:
+        case SRE_OP_IN_UNI_IGNORE:
         case SRE_OP_IN_LOC_IGNORE:
             GET_SKIP;
             /* Stop 1 before the end; we check the FAILURE below */
@@ -1805,6 +1804,8 @@ _validate_inner(SRE_CODE *code, SRE_CODE *end, Py_ssize_t groups)
 
         case SRE_OP_GROUPREF:
         case SRE_OP_GROUPREF_IGNORE:
+        case SRE_OP_GROUPREF_UNI_IGNORE:
+        case SRE_OP_GROUPREF_LOC_IGNORE:
             GET_ARG;
             if (arg >= (size_t)groups)
                 FAIL;
diff --git a/Modules/sre.h b/Modules/sre.h
index 9af5e405749..585d2841a66 100644
--- a/Modules/sre.h
+++ b/Modules/sre.h
@@ -52,8 +52,6 @@ typedef struct {
     Py_ssize_t mark[1];
 } MatchObject;
 
-typedef unsigned int (*SRE_TOLOWER_HOOK)(unsigned int ch);
-
 typedef struct SRE_REPEAT_T {
     Py_ssize_t count;
     SRE_CODE* pattern; /* points to REPEAT operator arguments */
@@ -83,8 +81,6 @@ typedef struct {
     Py_buffer buffer;
     /* current repeat context */
     SRE_REPEAT *repeat;
-    /* hooks */
-    SRE_TOLOWER_HOOK lower, upper;
 } SRE_STATE;
 
 typedef struct {
diff --git a/Modules/sre_constants.h b/Modules/sre_constants.h
index 6d6d21efd04..c8ccb32d21d 100644
--- a/Modules/sre_constants.h
+++ b/Modules/sre_constants.h
@@ -11,7 +11,7 @@
  * See the _sre.c file for information on usage and redistribution.
  */
 
-#define SRE_MAGIC 20170530
+#define SRE_MAGIC 20171005
 #define SRE_OP_FAILURE 0
 #define SRE_OP_SUCCESS 1
 #define SRE_OP_ANY 2
@@ -26,28 +26,33 @@
 #define SRE_OP_BIGCHARSET 11
 #define SRE_OP_GROUPREF 12
 #define SRE_OP_GROUPREF_EXISTS 13
-#define SRE_OP_GROUPREF_IGNORE 14
-#define SRE_OP_IN 15
-#define SRE_OP_IN_IGNORE 16
-#define SRE_OP_INFO 17
-#define SRE_OP_JUMP 18
-#define SRE_OP_LITERAL 19
-#define SRE_OP_LITERAL_IGNORE 20
-#define SRE_OP_MARK 21
-#define SRE_OP_MAX_UNTIL 22
-#define SRE_OP_MIN_UNTIL 23
-#define SRE_OP_NOT_LITERAL 24
-#define SRE_OP_NOT_LITERAL_IGNORE 25
-#define SRE_OP_NEGATE 26
-#define SRE_OP_RANGE 27
-#define SRE_OP_REPEAT 28
-#define SRE_OP_REPEAT_ONE 29
-#define SRE_OP_SUBPATTERN 30
-#define SRE_OP_MIN_REPEAT_ONE 31
-#define SRE_OP_RANGE_IGNORE 32
-#define SRE_OP_LITERAL_LOC_IGNORE 33
-#define SRE_OP_NOT_LITERAL_LOC_IGNORE 34
-#define SRE_OP_IN_LOC_IGNORE 35
+#define SRE_OP_IN 14
+#define SRE_OP_INFO 15
+#define SRE_OP_JUMP 16
+#define SRE_OP_LITERAL 17
+#define SRE_OP_MARK 18
+#define SRE_OP_MAX_UNTIL 19
+#define SRE_OP_MIN_UNTIL 20
+#define SRE_OP_NOT_LITERAL 21
+#define SRE_OP_NEGATE 22
+#define SRE_OP_RANGE 23
+#define SRE_OP_REPEAT 24
+#define SRE_OP_REPEAT_ONE 25
+#define SRE_OP_SUBPATTERN 26
+#define SRE_OP_MIN_REPEAT_ONE 27
+#define SRE_OP_GROUPREF_IGNORE 28
+#define SRE_OP_IN_IGNORE 29
+#define SRE_OP_LITERAL_IGNORE 30
+#define SRE_OP_NOT_LITERAL_IGNORE 31
+#define SRE_OP_GROUPREF_LOC_IGNORE 32
+#define SRE_OP_IN_LOC_IGNORE 33
+#define SRE_OP_LITERAL_LOC_IGNORE 34
+#define SRE_OP_NOT_LITERAL_LOC_IGNORE 35
+#define SRE_OP_GROUPREF_UNI_IGNORE 36
+#define SRE_OP_IN_UNI_IGNORE 37
+#define SRE_OP_LITERAL_UNI_IGNORE 38
+#define SRE_OP_NOT_LITERAL_UNI_IGNORE 39
+#define SRE_OP_RANGE_UNI_IGNORE 40
 #define SRE_AT_BEGINNING 0
 #define SRE_AT_BEGINNING_LINE 1
 #define SRE_AT_BEGINNING_STRING 2
diff --git a/Modules/sre_lib.h b/Modules/sre_lib.h
index b540d219dde..e13b90e8bc0 100644
--- a/Modules/sre_lib.h
+++ b/Modules/sre_lib.h
@@ -101,14 +101,6 @@ SRE(at)(SRE_STATE* state, SRE_CHAR* ptr, SRE_CODE at)
 }
 
 LOCAL(int)
-SRE(char_loc_ignore)(SRE_STATE* state, SRE_CODE pattern, SRE_CODE ch)
-{
-    return ch == pattern
-        || (SRE_CODE) state->lower(ch) == pattern
-        || (SRE_CODE) state->upper(ch) == pattern;
-}
-
-LOCAL(int)
 SRE(charset)(SRE_STATE* state, SRE_CODE* set, SRE_CODE ch)
 {
     /* check if character is a member of the given set */
@@ -150,14 +142,14 @@ SRE(charset)(SRE_STATE* state, SRE_CODE* set, SRE_CODE ch)
             set += 2;
             break;
 
-        case SRE_OP_RANGE_IGNORE:
-            /* <RANGE_IGNORE> <lower> <upper> */
+        case SRE_OP_RANGE_UNI_IGNORE:
+            /* <RANGE_UNI_IGNORE> <lower> <upper> */
         {
             SRE_CODE uch;
             /* ch is already lower cased */
             if (set[0] <= ch && ch <= set[1])
                 return ok;
-            uch = state->upper(ch);
+            uch = sre_upper_unicode(ch);
             if (set[0] <= uch && uch <= set[1])
                 return ok;
             set += 2;
@@ -199,11 +191,11 @@ LOCAL(int)
 SRE(charset_loc_ignore)(SRE_STATE* state, SRE_CODE* set, SRE_CODE ch)
 {
     SRE_CODE lo, up;
-    lo = state->lower(ch);
+    lo = sre_lower_locale(ch);
     if (SRE(charset)(state, set, lo))
        return 1;
 
-    up = state->upper(ch);
+    up = sre_upper_locale(ch);
     return up != lo && SRE(charset)(state, set, up);
 }
 
@@ -263,7 +255,15 @@ SRE(count)(SRE_STATE* state, SRE_CODE* pattern, Py_ssize_t maxcount)
         /* repeated literal */
         chr = pattern[1];
         TRACE(("|%p|%p|COUNT LITERAL_IGNORE %d\n", pattern, ptr, chr));
-        while (ptr < end && (SRE_CODE) state->lower(*ptr) == chr)
+        while (ptr < end && (SRE_CODE) sre_lower_ascii(*ptr) == chr)
+            ptr++;
+        break;
+
+    case SRE_OP_LITERAL_UNI_IGNORE:
+        /* repeated literal */
+        chr = pattern[1];
+        TRACE(("|%p|%p|COUNT LITERAL_UNI_IGNORE %d\n", pattern, ptr, chr));
+        while (ptr < end && (SRE_CODE) sre_lower_unicode(*ptr) == chr)
             ptr++;
         break;
 
@@ -271,7 +271,7 @@ SRE(count)(SRE_STATE* state, SRE_CODE* pattern, Py_ssize_t maxcount)
         /* repeated literal */
         chr = pattern[1];
         TRACE(("|%p|%p|COUNT LITERAL_LOC_IGNORE %d\n", pattern, ptr, chr));
-        while (ptr < end && SRE(char_loc_ignore)(state, chr, *ptr))
+        while (ptr < end && char_loc_ignore(chr, *ptr))
             ptr++;
         break;
 
@@ -293,7 +293,15 @@ SRE(count)(SRE_STATE* state, SRE_CODE* pattern, Py_ssize_t maxcount)
         /* repeated non-literal */
         chr = pattern[1];
         TRACE(("|%p|%p|COUNT NOT_LITERAL_IGNORE %d\n", pattern, ptr, chr));
-        while (ptr < end && (SRE_CODE) state->lower(*ptr) != chr)
+        while (ptr < end && (SRE_CODE) sre_lower_ascii(*ptr) != chr)
+            ptr++;
+        break;
+
+    case SRE_OP_NOT_LITERAL_UNI_IGNORE:
+        /* repeated non-literal */
+        chr = pattern[1];
+        TRACE(("|%p|%p|COUNT NOT_LITERAL_UNI_IGNORE %d\n", pattern, ptr, chr));
+        while (ptr < end && (SRE_CODE) sre_lower_unicode(*ptr) != chr)
             ptr++;
         break;
 
@@ -301,7 +309,7 @@ SRE(count)(SRE_STATE* state, SRE_CODE* pattern, Py_ssize_t maxcount)
         /* repeated non-literal */
         chr = pattern[1];
         TRACE(("|%p|%p|COUNT NOT_LITERAL_LOC_IGNORE %d\n", pattern, ptr, chr));
-        while (ptr < end && !SRE(char_loc_ignore)(state, chr, *ptr))
+        while (ptr < end && !char_loc_ignore(chr, *ptr))
             ptr++;
         break;
 
@@ -687,7 +695,17 @@ SRE(match)(SRE_STATE* state, SRE_CODE* pattern, int match_all)
             TRACE(("|%p|%p|LITERAL_IGNORE %d\n",
                    ctx->pattern, ctx->ptr, ctx->pattern[0]));
             if (ctx->ptr >= end ||
-                state->lower(*ctx->ptr) != *ctx->pattern)
+                sre_lower_ascii(*ctx->ptr) != *ctx->pattern)
+                RETURN_FAILURE;
+            ctx->pattern++;
+            ctx->ptr++;
+            break;
+
+        case SRE_OP_LITERAL_UNI_IGNORE:
+            TRACE(("|%p|%p|LITERAL_UNI_IGNORE %d\n",
+                   ctx->pattern, ctx->ptr, ctx->pattern[0]));
+            if (ctx->ptr >= end ||
+                sre_lower_unicode(*ctx->ptr) != *ctx->pattern)
                 RETURN_FAILURE;
             ctx->pattern++;
             ctx->ptr++;
@@ -697,7 +715,7 @@ SRE(match)(SRE_STATE* state, SRE_CODE* pattern, int match_all)
             TRACE(("|%p|%p|LITERAL_LOC_IGNORE %d\n",
                    ctx->pattern, ctx->ptr, ctx->pattern[0]));
             if (ctx->ptr >= end
-                || !SRE(char_loc_ignore)(state, *ctx->pattern, *ctx->ptr))
+                || !char_loc_ignore(*ctx->pattern, *ctx->ptr))
                 RETURN_FAILURE;
             ctx->pattern++;
             ctx->ptr++;
@@ -707,7 +725,17 @@ SRE(match)(SRE_STATE* state, SRE_CODE* pattern, int match_all)
             TRACE(("|%p|%p|NOT_LITERAL_IGNORE %d\n",
                    ctx->pattern, ctx->ptr, *ctx->pattern));
             if (ctx->ptr >= end ||
-                state->lower(*ctx->ptr) == *ctx->pattern)
+                sre_lower_ascii(*ctx->ptr) == *ctx->pattern)
+                RETURN_FAILURE;
+            ctx->pattern++;
+            ctx->ptr++;
+            break;
+
+        case SRE_OP_NOT_LITERAL_UNI_IGNORE:
+            TRACE(("|%p|%p|NOT_LITERAL_UNI_IGNORE %d\n",
+                   ctx->pattern, ctx->ptr, *ctx->pattern));
+            if (ctx->ptr >= end ||
+                sre_lower_unicode(*ctx->ptr) == *ctx->pattern)
                 RETURN_FAILURE;
             ctx->pattern++;
             ctx->ptr++;
@@ -717,7 +745,7 @@ SRE(match)(SRE_STATE* state, SRE_CODE* pattern, int match_all)
             TRACE(("|%p|%p|NOT_LITERAL_LOC_IGNORE %d\n",
                    ctx->pattern, ctx->ptr, *ctx->pattern));
             if (ctx->ptr >= end
-                || SRE(char_loc_ignore)(state, *ctx->pattern, *ctx->ptr))
+                || char_loc_ignore(*ctx->pattern, *ctx->ptr))
                 RETURN_FAILURE;
             ctx->pattern++;
             ctx->ptr++;
@@ -727,7 +755,17 @@ SRE(match)(SRE_STATE* state, SRE_CODE* pattern, int match_all)
             TRACE(("|%p|%p|IN_IGNORE\n", ctx->pattern, ctx->ptr));
             if (ctx->ptr >= end
                 || !SRE(charset)(state, ctx->pattern+1,
-                                 (SRE_CODE)state->lower(*ctx->ptr)))
+                                 (SRE_CODE)sre_lower_ascii(*ctx->ptr)))
+                RETURN_FAILURE;
+            ctx->pattern += ctx->pattern[0];
+            ctx->ptr++;
+            break;
+
+        case SRE_OP_IN_UNI_IGNORE:
+            TRACE(("|%p|%p|IN_UNI_IGNORE\n", ctx->pattern, ctx->ptr));
+            if (ctx->ptr >= end
+                || !SRE(charset)(state, ctx->pattern+1,
+                                 (SRE_CODE)sre_lower_unicode(*ctx->ptr)))
                 RETURN_FAILURE;
             ctx->pattern += ctx->pattern[0];
             ctx->ptr++;
@@ -1135,7 +1173,59 @@ SRE(match)(SRE_STATE* state, SRE_CODE* pattern, int match_all)
                         RETURN_FAILURE;
                     while (p < e) {
                         if (ctx->ptr >= end ||
-                            state->lower(*ctx->ptr) != state->lower(*p))
+                            sre_lower_ascii(*ctx->ptr) != sre_lower_ascii(*p))
+                            RETURN_FAILURE;
+                        p++;
+                        ctx->ptr++;
+                    }
+                }
+            }
+            ctx->pattern++;
+            break;
+
+        case SRE_OP_GROUPREF_UNI_IGNORE:
+            /* match backreference */
+            TRACE(("|%p|%p|GROUPREF_UNI_IGNORE %d\n", ctx->pattern,
+                   ctx->ptr, ctx->pattern[0]));
+            i = ctx->pattern[0];
+            {
+                Py_ssize_t groupref = i+i;
+                if (groupref >= state->lastmark) {
+                    RETURN_FAILURE;
+                } else {
+                    SRE_CHAR* p = (SRE_CHAR*) state->mark[groupref];
+                    SRE_CHAR* e = (SRE_CHAR*) state->mark[groupref+1];
+                    if (!p || !e || e < p)
+                        RETURN_FAILURE;
+                    while (p < e) {
+                        if (ctx->ptr >= end ||
+                            sre_lower_unicode(*ctx->ptr) != sre_lower_unicode(*p))
+                            RETURN_FAILURE;
+                        p++;
+                        ctx->ptr++;
+                    }
+                }
+            }
+            ctx->pattern++;
+            break;
+
+        case SRE_OP_GROUPREF_LOC_IGNORE:
+            /* match backreference */
+            TRACE(("|%p|%p|GROUPREF_LOC_IGNORE %d\n", ctx->pattern,
+                   ctx->ptr, ctx->pattern[0]));
+            i = ctx->pattern[0];
+            {
+                Py_ssize_t groupref = i+i;
+                if (groupref >= state->lastmark) {
+                    RETURN_FAILURE;
+                } else {
+                    SRE_CHAR* p = (SRE_CHAR*) state->mark[groupref];
+                    SRE_CHAR* e = (SRE_CHAR*) state->mark[groupref+1];
+                    if (!p || !e || e < p)
+                        RETURN_FAILURE;
+                    while (p < e) {
+                        if (ctx->ptr >= end ||
+                            sre_lower_locale(*ctx->ptr) != sre_lower_locale(*p))
                             RETURN_FAILURE;
                         p++;
                         ctx->ptr++;


From webhook-mailer at python.org  Tue Oct 24 16:35:25 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 24 Oct 2017 20:35:25 -0000
Subject: [Python-checkins] [2.7] bpo-25287: Backport new tests for crypt and
 skip test_crypt on OpenBSD. (GH-4111). (#4112)
Message-ID: <mailman.36.1508877329.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/04c0a4038e8764f742de8505600b8ee97ee50776
commit: 04c0a4038e8764f742de8505600b8ee97ee50776
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-24T23:35:22+03:00
summary:

[2.7] bpo-25287: Backport new tests for crypt and skip test_crypt on OpenBSD. (GH-4111). (#4112)

(cherry picked from commit f52dff611cff2fb9e90340b4787eda50ab2d40c6)

files:
M Lib/test/test_crypt.py

diff --git a/Lib/test/test_crypt.py b/Lib/test/test_crypt.py
index 4db200d4031..7cd9c71981a 100644
--- a/Lib/test/test_crypt.py
+++ b/Lib/test/test_crypt.py
@@ -1,14 +1,20 @@
+import sys
 from test import test_support
 import unittest
 
 crypt = test_support.import_module('crypt')
 
+if sys.platform.startswith('openbsd'):
+    raise unittest.SkipTest('The only supported method on OpenBSD is Blowfish')
+
 class CryptTestCase(unittest.TestCase):
 
     def test_crypt(self):
-        c = crypt.crypt('mypassword', 'ab')
-        if test_support.verbose:
-            print 'Test encryption: ', c
+        cr = crypt.crypt('mypassword', 'ab')
+        if cr is not None:
+            cr2 = crypt.crypt('mypassword', cr)
+            self.assertEqual(cr2, cr)
+
 
 def test_main():
     test_support.run_unittest(CryptTestCase)


From webhook-mailer at python.org  Tue Oct 24 19:53:36 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 24 Oct 2017 23:53:36 -0000
Subject: [Python-checkins] bpo-30768: Recompute timeout on interrupted lock
 (GH-4103)
Message-ID: <mailman.37.1508889218.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/850a18e03e8f8309bc8c39adc6e7d51a4568cd9a
commit: 850a18e03e8f8309bc8c39adc6e7d51a4568cd9a
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-24T16:53:32-07:00
summary:

bpo-30768: Recompute timeout on interrupted lock (GH-4103)

Fix the pthread+semaphore implementation of
PyThread_acquire_lock_timed() when called with timeout > 0 and
intr_flag=0: recompute the timeout if sem_timedwait() is interrupted
by a signal (EINTR).

See also the PEP 475.

The pthread implementation of PyThread_acquire_lock() now fails with
a fatal error if the timeout is larger than PY_TIMEOUT_MAX, as done
in the Windows implementation.

The check prevents any risk of overflow in PyThread_acquire_lock().

Add also PY_DWORD_MAX constant.

files:
A Misc/NEWS.d/next/Library/2017-10-24-12-00-16.bpo-30768.Om8Yj_.rst
M Include/pyport.h
M Include/pythread.h
M Modules/_threadmodule.c
M Modules/_winapi.c
M Modules/clinic/_winapi.c.h
M Modules/posixmodule.c
M Python/thread_nt.h
M Python/thread_pthread.h

diff --git a/Include/pyport.h b/Include/pyport.h
index 2742e477fd4..0e82543ac78 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -787,6 +787,9 @@ extern _invalid_parameter_handler _Py_silent_invalid_parameter_handler;
 #include <android/api-level.h>
 #endif
 
+/* Maximum value of the Windows DWORD type */
+#define PY_DWORD_MAX 4294967295U
+
 /* This macro used to tell whether Python was built with multithreading
  * enabled.  Now multithreading is always enabled, but keep the macro
  * for compatibility.
diff --git a/Include/pythread.h b/Include/pythread.h
index d6674685f28..eb61033b2d9 100644
--- a/Include/pythread.h
+++ b/Include/pythread.h
@@ -42,16 +42,23 @@ PyAPI_FUNC(int) PyThread_acquire_lock(PyThread_type_lock, int);
    and floating-point numbers allowed.
 */
 #define PY_TIMEOUT_T long long
-#define PY_TIMEOUT_MAX PY_LLONG_MAX
 
-/* In the NT API, the timeout is a DWORD and is expressed in milliseconds */
-#if defined (NT_THREADS)
-#if 0xFFFFFFFFLL * 1000 < PY_TIMEOUT_MAX
-#undef PY_TIMEOUT_MAX
-#define PY_TIMEOUT_MAX (0xFFFFFFFFLL * 1000)
-#endif
+#if defined(_POSIX_THREADS)
+   /* PyThread_acquire_lock_timed() uses _PyTime_FromNanoseconds(us * 1000),
+      convert microseconds to nanoseconds. */
+#  define PY_TIMEOUT_MAX (PY_LLONG_MAX / 1000)
+#elif defined (NT_THREADS)
+   /* In the NT API, the timeout is a DWORD and is expressed in milliseconds */
+#  if 0xFFFFFFFFLL * 1000 < PY_LLONG_MAX
+#    define PY_TIMEOUT_MAX (0xFFFFFFFFLL * 1000)
+#  else
+#    define PY_TIMEOUT_MAX PY_LLONG_MAX
+#  endif
+#else
+#  define PY_TIMEOUT_MAX PY_LLONG_MAX
 #endif
 
+
 /* If microseconds == 0, the call is non-blocking: it returns immediately
    even when the lock can't be acquired.
    If microseconds > 0, the call waits up to the specified duration.
diff --git a/Misc/NEWS.d/next/Library/2017-10-24-12-00-16.bpo-30768.Om8Yj_.rst b/Misc/NEWS.d/next/Library/2017-10-24-12-00-16.bpo-30768.Om8Yj_.rst
new file mode 100644
index 00000000000..77bff97a7ee
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-24-12-00-16.bpo-30768.Om8Yj_.rst
@@ -0,0 +1,3 @@
+Fix the pthread+semaphore implementation of PyThread_acquire_lock_timed() when
+called with timeout > 0 and intr_flag=0: recompute the timeout if
+sem_timedwait() is interrupted by a signal (EINTR). See also the :pep:`475`.
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index 72df78f9ccc..99611eebcb7 100644
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -1363,9 +1363,11 @@ PyInit__thread(void)
     if (m == NULL)
         return NULL;
 
-    timeout_max = PY_TIMEOUT_MAX / 1000000;
-    time_max = floor(_PyTime_AsSecondsDouble(_PyTime_MAX));
+    timeout_max = (double)PY_TIMEOUT_MAX * 1e-6;
+    time_max = _PyTime_AsSecondsDouble(_PyTime_MAX);
     timeout_max = Py_MIN(timeout_max, time_max);
+    /* Round towards minus infinity */
+    timeout_max = floor(timeout_max);
 
     v = PyFloat_FromDouble(timeout_max);
     if (!v)
diff --git a/Modules/_winapi.c b/Modules/_winapi.c
index 00a26d515e0..7e8d4e38464 100644
--- a/Modules/_winapi.c
+++ b/Modules/_winapi.c
@@ -61,8 +61,6 @@
 
 #define T_HANDLE T_POINTER
 
-#define DWORD_MAX 4294967295U
-
 /* Grab CancelIoEx dynamically from kernel32 */
 static int has_CancelIoEx = -1;
 static BOOL (CALLBACK *Py_CancelIoEx)(HANDLE, LPOVERLAPPED);
@@ -184,11 +182,11 @@ class DWORD_return_converter(CReturnConverter):
 
     def render(self, function, data):
         self.declare(data)
-        self.err_occurred_if("_return_value == DWORD_MAX", data)
+        self.err_occurred_if("_return_value == PY_DWORD_MAX", data)
         data.return_conversion.append(
             'return_value = Py_BuildValue("k", _return_value);\n')
 [python start generated code]*/
-/*[python end generated code: output=da39a3ee5e6b4b0d input=94819e72d2c6d558]*/
+/*[python end generated code: output=da39a3ee5e6b4b0d input=4527052fe06e5823]*/
 
 #include "clinic/_winapi.c.h"
 
@@ -1009,7 +1007,7 @@ _winapi_GetExitCodeProcess_impl(PyObject *module, HANDLE process)
 
     if (! result) {
         PyErr_SetFromWindowsErr(GetLastError());
-        exit_code = DWORD_MAX;
+        exit_code = PY_DWORD_MAX;
     }
 
     return exit_code;
@@ -1466,7 +1464,7 @@ _winapi_WriteFile_impl(PyObject *module, HANDLE handle, PyObject *buffer,
     }
 
     Py_BEGIN_ALLOW_THREADS
-    len = (DWORD)Py_MIN(buf->len, DWORD_MAX);
+    len = (DWORD)Py_MIN(buf->len, PY_DWORD_MAX);
     ret = WriteFile(handle, buf->buf, len, &written,
                     overlapped ? &overlapped->overlapped : NULL);
     Py_END_ALLOW_THREADS
diff --git a/Modules/clinic/_winapi.c.h b/Modules/clinic/_winapi.c.h
index 9e1fbe1fdb0..01bba360714 100644
--- a/Modules/clinic/_winapi.c.h
+++ b/Modules/clinic/_winapi.c.h
@@ -460,7 +460,7 @@ _winapi_GetExitCodeProcess(PyObject *module, PyObject *arg)
         goto exit;
     }
     _return_value = _winapi_GetExitCodeProcess_impl(module, process);
-    if ((_return_value == DWORD_MAX) && PyErr_Occurred()) {
+    if ((_return_value == PY_DWORD_MAX) && PyErr_Occurred()) {
         goto exit;
     }
     return_value = Py_BuildValue("k", _return_value);
@@ -487,7 +487,7 @@ _winapi_GetLastError(PyObject *module, PyObject *Py_UNUSED(ignored))
     DWORD _return_value;
 
     _return_value = _winapi_GetLastError_impl(module);
-    if ((_return_value == DWORD_MAX) && PyErr_Occurred()) {
+    if ((_return_value == PY_DWORD_MAX) && PyErr_Occurred()) {
         goto exit;
     }
     return_value = Py_BuildValue("k", _return_value);
@@ -889,4 +889,4 @@ _winapi_WriteFile(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=afa6bd61eb0f18d2 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=fba2ad7bf1a87e4a input=a9049054013a1b77]*/
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index c7d8b00e6f9..661fa1312ad 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -390,8 +390,6 @@ static int win32_can_symlink = 0;
 #endif
 #endif
 
-#define DWORD_MAX 4294967295U
-
 #ifdef MS_WINDOWS
 #define INITFUNC PyInit_nt
 #define MODNAME "nt"
@@ -3817,7 +3815,7 @@ os__getvolumepathname_impl(PyObject *module, PyObject *path)
     /* Volume path should be shorter than entire path */
     buflen = Py_MAX(buflen, MAX_PATH);
 
-    if (buflen > DWORD_MAX) {
+    if (buflen > PY_DWORD_MAX) {
         PyErr_SetString(PyExc_OverflowError, "path too long");
         return NULL;
     }
diff --git a/Python/thread_nt.h b/Python/thread_nt.h
index bae8bcc3566..46df3466928 100644
--- a/Python/thread_nt.h
+++ b/Python/thread_nt.h
@@ -283,12 +283,13 @@ PyThread_acquire_lock_timed(PyThread_type_lock aLock,
         milliseconds = microseconds / 1000;
         if (microseconds % 1000 > 0)
             ++milliseconds;
-        if ((DWORD) milliseconds != milliseconds)
-            Py_FatalError("Timeout too large for a DWORD, "
-                           "please check PY_TIMEOUT_MAX");
+        if (milliseconds > PY_DWORD_MAX) {
+            Py_FatalError("Timeout larger than PY_TIMEOUT_MAX");
+        }
     }
-    else
+    else {
         milliseconds = INFINITE;
+    }
 
     dprintf(("%lu: PyThread_acquire_lock_timed(%p, %lld) called\n",
              PyThread_get_thread_ident(), aLock, microseconds));
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
index c5b7f3256fa..13cffa3bf3e 100644
--- a/Python/thread_pthread.h
+++ b/Python/thread_pthread.h
@@ -318,23 +318,66 @@ PyThread_acquire_lock_timed(PyThread_type_lock lock, PY_TIMEOUT_T microseconds,
     sem_t *thelock = (sem_t *)lock;
     int status, error = 0;
     struct timespec ts;
+    _PyTime_t deadline = 0;
 
     (void) error; /* silence unused-but-set-variable warning */
     dprintf(("PyThread_acquire_lock_timed(%p, %lld, %d) called\n",
              lock, microseconds, intr_flag));
 
-    if (microseconds > 0)
+    if (microseconds > PY_TIMEOUT_MAX) {
+        Py_FatalError("Timeout larger than PY_TIMEOUT_MAX");
+    }
+
+    if (microseconds > 0) {
         MICROSECONDS_TO_TIMESPEC(microseconds, ts);
-    do {
-        if (microseconds > 0)
+
+        if (!intr_flag) {
+            /* cannot overflow thanks to (microseconds > PY_TIMEOUT_MAX)
+               check done above */
+            _PyTime_t timeout = _PyTime_FromNanoseconds(microseconds * 1000);
+            deadline = _PyTime_GetMonotonicClock() + timeout;
+        }
+    }
+
+    while (1) {
+        if (microseconds > 0) {
             status = fix_status(sem_timedwait(thelock, &ts));
-        else if (microseconds == 0)
+        }
+        else if (microseconds == 0) {
             status = fix_status(sem_trywait(thelock));
-        else
+        }
+        else {
             status = fix_status(sem_wait(thelock));
+        }
+
         /* Retry if interrupted by a signal, unless the caller wants to be
            notified.  */
-    } while (!intr_flag && status == EINTR);
+        if (intr_flag || status != EINTR) {
+            break;
+        }
+
+        if (microseconds > 0) {
+            /* wait interrupted by a signal (EINTR): recompute the timeout */
+            _PyTime_t dt = deadline - _PyTime_GetMonotonicClock();
+            if (dt < 0) {
+                status = ETIMEDOUT;
+                break;
+            }
+            else if (dt > 0) {
+                _PyTime_t realtime_deadline = _PyTime_GetSystemClock() + dt;
+                if (_PyTime_AsTimespec(realtime_deadline, &ts) < 0) {
+                    /* Cannot occur thanks to (microseconds > PY_TIMEOUT_MAX)
+                       check done above */
+                    Py_UNREACHABLE();
+                }
+                /* no need to update microseconds value, the code only care
+                   if (microseconds > 0 or (microseconds == 0). */
+            }
+            else {
+                microseconds = 0;
+            }
+        }
+    }
 
     /* Don't check the status if we're stopping because of an interrupt.  */
     if (!(intr_flag && status == EINTR)) {


From lp_benchmark_robot at intel.com  Tue Oct 24 20:08:54 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Tue, 24 Oct 2017 17:08:54 -0700
Subject: [Python-checkins] [3 up,
 62 flat] Results for Python (master branch) 2017-10-24
Message-ID: <e64be526-c5ff-4d98-9ffb-ffe009b7e6c4@orsmsx103.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-24 03:02:44-07:00.
  - commit:		809d173
  - previous commit:	4ffd465
  - revision date:	2017-10-24 02:22:22-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.946% |  +0.751%   |  +5.449%   |  +6.511%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.261% |  -1.839%   |  +19.502%  |  +14.881%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 1.058% |  +0.941%   |  +21.821%  |  +12.921%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.851% |  -1.710%   |  +19.068%  |  +13.484%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.353% |  +2.473%   |  +8.488%   |  +8.643%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.755% |  +0.609%   |  +11.302%  |  +9.475%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.880% |  -1.409%   |  +7.415%   |  +11.424%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.660% |  +0.107%   |  +3.817%   |  +6.016%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.846% |  +1.368%   |  +8.781%   |  +17.656%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 4.199% |  +1.514%   |  +10.614%  |  +9.331%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.219% |  -0.022%   |  +5.210%   |  +5.978%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.571% |  +0.223%   |  +6.122%   |  +3.534%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.800% |  +0.143%   |  +3.890%   |  +5.781%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.184% |  +0.146%   |  +13.529%  |  +8.054%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.397% |  -0.270%   |  +8.612%   |  +8.785%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.975% |  -0.786%   |  +6.763%   |  +11.550%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.444% |  -0.065%   |  +10.280%  |  +11.910%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 2.593% |  -1.731%   |  +7.920%   |  +10.668%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 2.365% |  +0.554%   |  +3.607%   |  +8.638%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 1.072% |  +2.825%   |  -1.128%   |  +12.780%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.211% |  -1.802%   |  +7.224%   |  +12.808%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.458% |  +1.333%   |  +47.171%  |  +12.217%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.331% |  -2.101%   |  +7.924%   |  +14.018%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.747% |  -1.153%   |  +17.252%  |  +12.334%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 2.204% |  +1.171%   |  +9.834%   |  +8.977%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.933% |  -0.537%   |  +3.357%   |  +5.972%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.600% |  -0.293%   |  -1.320%   |  +3.969%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 1.053% |  -1.147%   |  +5.544%   |  +7.882%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.192% |  +0.997%   |  +8.352%   |  +6.835%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.573% |  +0.251%   |  +0.580%   |  +21.569%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.320% |  -0.939%   |  -0.247%   |  +25.963%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 4.350% |  -0.604%   |  +3.558%   |  +19.795%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 6.437% |  -1.709%   |  +11.031%  |  +10.065%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.211% |  -0.114%   |  +0.207%   |  +9.656%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.126% |  -0.071%   |  +11.108%  |  +4.932%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.094% |  -0.083%   |  +2.399%   |  +5.169%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 2.028% |  -1.528%   |  +9.738%   |  +13.372%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.316% |  -0.957%   |  +1.453%   |  +7.970%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |               regex_dna| 0.711% |  +3.335%   |  +1.812%   |  +8.721%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.500% |  +2.149%   |  -0.073%   |  +2.919%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.502% |  -0.829%   |  +9.785%   |  +4.356%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.143% |  +0.330%   |  +9.341%   |  +13.514%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.515% |  +0.700%   |  +2.186%   |  +2.302%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 2.022% |  -1.273%   |  +26.670%  |  +8.472%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.962% |  +0.688%   |  +5.338%   |  +5.873%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.450% |  +0.362%   |  +14.526%  |  +9.541%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) | scimark_sparse_mat_mult| 0.545% |  +3.265%   |  +5.538%   |  -7.256%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |           spectral_norm| 0.978% |  +5.752%   |  +8.051%   |  +0.707%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 0.874% |  -0.469%   |  +6.656%   |  +5.757%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.914% |  -0.267%   |  +7.531%   |  +2.623%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 3.574% |  -0.268%   |  +19.673%  |  +6.634%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.284% |  +0.805%   |  +12.961%  |  +6.783%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 2.012% |  -1.005%   |  +9.741%   |  +6.578%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.670% |  -0.640%   |  +11.192%  |  +8.725%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.824% |  +0.295%   |  +12.222%  |  +9.295%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 4.192% |  -1.253%   |  +23.034%  |  +11.975%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.100% |  -1.101%   |  +5.825%   |  +5.515%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 0.805% |  -0.110%   |  +2.424%   |  -1.549%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 6.169% |  +0.748%   |  +11.900%  |  +16.947%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.821% |  -0.852%   |  +1.120%   |  +16.243%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 1.221% |  -0.445%   |  +7.626%   |  +7.051%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.133% |  +2.034%   |  +6.741%   |  +7.319%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.464% |  +1.652%   |  +4.089%   |  +5.173%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 4.226% |  +0.594%   |  -5.757%   |  +11.375%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.389% |  +1.812%   |  +7.785%   |  +7.827%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/3-up-62-flat-results-for-python-master-branch-2017-10-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  Tue Oct 24 22:11:35 2017
From: webhook-mailer at python.org (Nick Coghlan)
Date: Wed, 25 Oct 2017 02:11:35 -0000
Subject: [Python-checkins] bpo-31845: Fix reading flags from environment
 (GH-4105)
Message-ID: <mailman.38.1508897498.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/d7ac06126db86f76ba92cbca4cb702852a321f78
commit: d7ac06126db86f76ba92cbca4cb702852a321f78
branch: master
author: Nick Coghlan <ncoghlan at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-25T12:11:26+10:00
summary:

bpo-31845: Fix reading flags from environment (GH-4105)

The startup refactoring means command line settings
are now applied after settings are read from the
environment.

This updates the way command line settings are applied
to account for that, ensures more settings are first read
from the environment in _PyInitializeCore, and adds a
simple test case covering the flags that are easy to check.

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-24-21-27-32.bpo-31845.8OS-k3.rst
M Lib/test/test_cmd_line.py
M Modules/main.c
M Python/pylifecycle.c

diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 28ddb2ba1bf..1b584ebb7c5 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -12,7 +12,6 @@
     spawn_python, kill_python, assert_python_ok, assert_python_failure
 )
 
-
 # XXX (ncoghlan): Move to script_helper and make consistent with run_python
 def _kill_python_and_exit_code(p):
     data = kill_python(p)
@@ -486,6 +485,26 @@ def test_isolatedmode(self):
                                           cwd=tmpdir)
             self.assertEqual(out.strip(), b"ok")
 
+    def test_sys_flags_set(self):
+        # Issue 31845: a startup refactoring broke reading flags from env vars
+        for value, expected in (("", 0), ("1", 1), ("text", 1), ("2", 2)):
+            env_vars = dict(
+                PYTHONDEBUG=value,
+                PYTHONOPTIMIZE=value,
+                PYTHONDONTWRITEBYTECODE=value,
+                PYTHONVERBOSE=value,
+            )
+            code = (
+                "import sys; "
+                "sys.stderr.write(str(sys.flags)); "
+                f"""sys.exit(not (
+                    sys.flags.debug == sys.flags.optimize ==
+                    sys.flags.dont_write_bytecode == sys.flags.verbose ==
+                    {expected}
+                ))"""
+            )
+            with self.subTest(envar_value=value):
+                assert_python_ok('-c', code, **env_vars)
 
 class IgnoreEnvironmentTest(unittest.TestCase):
 
@@ -506,6 +525,20 @@ def test_ignore_PYTHONHASHSEED(self):
         self.run_ignoring_vars("sys.flags.hash_randomization == 1",
                                PYTHONHASHSEED="0")
 
+    def test_sys_flags_not_set(self):
+        # Issue 31845: a startup refactoring broke reading flags from env vars
+        expected_outcome = """
+            (sys.flags.debug == sys.flags.optimize ==
+             sys.flags.dont_write_bytecode == sys.flags.verbose == 0)
+        """
+        self.run_ignoring_vars(
+            expected_outcome,
+            PYTHONDEBUG="1",
+            PYTHONOPTIMIZE="1",
+            PYTHONDONTWRITEBYTECODE="1",
+            PYTHONVERBOSE="1",
+        )
+
 
 def test_main():
     test.support.run_unittest(CmdLineTest, IgnoreEnvironmentTest)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-24-21-27-32.bpo-31845.8OS-k3.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-24-21-27-32.bpo-31845.8OS-k3.rst
new file mode 100644
index 00000000000..ddaf6306386
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-24-21-27-32.bpo-31845.8OS-k3.rst	
@@ -0,0 +1 @@
+Environment variables are once more read correctly at interpreter startup.
diff --git a/Modules/main.c b/Modules/main.c
index e8621133104..846ecb6170d 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -522,39 +522,33 @@ read_command_line(int argc, wchar_t **argv, _Py_CommandLineDetails *cmdline)
     return 0;
 }
 
-static int
-apply_command_line_and_environment(_Py_CommandLineDetails *cmdline)
+static void
+maybe_set_flag(int *flag, int value)
 {
-    char *p;
-    Py_BytesWarningFlag = cmdline->bytes_warning;
-    Py_DebugFlag = cmdline->debug;
-    Py_InspectFlag = cmdline->inspect;
-    Py_InteractiveFlag = cmdline->interactive;
-    Py_IsolatedFlag = cmdline->isolated;
-    Py_OptimizeFlag = cmdline->optimization_level;
-    Py_DontWriteBytecodeFlag = cmdline->dont_write_bytecode;
-    Py_NoUserSiteDirectory = cmdline->no_user_site_directory;
-    Py_NoSiteFlag = cmdline->no_site_import;
-    Py_UnbufferedStdioFlag = cmdline->use_unbuffered_io;
-    Py_VerboseFlag = cmdline->verbosity;
-    Py_QuietFlag = cmdline->quiet_flag;
-
-    if (!Py_InspectFlag &&
-        (p = Py_GETENV("PYTHONINSPECT")) && *p != '\0') {
-        Py_InspectFlag = 1;
-        cmdline->inspect = 1;
-    }
-    if (!cmdline->use_unbuffered_io &&
-        (p = Py_GETENV("PYTHONUNBUFFERED")) && *p != '\0') {
-        Py_UnbufferedStdioFlag = 1;
-        cmdline->use_unbuffered_io = 1;
+    /* Helper to set flag variables from command line options
+    *   - uses the higher of the two values if they're both set
+    *   - otherwise leaves the flag unset
+    */
+    if (*flag < value) {
+        *flag = value;
     }
+}
 
-    if (!Py_NoUserSiteDirectory &&
-        (p = Py_GETENV("PYTHONNOUSERSITE")) && *p != '\0') {
-        Py_NoUserSiteDirectory = 1;
-        cmdline->no_user_site_directory = 1;
-    }
+static int
+apply_command_line_and_environment(_Py_CommandLineDetails *cmdline)
+{
+    maybe_set_flag(&Py_BytesWarningFlag, cmdline->bytes_warning);
+    maybe_set_flag(&Py_DebugFlag, cmdline->debug);
+    maybe_set_flag(&Py_InspectFlag, cmdline->inspect);
+    maybe_set_flag(&Py_InteractiveFlag, cmdline->interactive);
+    maybe_set_flag(&Py_IsolatedFlag, cmdline->isolated);
+    maybe_set_flag(&Py_OptimizeFlag, cmdline->optimization_level);
+    maybe_set_flag(&Py_DontWriteBytecodeFlag, cmdline->dont_write_bytecode);
+    maybe_set_flag(&Py_NoUserSiteDirectory, cmdline->no_user_site_directory);
+    maybe_set_flag(&Py_NoSiteFlag, cmdline->no_site_import);
+    maybe_set_flag(&Py_UnbufferedStdioFlag, cmdline->use_unbuffered_io);
+    maybe_set_flag(&Py_VerboseFlag, cmdline->verbosity);
+    maybe_set_flag(&Py_QuietFlag, cmdline->quiet_flag);
 
     /* TODO: Apply PYTHONWARNINGS & -W options to sys module here */
     /* TODO: Apply -X options to sys module here */
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 5b13bc45822..4e8bbb662e9 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -217,15 +217,18 @@ Py_SetStandardStreamEncoding(const char *encoding, const char *errors)
 
 */
 
-static int
-add_flag(int flag, const char *envs)
+static void
+set_flag(int *flag, const char *envs)
 {
+    /* Helper to set flag variables from environment variables:
+    *   - uses the higher of the two values if they're both set
+    *   - otherwise sets the flag to 1
+    */
     int env = atoi(envs);
-    if (flag < env)
-        flag = env;
-    if (flag < 1)
-        flag = 1;
-    return flag;
+    if (*flag < env)
+        *flag = env;
+    if (*flag < 1)
+        *flag = 1;
 }
 
 static char*
@@ -612,22 +615,28 @@ void _Py_InitializeCore(const _PyCoreConfig *config)
 #endif
 
     if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0')
-        Py_DebugFlag = add_flag(Py_DebugFlag, p);
+        set_flag(&Py_DebugFlag, p);
     if ((p = Py_GETENV("PYTHONVERBOSE")) && *p != '\0')
-        Py_VerboseFlag = add_flag(Py_VerboseFlag, p);
+        set_flag(&Py_VerboseFlag, p);
     if ((p = Py_GETENV("PYTHONOPTIMIZE")) && *p != '\0')
-        Py_OptimizeFlag = add_flag(Py_OptimizeFlag, p);
+        set_flag(&Py_OptimizeFlag, p);
+    if ((p = Py_GETENV("PYTHONINSPECT")) && *p != '\0')
+        set_flag(&Py_InspectFlag, p);
     if ((p = Py_GETENV("PYTHONDONTWRITEBYTECODE")) && *p != '\0')
-        Py_DontWriteBytecodeFlag = add_flag(Py_DontWriteBytecodeFlag, p);
+        set_flag(&Py_DontWriteBytecodeFlag, p);
+    if ((p = Py_GETENV("PYTHONNOUSERSITE")) && *p != '\0')
+        set_flag(&Py_NoUserSiteDirectory, p);
+    if ((p = Py_GETENV("PYTHONUNBUFFERED")) && *p != '\0')
+        set_flag(&Py_UnbufferedStdioFlag, p);
     /* The variable is only tested for existence here;
        _Py_HashRandomization_Init will check its value further. */
     if ((p = Py_GETENV("PYTHONHASHSEED")) && *p != '\0')
-        Py_HashRandomizationFlag = add_flag(Py_HashRandomizationFlag, p);
+        set_flag(&Py_HashRandomizationFlag, p);
 #ifdef MS_WINDOWS
     if ((p = Py_GETENV("PYTHONLEGACYWINDOWSFSENCODING")) && *p != '\0')
-        Py_LegacyWindowsFSEncodingFlag = add_flag(Py_LegacyWindowsFSEncodingFlag, p);
+        set_flag(&Py_LegacyWindowsFSEncodingFlag, p);
     if ((p = Py_GETENV("PYTHONLEGACYWINDOWSSTDIO")) && *p != '\0')
-        Py_LegacyWindowsStdioFlag = add_flag(Py_LegacyWindowsStdioFlag, p);
+        set_flag(&Py_LegacyWindowsStdioFlag, p);
 #endif
 
     _Py_HashRandomization_Init(&core_config);


From webhook-mailer at python.org  Wed Oct 25 01:35:18 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Wed, 25 Oct 2017 05:35:18 -0000
Subject: [Python-checkins] remove support for splitting the ceval switch
 into multiple switches (#4099)
Message-ID: <mailman.39.1508909720.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/95f1a7bb09db03ae239c8cbf43e8890ab12fd782
commit: 95f1a7bb09db03ae239c8cbf43e8890ab12fd782
branch: master
author: Benjamin Peterson <benjamin at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-24T22:35:15-07:00
summary:

remove support for splitting the ceval switch into multiple switches (#4099)

This kludge is from 1992. Any C99 compiler is going to be able to handle the
ceval dispatch switch.

Anyway, we have much bigger switches than the ceval dispatch one around. (See,
e.g., Objects/unicodetype_db.h.)

files:
M Python/ceval.c

diff --git a/Python/ceval.c b/Python/ceval.c
index f9a798c8565..58a2513b3ef 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -22,9 +22,6 @@
 
 #include <ctype.h>
 
-/* Turn this on if your compiler chokes on the big switch: */
-/* #define CASE_TOO_BIG 1 */
-
 #ifdef Py_DEBUG
 /* For debugging the interpreter: */
 #define LLTRACE  1      /* Low-level trace feature */
@@ -1662,9 +1659,6 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
             DISPATCH();
         }
 
-#ifdef CASE_TOO_BIG
-        default: switch (opcode) {
-#endif
         TARGET(RAISE_VARARGS) {
             PyObject *cause = NULL, *exc = NULL;
             switch (oparg) {
@@ -3373,10 +3367,6 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
             PyErr_SetString(PyExc_SystemError, "unknown opcode");
             goto error;
 
-#ifdef CASE_TOO_BIG
-        }
-#endif
-
         } /* switch */
 
         /* This should never be reached. Every opcode should end with DISPATCH()


From webhook-mailer at python.org  Wed Oct 25 02:09:58 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Wed, 25 Oct 2017 06:09:58 -0000
Subject: [Python-checkins] fix marshal uninitialized variable warnings
 (#4114)
Message-ID: <mailman.40.1508911799.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/88d5e2c938b014885044f1cfd016e62798f07fd2
commit: 88d5e2c938b014885044f1cfd016e62798f07fd2
branch: 2.7
author: Benjamin Peterson <benjamin at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-24T23:09:55-07:00
summary:

fix marshal uninitialized variable warnings (#4114)

GCC says:
../cpython/Python/marshal.c: In function ?PyMarshal_WriteLongToFile?:
../cpython/Python/marshal.c:70:35: warning: ?wf.ptr? may be used uninitialized in this function [-Wmaybe-uninitialized]
                       else if ((p)->ptr != (p)->end) *(p)->ptr++ = (c); \
                                   ^~
../cpython/Python/marshal.c:70:47: warning: ?wf.end? may be used uninitialized in this function [-Wmaybe-uninitialized]
                       else if ((p)->ptr != (p)->end) *(p)->ptr++ = (c); \
                                               ^~
../cpython/Python/marshal.c:77:10: warning: ?wf.str? may be used uninitialized in this function [-Wmaybe-uninitialized]
     if (p->str == NULL)
         ~^~~~~

This isn't a real problem because if the file pointer is not NULL, the
string-related fields are never touched. But, it doesn't hurt to set the unused
fields to NULL.

files:
M Python/marshal.c

diff --git a/Python/marshal.c b/Python/marshal.c
index e1a84d0bf71..f55599bdb08 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -465,6 +465,9 @@ PyMarshal_WriteLongToFile(long x, FILE *fp, int version)
 {
     WFILE wf;
     wf.fp = fp;
+    wf.str = NULL;
+    wf.ptr = NULL;
+    wf.end = NULL;
     wf.error = WFERR_OK;
     wf.depth = 0;
     wf.strings = NULL;
@@ -477,6 +480,9 @@ PyMarshal_WriteObjectToFile(PyObject *x, FILE *fp, int version)
 {
     WFILE wf;
     wf.fp = fp;
+    wf.str = NULL;
+    wf.ptr = NULL;
+    wf.end = NULL;
     wf.error = WFERR_OK;
     wf.depth = 0;
     wf.strings = (version > 0) ? PyDict_New() : NULL;


From solipsis at pitrou.net  Wed Oct 25 05:06:42 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 25 Oct 2017 09:06:42 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=0
Message-ID: <20171025090636.112181.3CFE7FE9D5CFEBDE@psf.io>

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

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


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

From webhook-mailer at python.org  Wed Oct 25 08:26:20 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 25 Oct 2017 12:26:20 -0000
Subject: [Python-checkins] bpo-31835: Optimize also FASTCALL using
 __future__ (#4087)
Message-ID: <mailman.41.1508934383.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/086c3ae5f0995a62092b9080f32dd118c2923453
commit: 086c3ae5f0995a62092b9080f32dd118c2923453
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-25T05:26:17-07:00
summary:

bpo-31835: Optimize also FASTCALL using __future__ (#4087)

_PyFunction_FastCallDict() and _PyFunction_FastCallKeywords() now
also takes the fast path if the code object uses __future__
(CO_FUTURE_xxx flags).

files:
M Objects/call.c

diff --git a/Objects/call.c b/Objects/call.c
index 91e60783117..7b46dbc822e 100644
--- a/Objects/call.c
+++ b/Objects/call.c
@@ -315,7 +315,7 @@ _PyFunction_FastCallDict(PyObject *func, PyObject **args, Py_ssize_t nargs,
 
     if (co->co_kwonlyargcount == 0 &&
         (kwargs == NULL || PyDict_GET_SIZE(kwargs) == 0) &&
-        co->co_flags == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE))
+        (co->co_flags & ~PyCF_MASK) == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE))
     {
         /* Fast paths */
         if (argdefs == NULL && co->co_argcount == nargs) {
@@ -402,7 +402,7 @@ _PyFunction_FastCallKeywords(PyObject *func, PyObject **stack,
        be unique */
 
     if (co->co_kwonlyargcount == 0 && nkwargs == 0 &&
-        co->co_flags == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE))
+        (co->co_flags & ~PyCF_MASK) == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE))
     {
         if (argdefs == NULL && co->co_argcount == nargs) {
             return function_code_fastcall(co, stack, nargs, globals);


From webhook-mailer at python.org  Wed Oct 25 09:30:19 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 25 Oct 2017 13:30:19 -0000
Subject: [Python-checkins] bpo-31664: Fix test_crypt for the openwall
 implementation of crypt. (#4116)
Message-ID: <mailman.42.1508938225.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/0f261583bae7e60e410709ed96398dd1b14c5454
commit: 0f261583bae7e60e410709ed96398dd1b14c5454
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-25T16:30:13+03:00
summary:

bpo-31664: Fix test_crypt for the openwall implementation of crypt. (#4116)

files:
M Lib/test/test_crypt.py

diff --git a/Lib/test/test_crypt.py b/Lib/test/test_crypt.py
index 8db1aefdf1e..796fd076c6a 100644
--- a/Lib/test/test_crypt.py
+++ b/Lib/test/test_crypt.py
@@ -57,7 +57,13 @@ def test_log_rounds(self):
     def test_invalid_log_rounds(self):
         for log_rounds in (1, -1, 999):
             salt = crypt.mksalt(crypt.METHOD_BLOWFISH, log_rounds=log_rounds)
-            self.assertIsNone(crypt.crypt('mypassword', salt))
+            cr = crypt.crypt('mypassword', salt)
+            if cr is not None:
+                # On failure the openwall implementation returns a magic
+                # string that is shorter than 13 characters and is guaranteed
+                # to differ from a salt.
+                self.assertNotEqual(cr, salt)
+                self.assertLess(len(cr), 13)
 
 
 if __name__ == "__main__":


From webhook-mailer at python.org  Wed Oct 25 17:28:08 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Wed, 25 Oct 2017 21:28:08 -0000
Subject: [Python-checkins] bpo-30855: Fix winfo_id related Tkinter test on
 Windows. (#4121)
Message-ID: <mailman.43.1508966891.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/7c622be4f2e86c1999baba4f64671a5987d43d73
commit: 7c622be4f2e86c1999baba4f64671a5987d43d73
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-26T00:28:02+03:00
summary:

bpo-30855: Fix winfo_id related Tkinter test on Windows. (#4121)

files:
M Lib/lib-tk/test/test_tkinter/test_widgets.py

diff --git a/Lib/lib-tk/test/test_tkinter/test_widgets.py b/Lib/lib-tk/test/test_tkinter/test_widgets.py
index 1c4c4f3f6e3..1f60204d4a0 100644
--- a/Lib/lib-tk/test/test_tkinter/test_widgets.py
+++ b/Lib/lib-tk/test/test_tkinter/test_widgets.py
@@ -88,7 +88,8 @@ def test_use(self):
         widget = self.create()
         self.assertEqual(widget['use'], '')
         parent = self.create(container=True)
-        wid = hex(parent.winfo_id())
+        # hex() adds the 'L' suffix for longs
+        wid = '%#x' % parent.winfo_id()
         widget2 = self.create(use=wid)
         self.assertEqual(widget2['use'], wid)
 


From lp_benchmark_robot at intel.com  Wed Oct 25 19:36:25 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Wed, 25 Oct 2017 16:36:25 -0700
Subject: [Python-checkins] [1 down,
 64 flat] Results for Python (master branch) 2017-10-25
Message-ID: <83cf6b41-4f08-4452-981b-7a81238231d5@orsmsx156.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-25 03:02:48-07:00.
  - commit:		95f1a7b
  - previous commit:	809d173
  - revision date:	2017-10-24 22:35:15-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.260% |  +0.269%   |  +5.704%   |  +6.896%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.081% |  +1.956%   |  +21.077%  |  +12.706%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 2.023% |  +0.136%   |  +21.927%  |  +13.129%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 1.258% |  +2.117%   |  +20.782%  |  +8.331%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.546% |  +1.184%   |  +9.571%   |  +9.006%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.874% |  -0.323%   |  +11.015%  |  +10.683%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 1.620% |  +0.077%   |  +7.486%   |  +10.096%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.449% |  -0.379%   |  +3.452%   |  +5.009%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 4.189% |  -3.157%   |  +5.901%   |  +21.258%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 7.110% |  -1.529%   |  +9.247%   |  +14.285%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.290% |  -0.072%   |  +5.142%   |  +6.861%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.856% |  -1.419%   |  +4.790%   |  +6.153%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.757% |  -0.707%   |  +3.211%   |  +6.378%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.134% |  -0.062%   |  +13.475%  |  +9.035%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.106% |  +0.651%   |  +9.208%   |  +9.437%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.810% |  -0.806%   |  +6.012%   |  +11.741%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.629% |  +0.312%   |  +10.560%  |  +11.058%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 2.430% |  +3.246%   |  +10.908%  |  +7.148%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.673% |  -0.307%   |  +3.311%   |  +9.164%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 1.577% |  +1.272%   |  +0.159%   |  +13.044%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.582% |  +2.914%   |  +9.927%   |  +11.705%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.750% |  +0.003%   |  +47.173%  |  +12.661%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.548% |  +2.975%   |  +10.663%  |  +12.621%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.481% |  +0.031%   |  +17.277%  |  +12.315%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 2.119% |  -0.838%   |  +9.078%   |  +9.721%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.658% |  +0.468%   |  +3.809%   |  +5.102%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 1.715% |  +1.405%   |  +0.104%   |  +0.921%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.663% |  +0.167%   |  +5.701%   |  +6.475%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.946% |  -1.098%   |  +7.345%   |  +8.386%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 2.935% |  -2.509%   |  -1.915%   |  +22.291%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.419% |  -0.040%   |  -0.287%   |  +20.089%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.979% |  +1.297%   |  +4.808%   |  +14.938%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.033% |  +0.884%   |  +11.818%  |  +9.607%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.149% |  -0.063%   |  +0.144%   |  +10.561%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.123% |  +0.142%   |  +11.234%  |  +4.904%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.088% |  +0.151%   |  +2.546%   |  +4.998%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 0.894% |  +1.486%   |  +11.079%  |  +12.179%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.602% |  +2.167%   |  +3.588%   |  +9.667%   |
+-----+------------------------+--------+------------+------------+------------+
| :-( |               regex_dna| 0.907% |  -3.084%   |  -1.216%   |  +9.461%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.678% |  -0.898%   |  -0.971%   |  -0.800%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.830% |  -4.303%   |  +5.904%   |  +5.165%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.145% |  -0.468%   |  +8.917%   |  +14.191%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 1.225% |  -2.064%   |  +0.166%   |  +3.552%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.480% |  +0.934%   |  +27.355%  |  +8.102%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.619% |  +0.012%   |  +5.350%   |  +3.595%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 1.940% |  -0.393%   |  +14.190%  |  +9.292%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 2.261% |  -3.110%   |  +2.599%   |  -5.035%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 2.507% |  -3.116%   |  +5.186%   |  +1.354%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.638% |  +0.470%   |  +7.095%   |  +5.670%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.191% |  +0.017%   |  +7.547%   |  +3.454%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.052% |  -0.443%   |  +19.317%  |  +8.812%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 3.277% |  -1.497%   |  +11.658%  |  +8.547%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 2.482% |  -0.124%   |  +9.630%   |  +7.030%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.643% |  -0.453%   |  +10.790%  |  +10.046%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 4.880% |  -0.050%   |  +12.179%  |  +9.594%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 4.500% |  -0.189%   |  +22.889%  |  +10.538%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.188% |  +0.919%   |  +6.691%   |  +6.218%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.224% |  -0.319%   |  +2.113%   |  -0.559%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 6.155% |  -1.362%   |  +10.700%  |  +18.465%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 5.411% |  +0.537%   |  +1.651%   |  +18.542%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 3.089% |  +0.123%   |  +7.740%   |  +6.993%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.385% |  -0.008%   |  +6.733%   |  +7.117%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.409% |  -0.276%   |  +3.824%   |  +6.214%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 2.834% |  +0.461%   |  -5.269%   |  +10.756%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.044% |  -0.261%   |  +7.545%   |  +8.298%   |
+-----+------------------------+--------+------------+------------+------------+

* 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-10-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 webhook-mailer at python.org  Wed Oct 25 20:35:44 2017
From: webhook-mailer at python.org (Alexander Belopolsky)
Date: Thu, 26 Oct 2017 00:35:44 -0000
Subject: [Python-checkins] Closes bpo-31800: Support for colon when parsing
 time offsets (#4015)
Message-ID: <mailman.44.1508978144.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/32318930da70ff03320ec50813b843e7db6fbc2e
commit: 32318930da70ff03320ec50813b843e7db6fbc2e
branch: master
author: Mario Corchero <mariocj89 at gmail.com>
committer: Alexander Belopolsky <abalkin at users.noreply.github.com>
date: 2017-10-25T20:35:41-04:00
summary:

Closes bpo-31800: Support for colon when parsing time offsets (#4015)

Add support to strptime to parse time offsets with a colon between the hour and the minutes.

files:
A Misc/NEWS.d/next/Library/2017-10-17-20-08-19.bpo-31800.foOSCi.rst
M Doc/library/datetime.rst
M Lib/_strptime.py
M Lib/test/datetimetester.py
M Lib/test/test_strptime.py

diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index 55be8694a06..d032d283eb9 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -2174,6 +2174,13 @@ Notes:
    .. versionchanged:: 3.7
       The UTC offset is not restricted to a whole number of minutes.
 
+   .. versionchanged:: 3.7
+      When the ``%z`` directive is provided to the  :meth:`strptime` method,
+      the UTC offsets can have a colon as a separator between hours, minutes
+      and seconds.
+      For example, ``'+01:00:00'`` will be parsed as an offset of one hour.
+      In addition, providing ``'Z'`` is identical to ``'+00:00'``.
+
    ``%Z``
       If :meth:`tzname` returns ``None``, ``%Z`` is replaced by an empty
       string.  Otherwise ``%Z`` is replaced by the returned value, which must
diff --git a/Lib/_strptime.py b/Lib/_strptime.py
index 284175d0cfe..f5195af90c8 100644
--- a/Lib/_strptime.py
+++ b/Lib/_strptime.py
@@ -210,7 +210,7 @@ def __init__(self, locale_time=None):
             #XXX: Does 'Y' need to worry about having less or more than
             #     4 digits?
             'Y': r"(?P<Y>\d\d\d\d)",
-            'z': r"(?P<z>[+-]\d\d[0-5]\d)",
+            'z': r"(?P<z>[+-]\d\d:?[0-5]\d(:?[0-5]\d(\.\d{1,6})?)?|Z)",
             'A': self.__seqToRE(self.locale_time.f_weekday, 'A'),
             'a': self.__seqToRE(self.locale_time.a_weekday, 'a'),
             'B': self.__seqToRE(self.locale_time.f_month[1:], 'B'),
@@ -365,7 +365,8 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
     month = day = 1
     hour = minute = second = fraction = 0
     tz = -1
-    tzoffset = None
+    gmtoff = None
+    gmtoff_fraction = 0
     # Default to -1 to signify that values not known; not critical to have,
     # though
     iso_week = week_of_year = None
@@ -455,9 +456,24 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
             iso_week = int(found_dict['V'])
         elif group_key == 'z':
             z = found_dict['z']
-            tzoffset = int(z[1:3]) * 60 + int(z[3:5])
-            if z.startswith("-"):
-                tzoffset = -tzoffset
+            if z == 'Z':
+                gmtoff = 0
+            else:
+                if z[3] == ':':
+                    z = z[:3] + z[4:]
+                    if len(z) > 5:
+                        if z[5] != ':':
+                            msg = f"Unconsistent use of : in {found_dict['z']}"
+                            raise ValueError(msg)
+                        z = z[:5] + z[6:]
+                hours = int(z[1:3])
+                minutes = int(z[3:5])
+                seconds = int(z[5:7] or 0)
+                gmtoff = (hours * 60 * 60) + (minutes * 60) + seconds
+                gmtoff_fraction = int(z[8:] or 0)
+                if z.startswith("-"):
+                    gmtoff = -gmtoff
+                    gmtoff_fraction = -gmtoff_fraction
         elif group_key == 'Z':
             # Since -1 is default value only need to worry about setting tz if
             # it can be something other than -1.
@@ -535,10 +551,6 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
         weekday = datetime_date(year, month, day).weekday()
     # Add timezone info
     tzname = found_dict.get("Z")
-    if tzoffset is not None:
-        gmtoff = tzoffset * 60
-    else:
-        gmtoff = None
 
     if leap_year_fix:
         # the caller didn't supply a year but asked for Feb 29th. We couldn't
@@ -548,7 +560,7 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
 
     return (year, month, day,
             hour, minute, second,
-            weekday, julian, tz, tzname, gmtoff), fraction
+            weekday, julian, tz, tzname, gmtoff), fraction, gmtoff_fraction
 
 def _strptime_time(data_string, format="%a %b %d %H:%M:%S %Y"):
     """Return a time struct based on the input string and the
@@ -559,11 +571,11 @@ def _strptime_time(data_string, format="%a %b %d %H:%M:%S %Y"):
 def _strptime_datetime(cls, data_string, format="%a %b %d %H:%M:%S %Y"):
     """Return a class cls instance based on the input string and the
     format string."""
-    tt, fraction = _strptime(data_string, format)
+    tt, fraction, gmtoff_fraction = _strptime(data_string, format)
     tzname, gmtoff = tt[-2:]
     args = tt[:6] + (fraction,)
     if gmtoff is not None:
-        tzdelta = datetime_timedelta(seconds=gmtoff)
+        tzdelta = datetime_timedelta(seconds=gmtoff, microseconds=gmtoff_fraction)
         if tzname:
             tz = datetime_timezone(tzdelta, tzname)
         else:
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index 4edfb42d355..c5f91fbe184 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -2147,6 +2147,10 @@ def test_strptime(self):
         strptime = self.theclass.strptime
         self.assertEqual(strptime("+0002", "%z").utcoffset(), 2 * MINUTE)
         self.assertEqual(strptime("-0002", "%z").utcoffset(), -2 * MINUTE)
+        self.assertEqual(
+            strptime("-00:02:01.000003", "%z").utcoffset(),
+            -timedelta(minutes=2, seconds=1, microseconds=3)
+        )
         # Only local timezone and UTC are supported
         for tzseconds, tzname in ((0, 'UTC'), (0, 'GMT'),
                                  (-_time.timezone, _time.tzname[0])):
diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py
index 93431802575..1251886779d 100644
--- a/Lib/test/test_strptime.py
+++ b/Lib/test/test_strptime.py
@@ -305,7 +305,7 @@ def test_fraction(self):
         # Test microseconds
         import datetime
         d = datetime.datetime(2012, 12, 20, 12, 34, 56, 78987)
-        tup, frac = _strptime._strptime(str(d), format="%Y-%m-%d %H:%M:%S.%f")
+        tup, frac, _ = _strptime._strptime(str(d), format="%Y-%m-%d %H:%M:%S.%f")
         self.assertEqual(frac, d.microsecond)
 
     def test_weekday(self):
@@ -317,6 +317,51 @@ def test_julian(self):
         # Test julian directives
         self.helper('j', 7)
 
+    def test_offset(self):
+        one_hour = 60 * 60
+        half_hour = 30 * 60
+        half_minute = 30
+        (*_, offset), _, offset_fraction = _strptime._strptime("+0130", "%z")
+        self.assertEqual(offset, one_hour + half_hour)
+        self.assertEqual(offset_fraction, 0)
+        (*_, offset), _, offset_fraction = _strptime._strptime("-0100", "%z")
+        self.assertEqual(offset, -one_hour)
+        self.assertEqual(offset_fraction, 0)
+        (*_, offset), _, offset_fraction = _strptime._strptime("-013030", "%z")
+        self.assertEqual(offset, -(one_hour + half_hour + half_minute))
+        self.assertEqual(offset_fraction, 0)
+        (*_, offset), _, offset_fraction = _strptime._strptime("-013030.000001", "%z")
+        self.assertEqual(offset, -(one_hour + half_hour + half_minute))
+        self.assertEqual(offset_fraction, -1)
+        (*_, offset), _, offset_fraction = _strptime._strptime("+01:00", "%z")
+        self.assertEqual(offset, one_hour)
+        self.assertEqual(offset_fraction, 0)
+        (*_, offset), _, offset_fraction = _strptime._strptime("-01:30", "%z")
+        self.assertEqual(offset, -(one_hour + half_hour))
+        self.assertEqual(offset_fraction, 0)
+        (*_, offset), _, offset_fraction = _strptime._strptime("-01:30:30", "%z")
+        self.assertEqual(offset, -(one_hour + half_hour + half_minute))
+        self.assertEqual(offset_fraction, 0)
+        (*_, offset), _, offset_fraction = _strptime._strptime("-01:30:30.000001", "%z")
+        self.assertEqual(offset, -(one_hour + half_hour + half_minute))
+        self.assertEqual(offset_fraction, -1)
+        (*_, offset), _, offset_fraction = _strptime._strptime("Z", "%z")
+        self.assertEqual(offset, 0)
+        self.assertEqual(offset_fraction, 0)
+
+    def test_bad_offset(self):
+        with self.assertRaises(ValueError):
+            _strptime._strptime("-01:30:30.", "%z")
+        with self.assertRaises(ValueError):
+            _strptime._strptime("-0130:30", "%z")
+        with self.assertRaises(ValueError):
+            _strptime._strptime("-01:30:30.1234567", "%z")
+        with self.assertRaises(ValueError):
+            _strptime._strptime("-01:30:30:123456", "%z")
+        with self.assertRaises(ValueError) as err:
+            _strptime._strptime("-01:3030", "%z")
+        self.assertEqual("Unconsistent use of : in -01:3030", str(err.exception))
+
     def test_timezone(self):
         # Test timezone directives.
         # When gmtime() is used with %Z, entire result of strftime() is empty.
diff --git a/Misc/NEWS.d/next/Library/2017-10-17-20-08-19.bpo-31800.foOSCi.rst b/Misc/NEWS.d/next/Library/2017-10-17-20-08-19.bpo-31800.foOSCi.rst
new file mode 100644
index 00000000000..1580440a595
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-17-20-08-19.bpo-31800.foOSCi.rst
@@ -0,0 +1,3 @@
+Extended support for parsing UTC offsets. strptime '%z' can now
+parse the output generated by datetime.isoformat, including seconds and
+microseconds.


From webhook-mailer at python.org  Thu Oct 26 02:03:08 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Thu, 26 Oct 2017 06:03:08 -0000
Subject: [Python-checkins] bpo-31857: Make the behavior of USE_STACKCHECK
 deterministic (#4098)
Message-ID: <mailman.45.1508997790.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/1896793520a49a6f97ae360c0b288967e56b005e
commit: 1896793520a49a6f97ae360c0b288967e56b005e
branch: master
author: pdox <pdox at alum.mit.edu>
committer: Benjamin Peterson <benjamin at python.org>
date: 2017-10-25T23:03:01-07:00
summary:

bpo-31857: Make the behavior of USE_STACKCHECK deterministic (#4098)

files:
A Misc/NEWS.d/next/Windows/2017-10-23-18-35-50.bpo-31857.YwhEvc.rst
M Include/ceval.h
M Include/internal/ceval.h
M Include/pystate.h
M Python/ceval.c
M Python/pystate.c

diff --git a/Include/ceval.h b/Include/ceval.h
index c5ccf473c17..70306b8bbd8 100644
--- a/Include/ceval.h
+++ b/Include/ceval.h
@@ -93,21 +93,19 @@ PyAPI_FUNC(int) Py_GetRecursionLimit(void);
       PyThreadState_GET()->overflowed = 0;  \
     } while(0)
 PyAPI_FUNC(int) _Py_CheckRecursiveCall(const char *where);
-/* XXX _Py_CheckRecursionLimit should be changed to
-   _PyRuntime.ceval.check_recursion_limit.  However, due to the macros
-   in which it's used, _Py_CheckRecursionLimit is stuck in the stable
-   ABI.  It should be removed therefrom when possible.
+
+/* Due to the macros in which it's used, _Py_CheckRecursionLimit is in
+   the stable ABI.  It should be removed therefrom when possible.
 */
 PyAPI_DATA(int) _Py_CheckRecursionLimit;
 
 #ifdef USE_STACKCHECK
-/* With USE_STACKCHECK, we artificially decrement the recursion limit in order
-   to trigger regular stack checks in _Py_CheckRecursiveCall(), except if
-   the "overflowed" flag is set, in which case we need the true value
-   of _Py_CheckRecursionLimit for _Py_MakeEndRecCheck() to function properly.
+/* With USE_STACKCHECK, trigger stack checks in _Py_CheckRecursiveCall()
+   on every 64th call to Py_EnterRecursiveCall.
 */
 #  define _Py_MakeRecCheck(x)  \
-    (++(x) > (_Py_CheckRecursionLimit += PyThreadState_GET()->overflowed - 1))
+    (++(x) > _Py_CheckRecursionLimit || \
+     ++(PyThreadState_GET()->stackcheck_counter) > 64)
 #else
 #  define _Py_MakeRecCheck(x)  (++(x) > _Py_CheckRecursionLimit)
 #endif
diff --git a/Include/internal/ceval.h b/Include/internal/ceval.h
index 57db9b1ebc7..cdabb9521d1 100644
--- a/Include/internal/ceval.h
+++ b/Include/internal/ceval.h
@@ -29,7 +29,6 @@ struct _pending_calls {
 
 struct _ceval_runtime_state {
     int recursion_limit;
-    int check_recursion_limit;
     /* Records whether tracing is on for any thread.  Counts the number
        of threads for which tstate->c_tracefunc is non-NULL, so if the
        value is 0, we know we don't have to check this thread's
diff --git a/Include/pystate.h b/Include/pystate.h
index 238008fce47..0821238a0ac 100644
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -151,6 +151,8 @@ typedef struct _ts {
                         to handle the runtime error. */
     char recursion_critical; /* The current calls must not cause
                                 a stack overflow. */
+    int stackcheck_counter;
+
     /* 'tracing' keeps track of the execution depth when tracing/profiling.
        This is to prevent the actual trace/profile code from being recorded in
        the trace/profile. */
diff --git a/Misc/NEWS.d/next/Windows/2017-10-23-18-35-50.bpo-31857.YwhEvc.rst b/Misc/NEWS.d/next/Windows/2017-10-23-18-35-50.bpo-31857.YwhEvc.rst
new file mode 100644
index 00000000000..13a49780776
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2017-10-23-18-35-50.bpo-31857.YwhEvc.rst
@@ -0,0 +1,2 @@
+Make the behavior of USE_STACKCHECK deterministic in a multi-threaded
+environment.
diff --git a/Python/ceval.c b/Python/ceval.c
index 58a2513b3ef..f6519cff590 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -469,13 +469,15 @@ _Py_CheckRecursiveCall(const char *where)
     int recursion_limit = _PyRuntime.ceval.recursion_limit;
 
 #ifdef USE_STACKCHECK
+    tstate->stackcheck_counter = 0;
     if (PyOS_CheckStack()) {
         --tstate->recursion_depth;
         PyErr_SetString(PyExc_MemoryError, "Stack overflow");
         return -1;
     }
-#endif
+    /* Needed for ABI backwards-compatibility (see bpo-31857) */
     _Py_CheckRecursionLimit = recursion_limit;
+#endif
     if (tstate->recursion_critical)
         /* Somebody asked that we don't check for recursion. */
         return 0;
diff --git a/Python/pystate.c b/Python/pystate.c
index d85d604de5e..82ebf4da7db 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -245,6 +245,7 @@ new_threadstate(PyInterpreterState *interp, int init)
         tstate->recursion_depth = 0;
         tstate->overflowed = 0;
         tstate->recursion_critical = 0;
+        tstate->stackcheck_counter = 0;
         tstate->tracing = 0;
         tstate->use_tracing = 0;
         tstate->gilstate_counter = 0;


From webhook-mailer at python.org  Thu Oct 26 02:55:16 2017
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Thu, 26 Oct 2017 06:55:16 -0000
Subject: [Python-checkins] fixes bpo-31866: remove code pertaining to AtheOS
 support (#4115)
Message-ID: <mailman.46.1509000919.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/4eaf7f949069882e385f2297c9e70031caf9144c
commit: 4eaf7f949069882e385f2297c9e70031caf9144c
branch: master
author: Benjamin Peterson <benjamin at python.org>
committer: GitHub <noreply at github.com>
date: 2017-10-25T23:55:14-07:00
summary:

fixes bpo-31866: remove code pertaining to AtheOS support (#4115)

We stop support this OS in 2007 with commit
19fab761b71a1687aee3415db3a937b5ce31975d. Let's finish.

files:
A Misc/NEWS.d/next/Build/2017-10-24-23-21-13.bpo-31866.MkNO66.rst
M Lib/distutils/command/build_ext.py
M Lib/test/test_os.py
M Modules/_cryptmodule.c

diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index 74445655621..8fad9cdc2b4 100644
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -215,9 +215,9 @@ def finalize_options(self):
                 new_lib = os.path.join(new_lib, suffix)
             self.library_dirs.append(new_lib)
 
-        # for extensions under Cygwin and AtheOS Python's library directory must be
+        # For extensions under Cygwin, Python's library directory must be
         # appended to library_dirs
-        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
+        if sys.platform[:6] == 'cygwin':
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
@@ -715,22 +715,6 @@ def get_libraries(self, ext):
                 return ext.libraries + [pythonlib]
             else:
                 return ext.libraries
-        elif sys.platform[:6] == "atheos":
-            from distutils import sysconfig
-
-            template = "python%d.%d"
-            pythonlib = (template %
-                   (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
-            # Get SHLIBS from Makefile
-            extra = []
-            for lib in sysconfig.get_config_var('SHLIBS').split():
-                if lib.startswith('-l'):
-                    extra.append(lib[2:])
-                else:
-                    extra.append(lib)
-            # don't extend ext.libraries, it may be shared with other
-            # extensions, it is a reference to the original list
-            return ext.libraries + [pythonlib, "m"] + extra
         elif sys.platform == 'darwin':
             # Don't use the default code below
             return ext.libraries
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 18edbcda652..eb73af51ac8 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -341,12 +341,7 @@ def test_stat_result_pickle(self):
 
     @unittest.skipUnless(hasattr(os, 'statvfs'), 'test needs os.statvfs()')
     def test_statvfs_attributes(self):
-        try:
-            result = os.statvfs(self.fname)
-        except OSError as e:
-            # On AtheOS, glibc always returns ENOSYS
-            if e.errno == errno.ENOSYS:
-                self.skipTest('os.statvfs() failed with ENOSYS')
+        result = os.statvfs(self.fname)
 
         # Make sure direct access works
         self.assertEqual(result.f_bfree, result[3])
@@ -386,12 +381,7 @@ def test_statvfs_attributes(self):
     @unittest.skipUnless(hasattr(os, 'statvfs'),
                          "need os.statvfs()")
     def test_statvfs_result_pickle(self):
-        try:
-            result = os.statvfs(self.fname)
-        except OSError as e:
-            # On AtheOS, glibc always returns ENOSYS
-            if e.errno == errno.ENOSYS:
-                self.skipTest('os.statvfs() failed with ENOSYS')
+        result = os.statvfs(self.fname)
 
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
             p = pickle.dumps(result, proto)
diff --git a/Misc/NEWS.d/next/Build/2017-10-24-23-21-13.bpo-31866.MkNO66.rst b/Misc/NEWS.d/next/Build/2017-10-24-23-21-13.bpo-31866.MkNO66.rst
new file mode 100644
index 00000000000..bc99382a418
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2017-10-24-23-21-13.bpo-31866.MkNO66.rst
@@ -0,0 +1 @@
+Finish removing support for AtheOS.
diff --git a/Modules/_cryptmodule.c b/Modules/_cryptmodule.c
index 8e4737c7b44..58d179e6a3d 100644
--- a/Modules/_cryptmodule.c
+++ b/Modules/_cryptmodule.c
@@ -34,8 +34,6 @@ static PyObject *
 crypt_crypt_impl(PyObject *module, const char *word, const char *salt)
 /*[clinic end generated code: output=0512284a03d2803c input=0e8edec9c364352b]*/
 {
-    /* On some platforms (AtheOS) crypt returns NULL for an invalid
-       salt. Return None in that case. XXX Maybe raise an exception?  */
     return Py_BuildValue("s", crypt(word, salt));
 }
 


From webhook-mailer at python.org  Thu Oct 26 03:42:06 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 26 Oct 2017 07:42:06 -0000
Subject: [Python-checkins] bpo-21720: Restore the Python 2.7 logic in
 handling a fromlist. (#4118)
Message-ID: <mailman.47.1509003729.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/41c56940c6edf3ea169332a6b039b6c8796f0475
commit: 41c56940c6edf3ea169332a6b039b6c8796f0475
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-26T10:41:59+03:00
summary:

bpo-21720: Restore the Python 2.7 logic in handling a fromlist. (#4118)

BytesWarning no longer emitted when the fromlist argument of
__import__() or the __all__ attribute of the module contain bytes
instances.

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-25-15-51-37.bpo-21720.BwIKLP.rst
M Lib/importlib/_bootstrap.py
M Lib/test/test_importlib/import_/test_fromlist.py
M Python/importlib.h

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 76e1be59686..5df6aa040a2 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -994,7 +994,7 @@ def _gcd_import(name, package=None, level=0):
     return _find_and_load(name, _gcd_import)
 
 
-def _handle_fromlist(module, fromlist, import_):
+def _handle_fromlist(module, fromlist, import_, *, recursive=False):
     """Figure out what __import__ should return.
 
     The import_ parameter is a callable which takes the name of module to
@@ -1005,13 +1005,19 @@ def _handle_fromlist(module, fromlist, import_):
     # The hell that is fromlist ...
     # If a package was imported, try to import stuff from fromlist.
     if hasattr(module, '__path__'):
-        if '*' in fromlist:
-            fromlist = list(fromlist)
-            fromlist.remove('*')
-            if hasattr(module, '__all__'):
-                fromlist.extend(module.__all__)
         for x in fromlist:
-            if not hasattr(module, x):
+            if not isinstance(x, str):
+                if recursive:
+                    where = module.__name__ + '.__all__'
+                else:
+                    where = "``from list''"
+                raise TypeError(f"Item in {where} must be str, "
+                                f"not {type(x).__name__}")
+            elif x == '*':
+                if not recursive and hasattr(module, '__all__'):
+                    _handle_fromlist(module, module.__all__, import_,
+                                     recursive=True)
+            elif not hasattr(module, x):
                 from_name = '{}.{}'.format(module.__name__, x)
                 try:
                     _call_with_frames_removed(import_, from_name)
diff --git a/Lib/test/test_importlib/import_/test_fromlist.py b/Lib/test/test_importlib/import_/test_fromlist.py
index 14640032b4c..018c1721761 100644
--- a/Lib/test/test_importlib/import_/test_fromlist.py
+++ b/Lib/test/test_importlib/import_/test_fromlist.py
@@ -1,5 +1,6 @@
 """Test that the semantics relating to the 'fromlist' argument are correct."""
 from .. import util
+import warnings
 import unittest
 
 
@@ -73,6 +74,13 @@ def test_module_from_package(self):
                 self.assertTrue(hasattr(module, 'module'))
                 self.assertEqual(module.module.__name__, 'pkg.module')
 
+    def test_nonexistent_from_package(self):
+        with util.mock_modules('pkg.__init__') as importer:
+            with util.import_state(meta_path=[importer]):
+                module = self.__import__('pkg', fromlist=['non_existent'])
+                self.assertEqual(module.__name__, 'pkg')
+                self.assertFalse(hasattr(module, 'non_existent'))
+
     def test_module_from_package_triggers_ModuleNotFoundError(self):
         # If a submodule causes an ModuleNotFoundError because it tries
         # to import a module which doesn't exist, that should let the
@@ -122,6 +130,41 @@ def test_star_with_others(self):
                 self.assertEqual(module.module1.__name__, 'pkg.module1')
                 self.assertEqual(module.module2.__name__, 'pkg.module2')
 
+    def test_nonexistent_in_all(self):
+        with util.mock_modules('pkg.__init__') as importer:
+            with util.import_state(meta_path=[importer]):
+                importer['pkg'].__all__ = ['non_existent']
+                module = self.__import__('pkg', fromlist=['*'])
+                self.assertEqual(module.__name__, 'pkg')
+                self.assertFalse(hasattr(module, 'non_existent'))
+
+    def test_star_in_all(self):
+        with util.mock_modules('pkg.__init__') as importer:
+            with util.import_state(meta_path=[importer]):
+                importer['pkg'].__all__ = ['*']
+                module = self.__import__('pkg', fromlist=['*'])
+                self.assertEqual(module.__name__, 'pkg')
+                self.assertFalse(hasattr(module, '*'))
+
+    def test_invalid_type(self):
+        with util.mock_modules('pkg.__init__') as importer:
+            with util.import_state(meta_path=[importer]), \
+                 warnings.catch_warnings():
+                warnings.simplefilter('error', BytesWarning)
+                with self.assertRaisesRegex(TypeError, r'\bfrom\b'):
+                    self.__import__('pkg', fromlist=[b'attr'])
+                with self.assertRaisesRegex(TypeError, r'\bfrom\b'):
+                    self.__import__('pkg', fromlist=iter([b'attr']))
+
+    def test_invalid_type_in_all(self):
+        with util.mock_modules('pkg.__init__') as importer:
+            with util.import_state(meta_path=[importer]), \
+                 warnings.catch_warnings():
+                warnings.simplefilter('error', BytesWarning)
+                importer['pkg'].__all__ = [b'attr']
+                with self.assertRaisesRegex(TypeError, r'\bpkg\.__all__\b'):
+                    self.__import__('pkg', fromlist=['*'])
+
 
 (Frozen_FromList,
  Source_FromList
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-25-15-51-37.bpo-21720.BwIKLP.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-25-15-51-37.bpo-21720.BwIKLP.rst
new file mode 100644
index 00000000000..02afea24200
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-25-15-51-37.bpo-21720.BwIKLP.rst	
@@ -0,0 +1,3 @@
+BytesWarning no longer emitted when the *fromlist* argument of
+``__import__()`` or the ``__all__`` attribute of the module contain bytes
+instances.
diff --git a/Python/importlib.h b/Python/importlib.h
index e844b5ccedc..f475c169ad8 100644
--- a/Python/importlib.h
+++ b/Python/importlib.h
@@ -1,7 +1,7 @@
 /* Auto-generated by Programs/_freeze_importlib.c */
 const unsigned char _Py_M__importlib[] = {
     99,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,
-    0,64,0,0,0,115,210,1,0,0,100,0,90,0,100,1,
+    0,64,0,0,0,115,216,1,0,0,100,0,90,0,100,1,
     97,1,100,2,100,3,132,0,90,2,100,4,100,5,132,0,
     90,3,105,0,90,4,105,0,90,5,71,0,100,6,100,7,
     132,0,100,7,101,6,131,3,90,7,71,0,100,8,100,9,
@@ -14,7 +14,7 @@ const unsigned char _Py_M__importlib[] = {
     90,17,100,30,100,31,132,0,90,18,71,0,100,32,100,33,
     132,0,100,33,131,2,90,19,71,0,100,34,100,35,132,0,
     100,35,131,2,90,20,100,1,100,1,100,36,156,2,100,37,
-    100,38,132,2,90,21,100,94,100,39,100,40,132,1,90,22,
+    100,38,132,2,90,21,100,95,100,39,100,40,132,1,90,22,
     100,41,100,42,156,1,100,43,100,44,132,2,90,23,100,45,
     100,46,132,0,90,24,100,47,100,48,132,0,90,25,100,49,
     100,50,132,0,90,26,100,51,100,52,132,0,90,27,100,53,
@@ -22,1793 +22,1803 @@ const unsigned char _Py_M__importlib[] = {
     100,57,100,58,132,0,100,58,131,2,90,30,71,0,100,59,
     100,60,132,0,100,60,131,2,90,31,71,0,100,61,100,62,
     132,0,100,62,131,2,90,32,100,63,100,64,132,0,90,33,
-    100,65,100,66,132,0,90,34,100,95,100,67,100,68,132,1,
+    100,65,100,66,132,0,90,34,100,96,100,67,100,68,132,1,
     90,35,100,69,100,70,132,0,90,36,100,71,90,37,101,37,
     100,72,23,0,90,38,100,73,100,74,132,0,90,39,101,40,
-    131,0,90,41,100,75,100,76,132,0,90,42,100,96,100,78,
-    100,79,132,1,90,43,100,80,100,81,132,0,90,44,100,82,
-    100,83,132,0,90,45,100,1,100,1,102,0,100,77,102,4,
-    100,84,100,85,132,1,90,46,100,86,100,87,132,0,90,47,
-    100,88,100,89,132,0,90,48,100,90,100,91,132,0,90,49,
-    100,92,100,93,132,0,90,50,100,1,83,0,41,97,97,83,
-    1,0,0,67,111,114,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,10,10,84,104,105,115,32,109,111,100,117,108,101,32,105,
-    115,32,78,79,84,32,109,101,97,110,116,32,116,111,32,98,
-    101,32,100,105,114,101,99,116,108,121,32,105,109,112,111,114,
-    116,101,100,33,32,73,116,32,104,97,115,32,98,101,101,110,
-    32,100,101,115,105,103,110,101,100,32,115,117,99,104,10,116,
-    104,97,116,32,105,116,32,99,97,110,32,98,101,32,98,111,
-    111,116,115,116,114,97,112,112,101,100,32,105,110,116,111,32,
-    80,121,116,104,111,110,32,97,115,32,116,104,101,32,105,109,
+    131,0,90,41,100,75,100,76,132,0,90,42,100,97,100,78,
+    100,79,132,1,90,43,100,41,100,80,156,1,100,81,100,82,
+    132,2,90,44,100,83,100,84,132,0,90,45,100,1,100,1,
+    102,0,100,77,102,4,100,85,100,86,132,1,90,46,100,87,
+    100,88,132,0,90,47,100,89,100,90,132,0,90,48,100,91,
+    100,92,132,0,90,49,100,93,100,94,132,0,90,50,100,1,
+    83,0,41,98,97,83,1,0,0,67,111,114,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,32,65,115,10,115,117,99,104,32,
-    105,116,32,114,101,113,117,105,114,101,115,32,116,104,101,32,
-    105,110,106,101,99,116,105,111,110,32,111,102,32,115,112,101,
-    99,105,102,105,99,32,109,111,100,117,108,101,115,32,97,110,
-    100,32,97,116,116,114,105,98,117,116,101,115,32,105,110,32,
-    111,114,100,101,114,32,116,111,10,119,111,114,107,46,32,79,
-    110,101,32,115,104,111,117,108,100,32,117,115,101,32,105,109,
-    112,111,114,116,108,105,98,32,97,115,32,116,104,101,32,112,
-    117,98,108,105,99,45,102,97,99,105,110,103,32,118,101,114,
-    115,105,111,110,32,111,102,32,116,104,105,115,32,109,111,100,
-    117,108,101,46,10,10,78,99,2,0,0,0,0,0,0,0,
-    3,0,0,0,7,0,0,0,67,0,0,0,115,60,0,0,
-    0,120,40,100,6,68,0,93,32,125,2,116,0,124,1,124,
-    2,131,2,114,6,116,1,124,0,124,2,116,2,124,1,124,
-    2,131,2,131,3,1,0,113,6,87,0,124,0,106,3,160,
-    4,124,1,106,3,161,1,1,0,100,5,83,0,41,7,122,
-    47,83,105,109,112,108,101,32,115,117,98,115,116,105,116,117,
-    116,101,32,102,111,114,32,102,117,110,99,116,111,111,108,115,
-    46,117,112,100,97,116,101,95,119,114,97,112,112,101,114,46,
-    218,10,95,95,109,111,100,117,108,101,95,95,218,8,95,95,
-    110,97,109,101,95,95,218,12,95,95,113,117,97,108,110,97,
-    109,101,95,95,218,7,95,95,100,111,99,95,95,78,41,4,
-    114,0,0,0,0,114,1,0,0,0,114,2,0,0,0,114,
-    3,0,0,0,41,5,218,7,104,97,115,97,116,116,114,218,
-    7,115,101,116,97,116,116,114,218,7,103,101,116,97,116,116,
-    114,218,8,95,95,100,105,99,116,95,95,218,6,117,112,100,
-    97,116,101,41,3,90,3,110,101,119,90,3,111,108,100,218,
-    7,114,101,112,108,97,99,101,169,0,114,10,0,0,0,250,
-    29,60,102,114,111,122,101,110,32,105,109,112,111,114,116,108,
-    105,98,46,95,98,111,111,116,115,116,114,97,112,62,218,5,
-    95,119,114,97,112,27,0,0,0,115,8,0,0,0,0,2,
-    10,1,10,1,22,1,114,12,0,0,0,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,116,1,131,1,124,0,131,1,83,
-    0,41,1,78,41,2,218,4,116,121,112,101,218,3,115,121,
-    115,41,1,218,4,110,97,109,101,114,10,0,0,0,114,10,
-    0,0,0,114,11,0,0,0,218,11,95,110,101,119,95,109,
-    111,100,117,108,101,35,0,0,0,115,2,0,0,0,0,1,
-    114,16,0,0,0,99,0,0,0,0,0,0,0,0,0,0,
-    0,0,1,0,0,0,64,0,0,0,115,12,0,0,0,101,
-    0,90,1,100,0,90,2,100,1,83,0,41,2,218,14,95,
-    68,101,97,100,108,111,99,107,69,114,114,111,114,78,41,3,
-    114,1,0,0,0,114,0,0,0,0,114,2,0,0,0,114,
-    10,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
-    0,0,0,114,17,0,0,0,48,0,0,0,115,2,0,0,
-    0,8,1,114,17,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,56,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,
-    100,7,132,0,90,6,100,8,100,9,132,0,90,7,100,10,
-    100,11,132,0,90,8,100,12,83,0,41,13,218,11,95,77,
-    111,100,117,108,101,76,111,99,107,122,169,65,32,114,101,99,
-    117,114,115,105,118,101,32,108,111,99,107,32,105,109,112,108,
-    101,109,101,110,116,97,116,105,111,110,32,119,104,105,99,104,
-    32,105,115,32,97,98,108,101,32,116,111,32,100,101,116,101,
-    99,116,32,100,101,97,100,108,111,99,107,115,10,32,32,32,
-    32,40,101,46,103,46,32,116,104,114,101,97,100,32,49,32,
-    116,114,121,105,110,103,32,116,111,32,116,97,107,101,32,108,
-    111,99,107,115,32,65,32,116,104,101,110,32,66,44,32,97,
-    110,100,32,116,104,114,101,97,100,32,50,32,116,114,121,105,
-    110,103,32,116,111,10,32,32,32,32,116,97,107,101,32,108,
-    111,99,107,115,32,66,32,116,104,101,110,32,65,41,46,10,
-    32,32,32,32,99,2,0,0,0,0,0,0,0,2,0,0,
-    0,2,0,0,0,67,0,0,0,115,48,0,0,0,116,0,
-    160,1,161,0,124,0,95,2,116,0,160,1,161,0,124,0,
-    95,3,124,1,124,0,95,4,100,0,124,0,95,5,100,1,
-    124,0,95,6,100,1,124,0,95,7,100,0,83,0,41,2,
-    78,233,0,0,0,0,41,8,218,7,95,116,104,114,101,97,
-    100,90,13,97,108,108,111,99,97,116,101,95,108,111,99,107,
-    218,4,108,111,99,107,218,6,119,97,107,101,117,112,114,15,
-    0,0,0,218,5,111,119,110,101,114,218,5,99,111,117,110,
-    116,218,7,119,97,105,116,101,114,115,41,2,218,4,115,101,
-    108,102,114,15,0,0,0,114,10,0,0,0,114,10,0,0,
-    0,114,11,0,0,0,218,8,95,95,105,110,105,116,95,95,
-    58,0,0,0,115,12,0,0,0,0,1,10,1,10,1,6,
-    1,6,1,6,1,122,20,95,77,111,100,117,108,101,76,111,
-    99,107,46,95,95,105,110,105,116,95,95,99,1,0,0,0,
-    0,0,0,0,4,0,0,0,3,0,0,0,67,0,0,0,
-    115,64,0,0,0,116,0,160,1,161,0,125,1,124,0,106,
-    2,125,2,120,44,116,3,160,4,124,2,161,1,125,3,124,
-    3,100,0,107,8,114,38,100,1,83,0,124,3,106,2,125,
-    2,124,2,124,1,107,2,114,16,100,2,83,0,113,16,87,
-    0,100,0,83,0,41,3,78,70,84,41,5,114,20,0,0,
-    0,218,9,103,101,116,95,105,100,101,110,116,114,23,0,0,
-    0,218,12,95,98,108,111,99,107,105,110,103,95,111,110,218,
-    3,103,101,116,41,4,114,26,0,0,0,90,2,109,101,218,
-    3,116,105,100,114,21,0,0,0,114,10,0,0,0,114,10,
-    0,0,0,114,11,0,0,0,218,12,104,97,115,95,100,101,
-    97,100,108,111,99,107,66,0,0,0,115,18,0,0,0,0,
-    2,8,1,6,1,2,1,10,1,8,1,4,1,6,1,8,
-    1,122,24,95,77,111,100,117,108,101,76,111,99,107,46,104,
-    97,115,95,100,101,97,100,108,111,99,107,99,1,0,0,0,
-    0,0,0,0,2,0,0,0,16,0,0,0,67,0,0,0,
-    115,168,0,0,0,116,0,160,1,161,0,125,1,124,0,116,
-    2,124,1,60,0,122,138,120,132,124,0,106,3,143,96,1,
-    0,124,0,106,4,100,1,107,2,115,48,124,0,106,5,124,
-    1,107,2,114,72,124,1,124,0,95,5,124,0,4,0,106,
-    4,100,2,55,0,2,0,95,4,100,3,83,0,124,0,160,
-    6,161,0,114,92,116,7,100,4,124,0,22,0,131,1,130,
-    1,124,0,106,8,160,9,100,5,161,1,114,118,124,0,4,
-    0,106,10,100,2,55,0,2,0,95,10,87,0,100,6,81,
-    0,82,0,88,0,124,0,106,8,160,9,161,0,1,0,124,
-    0,106,8,160,11,161,0,1,0,113,20,87,0,87,0,100,
-    6,116,2,124,1,61,0,88,0,100,6,83,0,41,7,122,
-    185,10,32,32,32,32,32,32,32,32,65,99,113,117,105,114,
-    101,32,116,104,101,32,109,111,100,117,108,101,32,108,111,99,
-    107,46,32,32,73,102,32,97,32,112,111,116,101,110,116,105,
-    97,108,32,100,101,97,100,108,111,99,107,32,105,115,32,100,
-    101,116,101,99,116,101,100,44,10,32,32,32,32,32,32,32,
-    32,97,32,95,68,101,97,100,108,111,99,107,69,114,114,111,
-    114,32,105,115,32,114,97,105,115,101,100,46,10,32,32,32,
-    32,32,32,32,32,79,116,104,101,114,119,105,115,101,44,32,
-    116,104,101,32,108,111,99,107,32,105,115,32,97,108,119,97,
-    121,115,32,97,99,113,117,105,114,101,100,32,97,110,100,32,
-    84,114,117,101,32,105,115,32,114,101,116,117,114,110,101,100,
-    46,10,32,32,32,32,32,32,32,32,114,19,0,0,0,233,
-    1,0,0,0,84,122,23,100,101,97,100,108,111,99,107,32,
-    100,101,116,101,99,116,101,100,32,98,121,32,37,114,70,78,
-    41,12,114,20,0,0,0,114,28,0,0,0,114,29,0,0,
-    0,114,21,0,0,0,114,24,0,0,0,114,23,0,0,0,
-    114,32,0,0,0,114,17,0,0,0,114,22,0,0,0,218,
-    7,97,99,113,117,105,114,101,114,25,0,0,0,218,7,114,
-    101,108,101,97,115,101,41,2,114,26,0,0,0,114,31,0,
-    0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,
-    0,114,34,0,0,0,78,0,0,0,115,32,0,0,0,0,
-    6,8,1,8,1,2,1,2,1,8,1,20,1,6,1,14,
-    1,4,1,8,1,12,1,12,1,24,2,10,1,18,2,122,
-    19,95,77,111,100,117,108,101,76,111,99,107,46,97,99,113,
-    117,105,114,101,99,1,0,0,0,0,0,0,0,2,0,0,
-    0,10,0,0,0,67,0,0,0,115,122,0,0,0,116,0,
-    160,1,161,0,125,1,124,0,106,2,143,98,1,0,124,0,
-    106,3,124,1,107,3,114,34,116,4,100,1,131,1,130,1,
-    124,0,106,5,100,2,107,4,115,48,116,6,130,1,124,0,
-    4,0,106,5,100,3,56,0,2,0,95,5,124,0,106,5,
-    100,2,107,2,114,108,100,0,124,0,95,3,124,0,106,7,
-    114,108,124,0,4,0,106,7,100,3,56,0,2,0,95,7,
-    124,0,106,8,160,9,161,0,1,0,87,0,100,0,81,0,
-    82,0,88,0,100,0,83,0,41,4,78,122,31,99,97,110,
-    110,111,116,32,114,101,108,101,97,115,101,32,117,110,45,97,
-    99,113,117,105,114,101,100,32,108,111,99,107,114,19,0,0,
-    0,114,33,0,0,0,41,10,114,20,0,0,0,114,28,0,
-    0,0,114,21,0,0,0,114,23,0,0,0,218,12,82,117,
-    110,116,105,109,101,69,114,114,111,114,114,24,0,0,0,218,
-    14,65,115,115,101,114,116,105,111,110,69,114,114,111,114,114,
-    25,0,0,0,114,22,0,0,0,114,35,0,0,0,41,2,
-    114,26,0,0,0,114,31,0,0,0,114,10,0,0,0,114,
-    10,0,0,0,114,11,0,0,0,114,35,0,0,0,103,0,
-    0,0,115,22,0,0,0,0,1,8,1,8,1,10,1,8,
-    1,14,1,14,1,10,1,6,1,6,1,14,1,122,19,95,
-    77,111,100,117,108,101,76,111,99,107,46,114,101,108,101,97,
-    115,101,99,1,0,0,0,0,0,0,0,1,0,0,0,5,
-    0,0,0,67,0,0,0,115,18,0,0,0,100,1,160,0,
-    124,0,106,1,116,2,124,0,131,1,161,2,83,0,41,2,
-    78,122,23,95,77,111,100,117,108,101,76,111,99,107,40,123,
-    33,114,125,41,32,97,116,32,123,125,41,3,218,6,102,111,
-    114,109,97,116,114,15,0,0,0,218,2,105,100,41,1,114,
-    26,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
-    0,0,0,218,8,95,95,114,101,112,114,95,95,116,0,0,
-    0,115,2,0,0,0,0,1,122,20,95,77,111,100,117,108,
-    101,76,111,99,107,46,95,95,114,101,112,114,95,95,78,41,
-    9,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,32,0,0,0,114,
-    34,0,0,0,114,35,0,0,0,114,40,0,0,0,114,10,
-    0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,
-    0,0,114,18,0,0,0,52,0,0,0,115,10,0,0,0,
-    12,6,8,8,8,12,8,25,8,13,114,18,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,48,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,100,7,132,0,90,6,100,8,100,
-    9,132,0,90,7,100,10,83,0,41,11,218,16,95,68,117,
-    109,109,121,77,111,100,117,108,101,76,111,99,107,122,86,65,
-    32,115,105,109,112,108,101,32,95,77,111,100,117,108,101,76,
-    111,99,107,32,101,113,117,105,118,97,108,101,110,116,32,102,
-    111,114,32,80,121,116,104,111,110,32,98,117,105,108,100,115,
-    32,119,105,116,104,111,117,116,10,32,32,32,32,109,117,108,
-    116,105,45,116,104,114,101,97,100,105,110,103,32,115,117,112,
-    112,111,114,116,46,99,2,0,0,0,0,0,0,0,2,0,
-    0,0,2,0,0,0,67,0,0,0,115,16,0,0,0,124,
-    1,124,0,95,0,100,1,124,0,95,1,100,0,83,0,41,
-    2,78,114,19,0,0,0,41,2,114,15,0,0,0,114,24,
-    0,0,0,41,2,114,26,0,0,0,114,15,0,0,0,114,
-    10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,27,
-    0,0,0,124,0,0,0,115,4,0,0,0,0,1,6,1,
-    122,25,95,68,117,109,109,121,77,111,100,117,108,101,76,111,
-    99,107,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,18,0,0,0,124,0,4,0,106,0,100,1,55,0,2,
-    0,95,0,100,2,83,0,41,3,78,114,33,0,0,0,84,
-    41,1,114,24,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,34,0,
-    0,0,128,0,0,0,115,4,0,0,0,0,1,14,1,122,
-    24,95,68,117,109,109,121,77,111,100,117,108,101,76,111,99,
-    107,46,97,99,113,117,105,114,101,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,2,114,18,116,1,100,
-    2,131,1,130,1,124,0,4,0,106,0,100,3,56,0,2,
-    0,95,0,100,0,83,0,41,4,78,114,19,0,0,0,122,
-    31,99,97,110,110,111,116,32,114,101,108,101,97,115,101,32,
-    117,110,45,97,99,113,117,105,114,101,100,32,108,111,99,107,
-    114,33,0,0,0,41,2,114,24,0,0,0,114,36,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,35,0,0,0,132,0,0,0,
-    115,6,0,0,0,0,1,10,1,8,1,122,24,95,68,117,
-    109,109,121,77,111,100,117,108,101,76,111,99,107,46,114,101,
-    108,101,97,115,101,99,1,0,0,0,0,0,0,0,1,0,
-    0,0,5,0,0,0,67,0,0,0,115,18,0,0,0,100,
-    1,160,0,124,0,106,1,116,2,124,0,131,1,161,2,83,
-    0,41,2,78,122,28,95,68,117,109,109,121,77,111,100,117,
-    108,101,76,111,99,107,40,123,33,114,125,41,32,97,116,32,
-    123,125,41,3,114,38,0,0,0,114,15,0,0,0,114,39,
-    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,40,0,0,0,137,0,
-    0,0,115,2,0,0,0,0,1,122,25,95,68,117,109,109,
-    121,77,111,100,117,108,101,76,111,99,107,46,95,95,114,101,
-    112,114,95,95,78,41,8,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,34,0,0,0,114,35,0,0,0,114,40,0,0,0,114,
-    10,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
-    0,0,0,114,41,0,0,0,120,0,0,0,115,8,0,0,
-    0,12,4,8,4,8,4,8,5,114,41,0,0,0,99,0,
+    105,109,112,111,114,116,46,10,10,84,104,105,115,32,109,111,
+    100,117,108,101,32,105,115,32,78,79,84,32,109,101,97,110,
+    116,32,116,111,32,98,101,32,100,105,114,101,99,116,108,121,
+    32,105,109,112,111,114,116,101,100,33,32,73,116,32,104,97,
+    115,32,98,101,101,110,32,100,101,115,105,103,110,101,100,32,
+    115,117,99,104,10,116,104,97,116,32,105,116,32,99,97,110,
+    32,98,101,32,98,111,111,116,115,116,114,97,112,112,101,100,
+    32,105,110,116,111,32,80,121,116,104,111,110,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,32,65,115,
+    10,115,117,99,104,32,105,116,32,114,101,113,117,105,114,101,
+    115,32,116,104,101,32,105,110,106,101,99,116,105,111,110,32,
+    111,102,32,115,112,101,99,105,102,105,99,32,109,111,100,117,
+    108,101,115,32,97,110,100,32,97,116,116,114,105,98,117,116,
+    101,115,32,105,110,32,111,114,100,101,114,32,116,111,10,119,
+    111,114,107,46,32,79,110,101,32,115,104,111,117,108,100,32,
+    117,115,101,32,105,109,112,111,114,116,108,105,98,32,97,115,
+    32,116,104,101,32,112,117,98,108,105,99,45,102,97,99,105,
+    110,103,32,118,101,114,115,105,111,110,32,111,102,32,116,104,
+    105,115,32,109,111,100,117,108,101,46,10,10,78,99,2,0,
+    0,0,0,0,0,0,3,0,0,0,7,0,0,0,67,0,
+    0,0,115,60,0,0,0,120,40,100,6,68,0,93,32,125,
+    2,116,0,124,1,124,2,131,2,114,6,116,1,124,0,124,
+    2,116,2,124,1,124,2,131,2,131,3,1,0,113,6,87,
+    0,124,0,106,3,160,4,124,1,106,3,161,1,1,0,100,
+    5,83,0,41,7,122,47,83,105,109,112,108,101,32,115,117,
+    98,115,116,105,116,117,116,101,32,102,111,114,32,102,117,110,
+    99,116,111,111,108,115,46,117,112,100,97,116,101,95,119,114,
+    97,112,112,101,114,46,218,10,95,95,109,111,100,117,108,101,
+    95,95,218,8,95,95,110,97,109,101,95,95,218,12,95,95,
+    113,117,97,108,110,97,109,101,95,95,218,7,95,95,100,111,
+    99,95,95,78,41,4,114,0,0,0,0,114,1,0,0,0,
+    114,2,0,0,0,114,3,0,0,0,41,5,218,7,104,97,
+    115,97,116,116,114,218,7,115,101,116,97,116,116,114,218,7,
+    103,101,116,97,116,116,114,218,8,95,95,100,105,99,116,95,
+    95,218,6,117,112,100,97,116,101,41,3,90,3,110,101,119,
+    90,3,111,108,100,218,7,114,101,112,108,97,99,101,169,0,
+    114,10,0,0,0,250,29,60,102,114,111,122,101,110,32,105,
+    109,112,111,114,116,108,105,98,46,95,98,111,111,116,115,116,
+    114,97,112,62,218,5,95,119,114,97,112,27,0,0,0,115,
+    8,0,0,0,0,2,10,1,10,1,22,1,114,12,0,0,
+    0,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,116,1,131,
+    1,124,0,131,1,83,0,41,1,78,41,2,218,4,116,121,
+    112,101,218,3,115,121,115,41,1,218,4,110,97,109,101,114,
+    10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,11,
+    95,110,101,119,95,109,111,100,117,108,101,35,0,0,0,115,
+    2,0,0,0,0,1,114,16,0,0,0,99,0,0,0,0,
+    0,0,0,0,0,0,0,0,1,0,0,0,64,0,0,0,
+    115,12,0,0,0,101,0,90,1,100,0,90,2,100,1,83,
+    0,41,2,218,14,95,68,101,97,100,108,111,99,107,69,114,
+    114,111,114,78,41,3,114,1,0,0,0,114,0,0,0,0,
+    114,2,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
+    10,0,0,0,114,11,0,0,0,114,17,0,0,0,48,0,
+    0,0,115,2,0,0,0,8,1,114,17,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,18,
-    95,77,111,100,117,108,101,76,111,99,107,77,97,110,97,103,
-    101,114,99,2,0,0,0,0,0,0,0,2,0,0,0,2,
-    0,0,0,67,0,0,0,115,16,0,0,0,124,1,124,0,
-    95,0,100,0,124,0,95,1,100,0,83,0,41,1,78,41,
-    2,218,5,95,110,97,109,101,218,5,95,108,111,99,107,41,
-    2,114,26,0,0,0,114,15,0,0,0,114,10,0,0,0,
-    114,10,0,0,0,114,11,0,0,0,114,27,0,0,0,143,
-    0,0,0,115,4,0,0,0,0,1,6,1,122,27,95,77,
-    111,100,117,108,101,76,111,99,107,77,97,110,97,103,101,114,
-    46,95,95,105,110,105,116,95,95,99,1,0,0,0,0,0,
-    0,0,1,0,0,0,2,0,0,0,67,0,0,0,115,26,
-    0,0,0,116,0,124,0,106,1,131,1,124,0,95,2,124,
-    0,106,2,160,3,161,0,1,0,100,0,83,0,41,1,78,
-    41,4,218,16,95,103,101,116,95,109,111,100,117,108,101,95,
-    108,111,99,107,114,43,0,0,0,114,44,0,0,0,114,34,
-    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,218,9,95,95,101,110,116,
-    101,114,95,95,147,0,0,0,115,4,0,0,0,0,1,12,
-    1,122,28,95,77,111,100,117,108,101,76,111,99,107,77,97,
-    110,97,103,101,114,46,95,95,101,110,116,101,114,95,95,99,
-    1,0,0,0,0,0,0,0,3,0,0,0,2,0,0,0,
-    79,0,0,0,115,14,0,0,0,124,0,106,0,160,1,161,
-    0,1,0,100,0,83,0,41,1,78,41,2,114,44,0,0,
-    0,114,35,0,0,0,41,3,114,26,0,0,0,218,4,97,
-    114,103,115,90,6,107,119,97,114,103,115,114,10,0,0,0,
-    114,10,0,0,0,114,11,0,0,0,218,8,95,95,101,120,
-    105,116,95,95,151,0,0,0,115,2,0,0,0,0,1,122,
-    27,95,77,111,100,117,108,101,76,111,99,107,77,97,110,97,
-    103,101,114,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,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,67,0,0,0,115,
-    130,0,0,0,116,0,160,1,161,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,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,
-    118,101,110,32,109,111,100,117,108,101,32,110,97,109,101,46,
-    10,10,32,32,32,32,65,99,113,117,105,114,101,47,114,101,
-    108,101,97,115,101,32,105,110,116,101,114,110,97,108,108,121,
-    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,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,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,
-    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,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,115,56,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,100,7,132,0,90,6,100,8,100,9,
+    132,0,90,7,100,10,100,11,132,0,90,8,100,12,83,0,
+    41,13,218,11,95,77,111,100,117,108,101,76,111,99,107,122,
+    169,65,32,114,101,99,117,114,115,105,118,101,32,108,111,99,
+    107,32,105,109,112,108,101,109,101,110,116,97,116,105,111,110,
+    32,119,104,105,99,104,32,105,115,32,97,98,108,101,32,116,
+    111,32,100,101,116,101,99,116,32,100,101,97,100,108,111,99,
+    107,115,10,32,32,32,32,40,101,46,103,46,32,116,104,114,
+    101,97,100,32,49,32,116,114,121,105,110,103,32,116,111,32,
+    116,97,107,101,32,108,111,99,107,115,32,65,32,116,104,101,
+    110,32,66,44,32,97,110,100,32,116,104,114,101,97,100,32,
+    50,32,116,114,121,105,110,103,32,116,111,10,32,32,32,32,
+    116,97,107,101,32,108,111,99,107,115,32,66,32,116,104,101,
+    110,32,65,41,46,10,32,32,32,32,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,
-    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,
+    48,0,0,0,116,0,160,1,161,0,124,0,95,2,116,0,
+    160,1,161,0,124,0,95,3,124,1,124,0,95,4,100,0,
+    124,0,95,5,100,1,124,0,95,6,100,1,124,0,95,7,
+    100,0,83,0,41,2,78,233,0,0,0,0,41,8,218,7,
+    95,116,104,114,101,97,100,90,13,97,108,108,111,99,97,116,
+    101,95,108,111,99,107,218,4,108,111,99,107,218,6,119,97,
+    107,101,117,112,114,15,0,0,0,218,5,111,119,110,101,114,
+    218,5,99,111,117,110,116,218,7,119,97,105,116,101,114,115,
+    41,2,218,4,115,101,108,102,114,15,0,0,0,114,10,0,
+    0,0,114,10,0,0,0,114,11,0,0,0,218,8,95,95,
+    105,110,105,116,95,95,58,0,0,0,115,12,0,0,0,0,
+    1,10,1,10,1,6,1,6,1,6,1,122,20,95,77,111,
+    100,117,108,101,76,111,99,107,46,95,95,105,110,105,116,95,
+    95,99,1,0,0,0,0,0,0,0,4,0,0,0,3,0,
+    0,0,67,0,0,0,115,64,0,0,0,116,0,160,1,161,
+    0,125,1,124,0,106,2,125,2,120,44,116,3,160,4,124,
+    2,161,1,125,3,124,3,100,0,107,8,114,38,100,1,83,
+    0,124,3,106,2,125,2,124,2,124,1,107,2,114,16,100,
+    2,83,0,113,16,87,0,100,0,83,0,41,3,78,70,84,
+    41,5,114,20,0,0,0,218,9,103,101,116,95,105,100,101,
+    110,116,114,23,0,0,0,218,12,95,98,108,111,99,107,105,
+    110,103,95,111,110,218,3,103,101,116,41,4,114,26,0,0,
+    0,90,2,109,101,218,3,116,105,100,114,21,0,0,0,114,
+    10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,12,
+    104,97,115,95,100,101,97,100,108,111,99,107,66,0,0,0,
+    115,18,0,0,0,0,2,8,1,6,1,2,1,10,1,8,
+    1,4,1,6,1,8,1,122,24,95,77,111,100,117,108,101,
+    76,111,99,107,46,104,97,115,95,100,101,97,100,108,111,99,
+    107,99,1,0,0,0,0,0,0,0,2,0,0,0,16,0,
+    0,0,67,0,0,0,115,168,0,0,0,116,0,160,1,161,
+    0,125,1,124,0,116,2,124,1,60,0,122,138,120,132,124,
+    0,106,3,143,96,1,0,124,0,106,4,100,1,107,2,115,
+    48,124,0,106,5,124,1,107,2,114,72,124,1,124,0,95,
+    5,124,0,4,0,106,4,100,2,55,0,2,0,95,4,100,
+    3,83,0,124,0,160,6,161,0,114,92,116,7,100,4,124,
+    0,22,0,131,1,130,1,124,0,106,8,160,9,100,5,161,
+    1,114,118,124,0,4,0,106,10,100,2,55,0,2,0,95,
+    10,87,0,100,6,81,0,82,0,88,0,124,0,106,8,160,
+    9,161,0,1,0,124,0,106,8,160,11,161,0,1,0,113,
+    20,87,0,87,0,100,6,116,2,124,1,61,0,88,0,100,
+    6,83,0,41,7,122,185,10,32,32,32,32,32,32,32,32,
+    65,99,113,117,105,114,101,32,116,104,101,32,109,111,100,117,
+    108,101,32,108,111,99,107,46,32,32,73,102,32,97,32,112,
+    111,116,101,110,116,105,97,108,32,100,101,97,100,108,111,99,
+    107,32,105,115,32,100,101,116,101,99,116,101,100,44,10,32,
+    32,32,32,32,32,32,32,97,32,95,68,101,97,100,108,111,
+    99,107,69,114,114,111,114,32,105,115,32,114,97,105,115,101,
+    100,46,10,32,32,32,32,32,32,32,32,79,116,104,101,114,
+    119,105,115,101,44,32,116,104,101,32,108,111,99,107,32,105,
+    115,32,97,108,119,97,121,115,32,97,99,113,117,105,114,101,
+    100,32,97,110,100,32,84,114,117,101,32,105,115,32,114,101,
+    116,117,114,110,101,100,46,10,32,32,32,32,32,32,32,32,
+    114,19,0,0,0,233,1,0,0,0,84,122,23,100,101,97,
+    100,108,111,99,107,32,100,101,116,101,99,116,101,100,32,98,
+    121,32,37,114,70,78,41,12,114,20,0,0,0,114,28,0,
+    0,0,114,29,0,0,0,114,21,0,0,0,114,24,0,0,
+    0,114,23,0,0,0,114,32,0,0,0,114,17,0,0,0,
+    114,22,0,0,0,218,7,97,99,113,117,105,114,101,114,25,
+    0,0,0,218,7,114,101,108,101,97,115,101,41,2,114,26,
+    0,0,0,114,31,0,0,0,114,10,0,0,0,114,10,0,
+    0,0,114,11,0,0,0,114,34,0,0,0,78,0,0,0,
+    115,32,0,0,0,0,6,8,1,8,1,2,1,2,1,8,
+    1,20,1,6,1,14,1,4,1,8,1,12,1,12,1,24,
+    2,10,1,18,2,122,19,95,77,111,100,117,108,101,76,111,
+    99,107,46,97,99,113,117,105,114,101,99,1,0,0,0,0,
+    0,0,0,2,0,0,0,10,0,0,0,67,0,0,0,115,
+    122,0,0,0,116,0,160,1,161,0,125,1,124,0,106,2,
+    143,98,1,0,124,0,106,3,124,1,107,3,114,34,116,4,
+    100,1,131,1,130,1,124,0,106,5,100,2,107,4,115,48,
+    116,6,130,1,124,0,4,0,106,5,100,3,56,0,2,0,
+    95,5,124,0,106,5,100,2,107,2,114,108,100,0,124,0,
+    95,3,124,0,106,7,114,108,124,0,4,0,106,7,100,3,
+    56,0,2,0,95,7,124,0,106,8,160,9,161,0,1,0,
+    87,0,100,0,81,0,82,0,88,0,100,0,83,0,41,4,
+    78,122,31,99,97,110,110,111,116,32,114,101,108,101,97,115,
+    101,32,117,110,45,97,99,113,117,105,114,101,100,32,108,111,
+    99,107,114,19,0,0,0,114,33,0,0,0,41,10,114,20,
+    0,0,0,114,28,0,0,0,114,21,0,0,0,114,23,0,
+    0,0,218,12,82,117,110,116,105,109,101,69,114,114,111,114,
+    114,24,0,0,0,218,14,65,115,115,101,114,116,105,111,110,
+    69,114,114,111,114,114,25,0,0,0,114,22,0,0,0,114,
+    35,0,0,0,41,2,114,26,0,0,0,114,31,0,0,0,
+    114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,
+    35,0,0,0,103,0,0,0,115,22,0,0,0,0,1,8,
+    1,8,1,10,1,8,1,14,1,14,1,10,1,6,1,6,
+    1,14,1,122,19,95,77,111,100,117,108,101,76,111,99,107,
+    46,114,101,108,101,97,115,101,99,1,0,0,0,0,0,0,
+    0,1,0,0,0,5,0,0,0,67,0,0,0,115,18,0,
+    0,0,100,1,160,0,124,0,106,1,116,2,124,0,131,1,
+    161,2,83,0,41,2,78,122,23,95,77,111,100,117,108,101,
+    76,111,99,107,40,123,33,114,125,41,32,97,116,32,123,125,
+    41,3,218,6,102,111,114,109,97,116,114,15,0,0,0,218,
+    2,105,100,41,1,114,26,0,0,0,114,10,0,0,0,114,
+    10,0,0,0,114,11,0,0,0,218,8,95,95,114,101,112,
+    114,95,95,116,0,0,0,115,2,0,0,0,0,1,122,20,
+    95,77,111,100,117,108,101,76,111,99,107,46,95,95,114,101,
+    112,114,95,95,78,41,9,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,32,0,0,0,114,34,0,0,0,114,35,0,0,0,114,
+    40,0,0,0,114,10,0,0,0,114,10,0,0,0,114,10,
+    0,0,0,114,11,0,0,0,114,18,0,0,0,52,0,0,
+    0,115,10,0,0,0,12,6,8,8,8,12,8,25,8,13,
+    114,18,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,48,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,100,7,132,
+    0,90,6,100,8,100,9,132,0,90,7,100,10,83,0,41,
+    11,218,16,95,68,117,109,109,121,77,111,100,117,108,101,76,
+    111,99,107,122,86,65,32,115,105,109,112,108,101,32,95,77,
+    111,100,117,108,101,76,111,99,107,32,101,113,117,105,118,97,
+    108,101,110,116,32,102,111,114,32,80,121,116,104,111,110,32,
+    98,117,105,108,100,115,32,119,105,116,104,111,117,116,10,32,
+    32,32,32,109,117,108,116,105,45,116,104,114,101,97,100,105,
+    110,103,32,115,117,112,112,111,114,116,46,99,2,0,0,0,
+    0,0,0,0,2,0,0,0,2,0,0,0,67,0,0,0,
+    115,16,0,0,0,124,1,124,0,95,0,100,1,124,0,95,
+    1,100,0,83,0,41,2,78,114,19,0,0,0,41,2,114,
+    15,0,0,0,114,24,0,0,0,41,2,114,26,0,0,0,
+    114,15,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
+    11,0,0,0,114,27,0,0,0,124,0,0,0,115,4,0,
+    0,0,0,1,6,1,122,25,95,68,117,109,109,121,77,111,
+    100,117,108,101,76,111,99,107,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,18,0,0,0,124,0,4,0,106,
+    0,100,1,55,0,2,0,95,0,100,2,83,0,41,3,78,
+    114,33,0,0,0,84,41,1,114,24,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,34,0,0,0,128,0,0,0,115,4,0,0,
+    0,0,1,14,1,122,24,95,68,117,109,109,121,77,111,100,
+    117,108,101,76,111,99,107,46,97,99,113,117,105,114,101,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,
+    2,114,18,116,1,100,2,131,1,130,1,124,0,4,0,106,
+    0,100,3,56,0,2,0,95,0,100,0,83,0,41,4,78,
+    114,19,0,0,0,122,31,99,97,110,110,111,116,32,114,101,
+    108,101,97,115,101,32,117,110,45,97,99,113,117,105,114,101,
+    100,32,108,111,99,107,114,33,0,0,0,41,2,114,24,0,
+    0,0,114,36,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,35,0,
+    0,0,132,0,0,0,115,6,0,0,0,0,1,10,1,8,
+    1,122,24,95,68,117,109,109,121,77,111,100,117,108,101,76,
+    111,99,107,46,114,101,108,101,97,115,101,99,1,0,0,0,
+    0,0,0,0,1,0,0,0,5,0,0,0,67,0,0,0,
+    115,18,0,0,0,100,1,160,0,124,0,106,1,116,2,124,
+    0,131,1,161,2,83,0,41,2,78,122,28,95,68,117,109,
+    109,121,77,111,100,117,108,101,76,111,99,107,40,123,33,114,
+    125,41,32,97,116,32,123,125,41,3,114,38,0,0,0,114,
+    15,0,0,0,114,39,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,
+    40,0,0,0,137,0,0,0,115,2,0,0,0,0,1,122,
+    25,95,68,117,109,109,121,77,111,100,117,108,101,76,111,99,
+    107,46,95,95,114,101,112,114,95,95,78,41,8,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,34,0,0,0,114,35,0,0,0,
+    114,40,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
+    10,0,0,0,114,11,0,0,0,114,41,0,0,0,120,0,
+    0,0,115,8,0,0,0,12,4,8,4,8,4,8,5,114,
+    41,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,18,95,77,111,100,117,108,101,76,111,99,
+    107,77,97,110,97,103,101,114,99,2,0,0,0,0,0,0,
+    0,2,0,0,0,2,0,0,0,67,0,0,0,115,16,0,
+    0,0,124,1,124,0,95,0,100,0,124,0,95,1,100,0,
+    83,0,41,1,78,41,2,218,5,95,110,97,109,101,218,5,
+    95,108,111,99,107,41,2,114,26,0,0,0,114,15,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,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,27,0,0,0,143,0,0,0,115,4,0,0,0,0,1,
+    6,1,122,27,95,77,111,100,117,108,101,76,111,99,107,77,
+    97,110,97,103,101,114,46,95,95,105,110,105,116,95,95,99,
+    1,0,0,0,0,0,0,0,1,0,0,0,2,0,0,0,
+    67,0,0,0,115,26,0,0,0,116,0,124,0,106,1,131,
+    1,124,0,95,2,124,0,106,2,160,3,161,0,1,0,100,
+    0,83,0,41,1,78,41,4,218,16,95,103,101,116,95,109,
+    111,100,117,108,101,95,108,111,99,107,114,43,0,0,0,114,
+    44,0,0,0,114,34,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,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,
+    9,95,95,101,110,116,101,114,95,95,147,0,0,0,115,4,
+    0,0,0,0,1,12,1,122,28,95,77,111,100,117,108,101,
+    76,111,99,107,77,97,110,97,103,101,114,46,95,95,101,110,
+    116,101,114,95,95,99,1,0,0,0,0,0,0,0,3,0,
+    0,0,2,0,0,0,79,0,0,0,115,14,0,0,0,124,
+    0,106,0,160,1,161,0,1,0,100,0,83,0,41,1,78,
+    41,2,114,44,0,0,0,114,35,0,0,0,41,3,114,26,
+    0,0,0,218,4,97,114,103,115,90,6,107,119,97,114,103,
+    115,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
+    218,8,95,95,101,120,105,116,95,95,151,0,0,0,115,2,
+    0,0,0,0,1,122,27,95,77,111,100,117,108,101,76,111,
+    99,107,77,97,110,97,103,101,114,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,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,67,0,0,0,115,130,0,0,0,116,0,160,1,161,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,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,118,101,110,32,109,111,100,117,108,101,
+    32,110,97,109,101,46,10,10,32,32,32,32,65,99,113,117,
+    105,114,101,47,114,101,108,101,97,115,101,32,105,110,116,101,
+    114,110,97,108,108,121,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,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,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,
-    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,
+    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,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,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,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,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,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,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,
-    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,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,
+    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,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,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,
+    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,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,
+    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,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,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,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,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,106,0,0,0,62,
+    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,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,
+    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,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,
+    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,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,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,182,0,0,0,116,
-    0,124,0,100,1,131,2,114,178,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,118,124,1,68,0,93,
-    110,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,172,1,0,125,5,1,0,122,38,124,5,106,9,124,
-    4,107,2,114,154,116,10,106,11,160,12,124,4,116,13,161,
-    2,100,5,107,9,114,154,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,14,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,114,14,0,0,0,114,
-    80,0,0,0,114,30,0,0,0,114,180,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,34,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,18,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,5,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,32,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,67,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,10,0,0,0,5,0,0,0,67,0,0,0,115,
-    174,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,100,4,
-    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,20,0,0,0,114,167,0,0,0,114,56,0,0,0,78,
-    41,3,114,20,0,0,0,114,167,0,0,0,114,56,0,0,
-    0,41,15,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,
-    41,10,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,114,10,0,0,0,114,10,0,0,
-    0,114,11,0,0,0,218,6,95,115,101,116,117,112,74,4,
-    0,0,115,36,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,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,
+    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,8,95,105,110,115,116,97,108,108,109,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,117,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,32,8,27,18,35,8,7,8,35,8,8,
+    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,41,1,218,9,114,
+    101,99,117,114,115,105,118,101,99,3,0,0,0,1,0,0,
+    0,8,0,0,0,17,0,0,0,67,0,0,0,115,234,0,
+    0,0,116,0,124,0,100,1,131,2,114,230,120,218,124,1,
+    68,0,93,210,125,4,116,1,124,4,116,2,131,2,115,78,
+    124,3,114,46,124,0,106,3,100,2,23,0,125,5,110,4,
+    100,3,125,5,116,4,100,4,124,5,155,0,100,5,116,5,
+    124,4,131,1,106,3,155,0,157,4,131,1,130,1,113,16,
+    124,4,100,6,107,2,114,120,124,3,115,226,116,0,124,0,
+    100,7,131,2,114,226,116,6,124,0,124,0,106,7,124,2,
+    100,8,100,9,141,4,1,0,113,16,116,0,124,0,124,4,
+    131,2,115,16,100,10,160,8,124,0,106,3,124,4,161,2,
+    125,6,121,14,116,9,124,2,124,6,131,2,1,0,87,0,
+    113,16,4,0,116,10,107,10,114,224,1,0,125,7,1,0,
+    122,38,124,7,106,11,124,6,107,2,114,206,116,12,106,13,
+    160,14,124,6,116,15,161,2,100,11,107,9,114,206,119,16,
+    130,0,87,0,89,0,100,11,100,11,125,7,126,7,88,0,
+    113,16,88,0,113,16,87,0,124,0,83,0,41,12,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,122,8,46,95,95,97,108,108,95,95,122,13,96,
+    96,102,114,111,109,32,108,105,115,116,39,39,122,8,73,116,
+    101,109,32,105,110,32,122,18,32,109,117,115,116,32,98,101,
+    32,115,116,114,44,32,110,111,116,32,250,1,42,218,7,95,
+    95,97,108,108,95,95,84,41,1,114,183,0,0,0,122,5,
+    123,125,46,123,125,78,41,16,114,4,0,0,0,114,171,0,
+    0,0,114,172,0,0,0,114,1,0,0,0,114,173,0,0,
+    0,114,13,0,0,0,218,16,95,104,97,110,100,108,101,95,
+    102,114,111,109,108,105,115,116,114,185,0,0,0,114,38,0,
+    0,0,114,59,0,0,0,114,177,0,0,0,114,15,0,0,
+    0,114,14,0,0,0,114,80,0,0,0,114,30,0,0,0,
+    114,180,0,0,0,41,8,114,84,0,0,0,218,8,102,114,
+    111,109,108,105,115,116,114,178,0,0,0,114,183,0,0,0,
+    218,1,120,90,5,119,104,101,114,101,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,114,186,0,0,0,229,3,
+    0,0,115,42,0,0,0,0,10,10,1,10,1,10,1,4,
+    1,12,2,4,1,28,2,8,1,14,1,10,1,10,1,10,
+    1,14,1,2,1,14,1,16,4,10,1,18,1,2,1,24,
+    1,114,186,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,11,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,192,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,192,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,186,0,0,
+    0,41,9,114,15,0,0,0,114,191,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,38,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,195,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,73,4,0,0,115,8,0,0,0,0,1,10,1,8,
+    1,12,1,114,196,0,0,0,99,2,0,0,0,0,0,0,
+    0,10,0,0,0,5,0,0,0,67,0,0,0,115,174,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,100,4,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,20,
+    0,0,0,114,167,0,0,0,114,56,0,0,0,78,41,3,
+    114,20,0,0,0,114,167,0,0,0,114,56,0,0,0,41,
+    15,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,196,0,0,0,114,5,0,0,0,41,10,
+    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,114,10,0,0,0,114,10,0,0,0,114,
+    11,0,0,0,218,6,95,115,101,116,117,112,80,4,0,0,
+    115,36,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,114,200,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,200,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,198,0,0,0,114,199,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,115,4,0,0,115,6,0,0,
+    0,0,2,10,2,12,1,114,201,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,201,0,0,
+    0,114,14,0,0,0,114,80,0,0,0,114,1,0,0,0,
+    41,1,114,202,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,123,4,0,0,115,6,0,0,0,0,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,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,186,0,0,0,114,192,0,0,0,114,195,0,
+    0,0,114,196,0,0,0,114,200,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,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,14,38,8,27,18,35,8,7,8,35,8,8,
 };


From webhook-mailer at python.org  Thu Oct 26 04:27:49 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Thu, 26 Oct 2017 08:27:49 -0000
Subject: [Python-checkins] bpo-30937: Make usage of newline='' consistent in
 csv docs (GH-2730)
Message-ID: <mailman.48.1509006473.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/275d2d9c4663a1ea8d1f7c8778567a735b0372c1
commit: 275d2d9c4663a1ea8d1f7c8778567a735b0372c1
branch: master
author: Ammar Askar <ammar_askar at hotmail.com>
committer: Berker Peksag <berker.peksag at gmail.com>
date: 2017-10-26T11:27:46+03:00
summary:

bpo-30937: Make usage of newline='' consistent in csv docs (GH-2730)

files:
M Doc/library/csv.rst

diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
index 43714f74792..e1290d4c9b5 100644
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -172,7 +172,7 @@ The :mod:`csv` module defines the following classes:
    A short usage example::
 
        >>> import csv
-       >>> with open('names.csv') as csvfile:
+       >>> with open('names.csv', newline='') as csvfile:
        ...     reader = csv.DictReader(csvfile)
        ...     for row in reader:
        ...         print(row['first_name'], row['last_name'])
@@ -211,7 +211,7 @@ The :mod:`csv` module defines the following classes:
 
        import csv
 
-       with open('names.csv', 'w') as csvfile:
+       with open('names.csv', 'w', newline='') as csvfile:
            fieldnames = ['first_name', 'last_name']
            writer = csv.DictWriter(csvfile, fieldnames=fieldnames)
 
@@ -270,7 +270,7 @@ The :mod:`csv` module defines the following classes:
 
 An example for :class:`Sniffer` use::
 
-   with open('example.csv') as csvfile:
+   with open('example.csv', newline='') as csvfile:
        dialect = csv.Sniffer().sniff(csvfile.read(1024))
        csvfile.seek(0)
        reader = csv.reader(csvfile, dialect)


From webhook-mailer at python.org  Thu Oct 26 04:38:20 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Thu, 26 Oct 2017 08:38:20 -0000
Subject: [Python-checkins] bpo-30937: Make usage of newline='' consistent in
 csv docs (GH-2730)
Message-ID: <mailman.49.1509007102.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/614ea48986f80d361043510ac3945f3dcd666c31
commit: 614ea48986f80d361043510ac3945f3dcd666c31
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Berker Peksag <berker.peksag at gmail.com>
date: 2017-10-26T11:38:14+03:00
summary:

bpo-30937: Make usage of newline='' consistent in csv docs (GH-2730)

(cherry picked from commit 275d2d9c4663a1ea8d1f7c8778567a735b0372c1)

files:
M Doc/library/csv.rst

diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
index 43714f74792..e1290d4c9b5 100644
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -172,7 +172,7 @@ The :mod:`csv` module defines the following classes:
    A short usage example::
 
        >>> import csv
-       >>> with open('names.csv') as csvfile:
+       >>> with open('names.csv', newline='') as csvfile:
        ...     reader = csv.DictReader(csvfile)
        ...     for row in reader:
        ...         print(row['first_name'], row['last_name'])
@@ -211,7 +211,7 @@ The :mod:`csv` module defines the following classes:
 
        import csv
 
-       with open('names.csv', 'w') as csvfile:
+       with open('names.csv', 'w', newline='') as csvfile:
            fieldnames = ['first_name', 'last_name']
            writer = csv.DictWriter(csvfile, fieldnames=fieldnames)
 
@@ -270,7 +270,7 @@ The :mod:`csv` module defines the following classes:
 
 An example for :class:`Sniffer` use::
 
-   with open('example.csv') as csvfile:
+   with open('example.csv', newline='') as csvfile:
        dialect = csv.Sniffer().sniff(csvfile.read(1024))
        csvfile.seek(0)
        reader = csv.reader(csvfile, dialect)


From webhook-mailer at python.org  Thu Oct 26 05:03:00 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 26 Oct 2017 09:03:00 -0000
Subject: [Python-checkins] [3.6] bpo-21720: Restore the Python 2.7 logic in
 handling a fromlist. (GH-4118) (#4128)
Message-ID: <mailman.50.1509008584.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/2b5cbbb13c6c9138d04c3ca4eb7431f8c65d8e65
commit: 2b5cbbb13c6c9138d04c3ca4eb7431f8c65d8e65
branch: 3.6
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-26T12:02:54+03:00
summary:

[3.6] bpo-21720: Restore the Python 2.7 logic in handling a fromlist. (GH-4118) (#4128)

BytesWarning no longer emitted when the fromlist argument of
__import__() or the __all__ attribute of the module contain bytes
instances..
(cherry picked from commit 41c56940c6edf3ea169332a6b039b6c8796f0475)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-25-15-51-37.bpo-21720.BwIKLP.rst
M Lib/importlib/_bootstrap.py
M Lib/test/test_importlib/import_/test_fromlist.py
M Python/importlib.h

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 4fc5f02f182..e2343dd4308 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -994,7 +994,7 @@ def _gcd_import(name, package=None, level=0):
     return _find_and_load(name, _gcd_import)
 
 
-def _handle_fromlist(module, fromlist, import_):
+def _handle_fromlist(module, fromlist, import_, *, recursive=False):
     """Figure out what __import__ should return.
 
     The import_ parameter is a callable which takes the name of module to
@@ -1005,13 +1005,19 @@ def _handle_fromlist(module, fromlist, import_):
     # The hell that is fromlist ...
     # If a package was imported, try to import stuff from fromlist.
     if hasattr(module, '__path__'):
-        if '*' in fromlist:
-            fromlist = list(fromlist)
-            fromlist.remove('*')
-            if hasattr(module, '__all__'):
-                fromlist.extend(module.__all__)
         for x in fromlist:
-            if not hasattr(module, x):
+            if not isinstance(x, str):
+                if recursive:
+                    where = module.__name__ + '.__all__'
+                else:
+                    where = "``from list''"
+                raise TypeError(f"Item in {where} must be str, "
+                                f"not {type(x).__name__}")
+            elif x == '*':
+                if not recursive and hasattr(module, '__all__'):
+                    _handle_fromlist(module, module.__all__, import_,
+                                     recursive=True)
+            elif not hasattr(module, x):
                 from_name = '{}.{}'.format(module.__name__, x)
                 try:
                     _call_with_frames_removed(import_, from_name)
diff --git a/Lib/test/test_importlib/import_/test_fromlist.py b/Lib/test/test_importlib/import_/test_fromlist.py
index 14640032b4c..018c1721761 100644
--- a/Lib/test/test_importlib/import_/test_fromlist.py
+++ b/Lib/test/test_importlib/import_/test_fromlist.py
@@ -1,5 +1,6 @@
 """Test that the semantics relating to the 'fromlist' argument are correct."""
 from .. import util
+import warnings
 import unittest
 
 
@@ -73,6 +74,13 @@ def test_module_from_package(self):
                 self.assertTrue(hasattr(module, 'module'))
                 self.assertEqual(module.module.__name__, 'pkg.module')
 
+    def test_nonexistent_from_package(self):
+        with util.mock_modules('pkg.__init__') as importer:
+            with util.import_state(meta_path=[importer]):
+                module = self.__import__('pkg', fromlist=['non_existent'])
+                self.assertEqual(module.__name__, 'pkg')
+                self.assertFalse(hasattr(module, 'non_existent'))
+
     def test_module_from_package_triggers_ModuleNotFoundError(self):
         # If a submodule causes an ModuleNotFoundError because it tries
         # to import a module which doesn't exist, that should let the
@@ -122,6 +130,41 @@ def test_star_with_others(self):
                 self.assertEqual(module.module1.__name__, 'pkg.module1')
                 self.assertEqual(module.module2.__name__, 'pkg.module2')
 
+    def test_nonexistent_in_all(self):
+        with util.mock_modules('pkg.__init__') as importer:
+            with util.import_state(meta_path=[importer]):
+                importer['pkg'].__all__ = ['non_existent']
+                module = self.__import__('pkg', fromlist=['*'])
+                self.assertEqual(module.__name__, 'pkg')
+                self.assertFalse(hasattr(module, 'non_existent'))
+
+    def test_star_in_all(self):
+        with util.mock_modules('pkg.__init__') as importer:
+            with util.import_state(meta_path=[importer]):
+                importer['pkg'].__all__ = ['*']
+                module = self.__import__('pkg', fromlist=['*'])
+                self.assertEqual(module.__name__, 'pkg')
+                self.assertFalse(hasattr(module, '*'))
+
+    def test_invalid_type(self):
+        with util.mock_modules('pkg.__init__') as importer:
+            with util.import_state(meta_path=[importer]), \
+                 warnings.catch_warnings():
+                warnings.simplefilter('error', BytesWarning)
+                with self.assertRaisesRegex(TypeError, r'\bfrom\b'):
+                    self.__import__('pkg', fromlist=[b'attr'])
+                with self.assertRaisesRegex(TypeError, r'\bfrom\b'):
+                    self.__import__('pkg', fromlist=iter([b'attr']))
+
+    def test_invalid_type_in_all(self):
+        with util.mock_modules('pkg.__init__') as importer:
+            with util.import_state(meta_path=[importer]), \
+                 warnings.catch_warnings():
+                warnings.simplefilter('error', BytesWarning)
+                importer['pkg'].__all__ = [b'attr']
+                with self.assertRaisesRegex(TypeError, r'\bpkg\.__all__\b'):
+                    self.__import__('pkg', fromlist=['*'])
+
 
 (Frozen_FromList,
  Source_FromList
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-25-15-51-37.bpo-21720.BwIKLP.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-25-15-51-37.bpo-21720.BwIKLP.rst
new file mode 100644
index 00000000000..02afea24200
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-25-15-51-37.bpo-21720.BwIKLP.rst	
@@ -0,0 +1,3 @@
+BytesWarning no longer emitted when the *fromlist* argument of
+``__import__()`` or the ``__all__`` attribute of the module contain bytes
+instances.
diff --git a/Python/importlib.h b/Python/importlib.h
index 81ae613567a..191197b8385 100644
--- a/Python/importlib.h
+++ b/Python/importlib.h
@@ -1,7 +1,7 @@
 /* Auto-generated by Programs/_freeze_importlib.c */
 const unsigned char _Py_M__importlib[] = {
     99,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,
-    0,64,0,0,0,115,202,1,0,0,100,0,90,0,100,1,
+    0,64,0,0,0,115,208,1,0,0,100,0,90,0,100,1,
     97,1,100,2,100,3,132,0,90,2,100,4,100,5,132,0,
     90,3,105,0,90,4,105,0,90,5,71,0,100,6,100,7,
     132,0,100,7,101,6,131,3,90,7,71,0,100,8,100,9,
@@ -14,7 +14,7 @@ const unsigned char _Py_M__importlib[] = {
     90,17,100,30,100,31,132,0,90,18,71,0,100,32,100,33,
     132,0,100,33,131,2,90,19,71,0,100,34,100,35,132,0,
     100,35,131,2,90,20,100,1,100,1,100,36,156,2,100,37,
-    100,38,132,2,90,21,100,92,100,39,100,40,132,1,90,22,
+    100,38,132,2,90,21,100,93,100,39,100,40,132,1,90,22,
     100,41,100,42,156,1,100,43,100,44,132,2,90,23,100,45,
     100,46,132,0,90,24,100,47,100,48,132,0,90,25,100,49,
     100,50,132,0,90,26,100,51,100,52,132,0,90,27,100,53,
@@ -22,1588 +22,1598 @@ const unsigned char _Py_M__importlib[] = {
     100,57,100,58,132,0,100,58,131,2,90,30,71,0,100,59,
     100,60,132,0,100,60,131,2,90,31,71,0,100,61,100,62,
     132,0,100,62,131,2,90,32,100,63,100,64,132,0,90,33,
-    100,65,100,66,132,0,90,34,100,93,100,67,100,68,132,1,
+    100,65,100,66,132,0,90,34,100,94,100,67,100,68,132,1,
     90,35,100,69,100,70,132,0,90,36,100,71,90,37,101,37,
     100,72,23,0,90,38,100,73,100,74,132,0,90,39,101,40,
-    131,0,90,41,100,75,100,76,132,0,90,42,100,94,100,78,
-    100,79,132,1,90,43,100,80,100,81,132,0,90,44,100,82,
-    100,83,132,0,90,45,100,1,100,1,102,0,100,77,102,4,
-    100,84,100,85,132,1,90,46,100,86,100,87,132,0,90,47,
-    100,88,100,89,132,0,90,48,100,90,100,91,132,0,90,49,
-    100,1,83,0,41,95,97,83,1,0,0,67,111,114,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,10,10,84,104,105,115,32,
-    109,111,100,117,108,101,32,105,115,32,78,79,84,32,109,101,
-    97,110,116,32,116,111,32,98,101,32,100,105,114,101,99,116,
-    108,121,32,105,109,112,111,114,116,101,100,33,32,73,116,32,
-    104,97,115,32,98,101,101,110,32,100,101,115,105,103,110,101,
-    100,32,115,117,99,104,10,116,104,97,116,32,105,116,32,99,
-    97,110,32,98,101,32,98,111,111,116,115,116,114,97,112,112,
-    101,100,32,105,110,116,111,32,80,121,116,104,111,110,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,32,
-    65,115,10,115,117,99,104,32,105,116,32,114,101,113,117,105,
-    114,101,115,32,116,104,101,32,105,110,106,101,99,116,105,111,
-    110,32,111,102,32,115,112,101,99,105,102,105,99,32,109,111,
-    100,117,108,101,115,32,97,110,100,32,97,116,116,114,105,98,
-    117,116,101,115,32,105,110,32,111,114,100,101,114,32,116,111,
-    10,119,111,114,107,46,32,79,110,101,32,115,104,111,117,108,
-    100,32,117,115,101,32,105,109,112,111,114,116,108,105,98,32,
-    97,115,32,116,104,101,32,112,117,98,108,105,99,45,102,97,
-    99,105,110,103,32,118,101,114,115,105,111,110,32,111,102,32,
-    116,104,105,115,32,109,111,100,117,108,101,46,10,10,78,99,
-    2,0,0,0,0,0,0,0,3,0,0,0,7,0,0,0,
-    67,0,0,0,115,60,0,0,0,120,40,100,6,68,0,93,
-    32,125,2,116,0,124,1,124,2,131,2,114,6,116,1,124,
-    0,124,2,116,2,124,1,124,2,131,2,131,3,1,0,113,
-    6,87,0,124,0,106,3,106,4,124,1,106,3,131,1,1,
-    0,100,5,83,0,41,7,122,47,83,105,109,112,108,101,32,
-    115,117,98,115,116,105,116,117,116,101,32,102,111,114,32,102,
-    117,110,99,116,111,111,108,115,46,117,112,100,97,116,101,95,
-    119,114,97,112,112,101,114,46,218,10,95,95,109,111,100,117,
-    108,101,95,95,218,8,95,95,110,97,109,101,95,95,218,12,
-    95,95,113,117,97,108,110,97,109,101,95,95,218,7,95,95,
-    100,111,99,95,95,78,41,4,114,0,0,0,0,114,1,0,
-    0,0,114,2,0,0,0,114,3,0,0,0,41,5,218,7,
-    104,97,115,97,116,116,114,218,7,115,101,116,97,116,116,114,
-    218,7,103,101,116,97,116,116,114,218,8,95,95,100,105,99,
-    116,95,95,218,6,117,112,100,97,116,101,41,3,90,3,110,
-    101,119,90,3,111,108,100,218,7,114,101,112,108,97,99,101,
-    169,0,114,10,0,0,0,250,29,60,102,114,111,122,101,110,
-    32,105,109,112,111,114,116,108,105,98,46,95,98,111,111,116,
-    115,116,114,97,112,62,218,5,95,119,114,97,112,27,0,0,
-    0,115,8,0,0,0,0,2,10,1,10,1,22,1,114,12,
-    0,0,0,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,116,
-    1,131,1,124,0,131,1,83,0,41,1,78,41,2,218,4,
-    116,121,112,101,218,3,115,121,115,41,1,218,4,110,97,109,
-    101,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
-    218,11,95,110,101,119,95,109,111,100,117,108,101,35,0,0,
-    0,115,2,0,0,0,0,1,114,16,0,0,0,99,0,0,
-    0,0,0,0,0,0,0,0,0,0,1,0,0,0,64,0,
-    0,0,115,12,0,0,0,101,0,90,1,100,0,90,2,100,
-    1,83,0,41,2,218,14,95,68,101,97,100,108,111,99,107,
-    69,114,114,111,114,78,41,3,114,1,0,0,0,114,0,0,
-    0,0,114,2,0,0,0,114,10,0,0,0,114,10,0,0,
-    0,114,10,0,0,0,114,11,0,0,0,114,17,0,0,0,
-    48,0,0,0,115,2,0,0,0,8,1,114,17,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,56,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,100,7,132,0,90,6,100,8,
-    100,9,132,0,90,7,100,10,100,11,132,0,90,8,100,12,
-    83,0,41,13,218,11,95,77,111,100,117,108,101,76,111,99,
-    107,122,169,65,32,114,101,99,117,114,115,105,118,101,32,108,
-    111,99,107,32,105,109,112,108,101,109,101,110,116,97,116,105,
-    111,110,32,119,104,105,99,104,32,105,115,32,97,98,108,101,
-    32,116,111,32,100,101,116,101,99,116,32,100,101,97,100,108,
-    111,99,107,115,10,32,32,32,32,40,101,46,103,46,32,116,
-    104,114,101,97,100,32,49,32,116,114,121,105,110,103,32,116,
-    111,32,116,97,107,101,32,108,111,99,107,115,32,65,32,116,
-    104,101,110,32,66,44,32,97,110,100,32,116,104,114,101,97,
-    100,32,50,32,116,114,121,105,110,103,32,116,111,10,32,32,
-    32,32,116,97,107,101,32,108,111,99,107,115,32,66,32,116,
-    104,101,110,32,65,41,46,10,32,32,32,32,99,2,0,0,
-    0,0,0,0,0,2,0,0,0,2,0,0,0,67,0,0,
-    0,115,48,0,0,0,116,0,106,1,131,0,124,0,95,2,
-    116,0,106,1,131,0,124,0,95,3,124,1,124,0,95,4,
-    100,0,124,0,95,5,100,1,124,0,95,6,100,1,124,0,
-    95,7,100,0,83,0,41,2,78,233,0,0,0,0,41,8,
-    218,7,95,116,104,114,101,97,100,90,13,97,108,108,111,99,
-    97,116,101,95,108,111,99,107,218,4,108,111,99,107,218,6,
-    119,97,107,101,117,112,114,15,0,0,0,218,5,111,119,110,
-    101,114,218,5,99,111,117,110,116,218,7,119,97,105,116,101,
-    114,115,41,2,218,4,115,101,108,102,114,15,0,0,0,114,
-    10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,8,
-    95,95,105,110,105,116,95,95,58,0,0,0,115,12,0,0,
-    0,0,1,10,1,10,1,6,1,6,1,6,1,122,20,95,
-    77,111,100,117,108,101,76,111,99,107,46,95,95,105,110,105,
-    116,95,95,99,1,0,0,0,0,0,0,0,4,0,0,0,
-    2,0,0,0,67,0,0,0,115,64,0,0,0,116,0,106,
-    1,131,0,125,1,124,0,106,2,125,2,120,44,116,3,106,
-    4,124,2,131,1,125,3,124,3,100,0,107,8,114,38,100,
-    1,83,0,124,3,106,2,125,2,124,2,124,1,107,2,114,
-    16,100,2,83,0,113,16,87,0,100,0,83,0,41,3,78,
-    70,84,41,5,114,20,0,0,0,218,9,103,101,116,95,105,
-    100,101,110,116,114,23,0,0,0,218,12,95,98,108,111,99,
-    107,105,110,103,95,111,110,218,3,103,101,116,41,4,114,26,
-    0,0,0,90,2,109,101,218,3,116,105,100,114,21,0,0,
-    0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
-    218,12,104,97,115,95,100,101,97,100,108,111,99,107,66,0,
-    0,0,115,18,0,0,0,0,2,8,1,6,1,2,1,10,
-    1,8,1,4,1,6,1,8,1,122,24,95,77,111,100,117,
-    108,101,76,111,99,107,46,104,97,115,95,100,101,97,100,108,
-    111,99,107,99,1,0,0,0,0,0,0,0,2,0,0,0,
-    16,0,0,0,67,0,0,0,115,168,0,0,0,116,0,106,
-    1,131,0,125,1,124,0,116,2,124,1,60,0,122,138,120,
-    132,124,0,106,3,143,96,1,0,124,0,106,4,100,1,107,
-    2,115,48,124,0,106,5,124,1,107,2,114,72,124,1,124,
-    0,95,5,124,0,4,0,106,4,100,2,55,0,2,0,95,
-    4,100,3,83,0,124,0,106,6,131,0,114,92,116,7,100,
-    4,124,0,22,0,131,1,130,1,124,0,106,8,106,9,100,
-    5,131,1,114,118,124,0,4,0,106,10,100,2,55,0,2,
-    0,95,10,87,0,100,6,81,0,82,0,88,0,124,0,106,
-    8,106,9,131,0,1,0,124,0,106,8,106,11,131,0,1,
-    0,113,20,87,0,87,0,100,6,116,2,124,1,61,0,88,
-    0,100,6,83,0,41,7,122,185,10,32,32,32,32,32,32,
-    32,32,65,99,113,117,105,114,101,32,116,104,101,32,109,111,
-    100,117,108,101,32,108,111,99,107,46,32,32,73,102,32,97,
-    32,112,111,116,101,110,116,105,97,108,32,100,101,97,100,108,
-    111,99,107,32,105,115,32,100,101,116,101,99,116,101,100,44,
-    10,32,32,32,32,32,32,32,32,97,32,95,68,101,97,100,
-    108,111,99,107,69,114,114,111,114,32,105,115,32,114,97,105,
-    115,101,100,46,10,32,32,32,32,32,32,32,32,79,116,104,
-    101,114,119,105,115,101,44,32,116,104,101,32,108,111,99,107,
-    32,105,115,32,97,108,119,97,121,115,32,97,99,113,117,105,
-    114,101,100,32,97,110,100,32,84,114,117,101,32,105,115,32,
-    114,101,116,117,114,110,101,100,46,10,32,32,32,32,32,32,
-    32,32,114,19,0,0,0,233,1,0,0,0,84,122,23,100,
-    101,97,100,108,111,99,107,32,100,101,116,101,99,116,101,100,
-    32,98,121,32,37,114,70,78,41,12,114,20,0,0,0,114,
-    28,0,0,0,114,29,0,0,0,114,21,0,0,0,114,24,
-    0,0,0,114,23,0,0,0,114,32,0,0,0,114,17,0,
-    0,0,114,22,0,0,0,218,7,97,99,113,117,105,114,101,
-    114,25,0,0,0,218,7,114,101,108,101,97,115,101,41,2,
-    114,26,0,0,0,114,31,0,0,0,114,10,0,0,0,114,
-    10,0,0,0,114,11,0,0,0,114,34,0,0,0,78,0,
-    0,0,115,32,0,0,0,0,6,8,1,8,1,2,1,2,
-    1,8,1,20,1,6,1,14,1,4,1,8,1,12,1,12,
-    1,24,2,10,1,18,2,122,19,95,77,111,100,117,108,101,
-    76,111,99,107,46,97,99,113,117,105,114,101,99,1,0,0,
-    0,0,0,0,0,2,0,0,0,10,0,0,0,67,0,0,
-    0,115,122,0,0,0,116,0,106,1,131,0,125,1,124,0,
-    106,2,143,98,1,0,124,0,106,3,124,1,107,3,114,34,
-    116,4,100,1,131,1,130,1,124,0,106,5,100,2,107,4,
-    115,48,116,6,130,1,124,0,4,0,106,5,100,3,56,0,
-    2,0,95,5,124,0,106,5,100,2,107,2,114,108,100,0,
-    124,0,95,3,124,0,106,7,114,108,124,0,4,0,106,7,
-    100,3,56,0,2,0,95,7,124,0,106,8,106,9,131,0,
-    1,0,87,0,100,0,81,0,82,0,88,0,100,0,83,0,
-    41,4,78,122,31,99,97,110,110,111,116,32,114,101,108,101,
-    97,115,101,32,117,110,45,97,99,113,117,105,114,101,100,32,
-    108,111,99,107,114,19,0,0,0,114,33,0,0,0,41,10,
-    114,20,0,0,0,114,28,0,0,0,114,21,0,0,0,114,
-    23,0,0,0,218,12,82,117,110,116,105,109,101,69,114,114,
-    111,114,114,24,0,0,0,218,14,65,115,115,101,114,116,105,
-    111,110,69,114,114,111,114,114,25,0,0,0,114,22,0,0,
-    0,114,35,0,0,0,41,2,114,26,0,0,0,114,31,0,
+    131,0,90,41,100,75,100,76,132,0,90,42,100,95,100,78,
+    100,79,132,1,90,43,100,41,100,80,156,1,100,81,100,82,
+    132,2,90,44,100,83,100,84,132,0,90,45,100,1,100,1,
+    102,0,100,77,102,4,100,85,100,86,132,1,90,46,100,87,
+    100,88,132,0,90,47,100,89,100,90,132,0,90,48,100,91,
+    100,92,132,0,90,49,100,1,83,0,41,96,97,83,1,0,
+    0,67,111,114,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,10,
+    10,84,104,105,115,32,109,111,100,117,108,101,32,105,115,32,
+    78,79,84,32,109,101,97,110,116,32,116,111,32,98,101,32,
+    100,105,114,101,99,116,108,121,32,105,109,112,111,114,116,101,
+    100,33,32,73,116,32,104,97,115,32,98,101,101,110,32,100,
+    101,115,105,103,110,101,100,32,115,117,99,104,10,116,104,97,
+    116,32,105,116,32,99,97,110,32,98,101,32,98,111,111,116,
+    115,116,114,97,112,112,101,100,32,105,110,116,111,32,80,121,
+    116,104,111,110,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,32,65,115,10,115,117,99,104,32,105,116,
+    32,114,101,113,117,105,114,101,115,32,116,104,101,32,105,110,
+    106,101,99,116,105,111,110,32,111,102,32,115,112,101,99,105,
+    102,105,99,32,109,111,100,117,108,101,115,32,97,110,100,32,
+    97,116,116,114,105,98,117,116,101,115,32,105,110,32,111,114,
+    100,101,114,32,116,111,10,119,111,114,107,46,32,79,110,101,
+    32,115,104,111,117,108,100,32,117,115,101,32,105,109,112,111,
+    114,116,108,105,98,32,97,115,32,116,104,101,32,112,117,98,
+    108,105,99,45,102,97,99,105,110,103,32,118,101,114,115,105,
+    111,110,32,111,102,32,116,104,105,115,32,109,111,100,117,108,
+    101,46,10,10,78,99,2,0,0,0,0,0,0,0,3,0,
+    0,0,7,0,0,0,67,0,0,0,115,60,0,0,0,120,
+    40,100,6,68,0,93,32,125,2,116,0,124,1,124,2,131,
+    2,114,6,116,1,124,0,124,2,116,2,124,1,124,2,131,
+    2,131,3,1,0,113,6,87,0,124,0,106,3,106,4,124,
+    1,106,3,131,1,1,0,100,5,83,0,41,7,122,47,83,
+    105,109,112,108,101,32,115,117,98,115,116,105,116,117,116,101,
+    32,102,111,114,32,102,117,110,99,116,111,111,108,115,46,117,
+    112,100,97,116,101,95,119,114,97,112,112,101,114,46,218,10,
+    95,95,109,111,100,117,108,101,95,95,218,8,95,95,110,97,
+    109,101,95,95,218,12,95,95,113,117,97,108,110,97,109,101,
+    95,95,218,7,95,95,100,111,99,95,95,78,41,4,114,0,
+    0,0,0,114,1,0,0,0,114,2,0,0,0,114,3,0,
+    0,0,41,5,218,7,104,97,115,97,116,116,114,218,7,115,
+    101,116,97,116,116,114,218,7,103,101,116,97,116,116,114,218,
+    8,95,95,100,105,99,116,95,95,218,6,117,112,100,97,116,
+    101,41,3,90,3,110,101,119,90,3,111,108,100,218,7,114,
+    101,112,108,97,99,101,169,0,114,10,0,0,0,250,29,60,
+    102,114,111,122,101,110,32,105,109,112,111,114,116,108,105,98,
+    46,95,98,111,111,116,115,116,114,97,112,62,218,5,95,119,
+    114,97,112,27,0,0,0,115,8,0,0,0,0,2,10,1,
+    10,1,22,1,114,12,0,0,0,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,116,1,131,1,124,0,131,1,83,0,41,
+    1,78,41,2,218,4,116,121,112,101,218,3,115,121,115,41,
+    1,218,4,110,97,109,101,114,10,0,0,0,114,10,0,0,
+    0,114,11,0,0,0,218,11,95,110,101,119,95,109,111,100,
+    117,108,101,35,0,0,0,115,2,0,0,0,0,1,114,16,
+    0,0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,
+    1,0,0,0,64,0,0,0,115,12,0,0,0,101,0,90,
+    1,100,0,90,2,100,1,83,0,41,2,218,14,95,68,101,
+    97,100,108,111,99,107,69,114,114,111,114,78,41,3,114,1,
+    0,0,0,114,0,0,0,0,114,2,0,0,0,114,10,0,
     0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,
-    0,114,35,0,0,0,103,0,0,0,115,22,0,0,0,0,
-    1,8,1,8,1,10,1,8,1,14,1,14,1,10,1,6,
-    1,6,1,14,1,122,19,95,77,111,100,117,108,101,76,111,
-    99,107,46,114,101,108,101,97,115,101,99,1,0,0,0,0,
-    0,0,0,1,0,0,0,4,0,0,0,67,0,0,0,115,
-    18,0,0,0,100,1,106,0,124,0,106,1,116,2,124,0,
-    131,1,131,2,83,0,41,2,78,122,23,95,77,111,100,117,
-    108,101,76,111,99,107,40,123,33,114,125,41,32,97,116,32,
-    123,125,41,3,218,6,102,111,114,109,97,116,114,15,0,0,
-    0,218,2,105,100,41,1,114,26,0,0,0,114,10,0,0,
-    0,114,10,0,0,0,114,11,0,0,0,218,8,95,95,114,
-    101,112,114,95,95,116,0,0,0,115,2,0,0,0,0,1,
-    122,20,95,77,111,100,117,108,101,76,111,99,107,46,95,95,
-    114,101,112,114,95,95,78,41,9,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,32,0,0,0,114,34,0,0,0,114,35,0,0,
-    0,114,40,0,0,0,114,10,0,0,0,114,10,0,0,0,
-    114,10,0,0,0,114,11,0,0,0,114,18,0,0,0,52,
-    0,0,0,115,12,0,0,0,8,4,4,2,8,8,8,12,
-    8,25,8,13,114,18,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,48,
-    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,100,7,132,0,90,6,100,8,100,9,132,0,90,7,100,
-    10,83,0,41,11,218,16,95,68,117,109,109,121,77,111,100,
-    117,108,101,76,111,99,107,122,86,65,32,115,105,109,112,108,
-    101,32,95,77,111,100,117,108,101,76,111,99,107,32,101,113,
-    117,105,118,97,108,101,110,116,32,102,111,114,32,80,121,116,
-    104,111,110,32,98,117,105,108,100,115,32,119,105,116,104,111,
-    117,116,10,32,32,32,32,109,117,108,116,105,45,116,104,114,
-    101,97,100,105,110,103,32,115,117,112,112,111,114,116,46,99,
-    2,0,0,0,0,0,0,0,2,0,0,0,2,0,0,0,
-    67,0,0,0,115,16,0,0,0,124,1,124,0,95,0,100,
-    1,124,0,95,1,100,0,83,0,41,2,78,114,19,0,0,
-    0,41,2,114,15,0,0,0,114,24,0,0,0,41,2,114,
-    26,0,0,0,114,15,0,0,0,114,10,0,0,0,114,10,
-    0,0,0,114,11,0,0,0,114,27,0,0,0,124,0,0,
-    0,115,4,0,0,0,0,1,6,1,122,25,95,68,117,109,
-    109,121,77,111,100,117,108,101,76,111,99,107,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,18,0,0,0,124,
-    0,4,0,106,0,100,1,55,0,2,0,95,0,100,2,83,
-    0,41,3,78,114,33,0,0,0,84,41,1,114,24,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,34,0,0,0,128,0,0,0,
-    115,4,0,0,0,0,1,14,1,122,24,95,68,117,109,109,
-    121,77,111,100,117,108,101,76,111,99,107,46,97,99,113,117,
-    105,114,101,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,2,114,18,116,1,100,2,131,1,130,1,124,
-    0,4,0,106,0,100,3,56,0,2,0,95,0,100,0,83,
-    0,41,4,78,114,19,0,0,0,122,31,99,97,110,110,111,
+    0,114,17,0,0,0,48,0,0,0,115,2,0,0,0,8,
+    1,114,17,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,56,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,100,7,
+    132,0,90,6,100,8,100,9,132,0,90,7,100,10,100,11,
+    132,0,90,8,100,12,83,0,41,13,218,11,95,77,111,100,
+    117,108,101,76,111,99,107,122,169,65,32,114,101,99,117,114,
+    115,105,118,101,32,108,111,99,107,32,105,109,112,108,101,109,
+    101,110,116,97,116,105,111,110,32,119,104,105,99,104,32,105,
+    115,32,97,98,108,101,32,116,111,32,100,101,116,101,99,116,
+    32,100,101,97,100,108,111,99,107,115,10,32,32,32,32,40,
+    101,46,103,46,32,116,104,114,101,97,100,32,49,32,116,114,
+    121,105,110,103,32,116,111,32,116,97,107,101,32,108,111,99,
+    107,115,32,65,32,116,104,101,110,32,66,44,32,97,110,100,
+    32,116,104,114,101,97,100,32,50,32,116,114,121,105,110,103,
+    32,116,111,10,32,32,32,32,116,97,107,101,32,108,111,99,
+    107,115,32,66,32,116,104,101,110,32,65,41,46,10,32,32,
+    32,32,99,2,0,0,0,0,0,0,0,2,0,0,0,2,
+    0,0,0,67,0,0,0,115,48,0,0,0,116,0,106,1,
+    131,0,124,0,95,2,116,0,106,1,131,0,124,0,95,3,
+    124,1,124,0,95,4,100,0,124,0,95,5,100,1,124,0,
+    95,6,100,1,124,0,95,7,100,0,83,0,41,2,78,233,
+    0,0,0,0,41,8,218,7,95,116,104,114,101,97,100,90,
+    13,97,108,108,111,99,97,116,101,95,108,111,99,107,218,4,
+    108,111,99,107,218,6,119,97,107,101,117,112,114,15,0,0,
+    0,218,5,111,119,110,101,114,218,5,99,111,117,110,116,218,
+    7,119,97,105,116,101,114,115,41,2,218,4,115,101,108,102,
+    114,15,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
+    11,0,0,0,218,8,95,95,105,110,105,116,95,95,58,0,
+    0,0,115,12,0,0,0,0,1,10,1,10,1,6,1,6,
+    1,6,1,122,20,95,77,111,100,117,108,101,76,111,99,107,
+    46,95,95,105,110,105,116,95,95,99,1,0,0,0,0,0,
+    0,0,4,0,0,0,2,0,0,0,67,0,0,0,115,64,
+    0,0,0,116,0,106,1,131,0,125,1,124,0,106,2,125,
+    2,120,44,116,3,106,4,124,2,131,1,125,3,124,3,100,
+    0,107,8,114,38,100,1,83,0,124,3,106,2,125,2,124,
+    2,124,1,107,2,114,16,100,2,83,0,113,16,87,0,100,
+    0,83,0,41,3,78,70,84,41,5,114,20,0,0,0,218,
+    9,103,101,116,95,105,100,101,110,116,114,23,0,0,0,218,
+    12,95,98,108,111,99,107,105,110,103,95,111,110,218,3,103,
+    101,116,41,4,114,26,0,0,0,90,2,109,101,218,3,116,
+    105,100,114,21,0,0,0,114,10,0,0,0,114,10,0,0,
+    0,114,11,0,0,0,218,12,104,97,115,95,100,101,97,100,
+    108,111,99,107,66,0,0,0,115,18,0,0,0,0,2,8,
+    1,6,1,2,1,10,1,8,1,4,1,6,1,8,1,122,
+    24,95,77,111,100,117,108,101,76,111,99,107,46,104,97,115,
+    95,100,101,97,100,108,111,99,107,99,1,0,0,0,0,0,
+    0,0,2,0,0,0,16,0,0,0,67,0,0,0,115,168,
+    0,0,0,116,0,106,1,131,0,125,1,124,0,116,2,124,
+    1,60,0,122,138,120,132,124,0,106,3,143,96,1,0,124,
+    0,106,4,100,1,107,2,115,48,124,0,106,5,124,1,107,
+    2,114,72,124,1,124,0,95,5,124,0,4,0,106,4,100,
+    2,55,0,2,0,95,4,100,3,83,0,124,0,106,6,131,
+    0,114,92,116,7,100,4,124,0,22,0,131,1,130,1,124,
+    0,106,8,106,9,100,5,131,1,114,118,124,0,4,0,106,
+    10,100,2,55,0,2,0,95,10,87,0,100,6,81,0,82,
+    0,88,0,124,0,106,8,106,9,131,0,1,0,124,0,106,
+    8,106,11,131,0,1,0,113,20,87,0,87,0,100,6,116,
+    2,124,1,61,0,88,0,100,6,83,0,41,7,122,185,10,
+    32,32,32,32,32,32,32,32,65,99,113,117,105,114,101,32,
+    116,104,101,32,109,111,100,117,108,101,32,108,111,99,107,46,
+    32,32,73,102,32,97,32,112,111,116,101,110,116,105,97,108,
+    32,100,101,97,100,108,111,99,107,32,105,115,32,100,101,116,
+    101,99,116,101,100,44,10,32,32,32,32,32,32,32,32,97,
+    32,95,68,101,97,100,108,111,99,107,69,114,114,111,114,32,
+    105,115,32,114,97,105,115,101,100,46,10,32,32,32,32,32,
+    32,32,32,79,116,104,101,114,119,105,115,101,44,32,116,104,
+    101,32,108,111,99,107,32,105,115,32,97,108,119,97,121,115,
+    32,97,99,113,117,105,114,101,100,32,97,110,100,32,84,114,
+    117,101,32,105,115,32,114,101,116,117,114,110,101,100,46,10,
+    32,32,32,32,32,32,32,32,114,19,0,0,0,233,1,0,
+    0,0,84,122,23,100,101,97,100,108,111,99,107,32,100,101,
+    116,101,99,116,101,100,32,98,121,32,37,114,70,78,41,12,
+    114,20,0,0,0,114,28,0,0,0,114,29,0,0,0,114,
+    21,0,0,0,114,24,0,0,0,114,23,0,0,0,114,32,
+    0,0,0,114,17,0,0,0,114,22,0,0,0,218,7,97,
+    99,113,117,105,114,101,114,25,0,0,0,218,7,114,101,108,
+    101,97,115,101,41,2,114,26,0,0,0,114,31,0,0,0,
+    114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,
+    34,0,0,0,78,0,0,0,115,32,0,0,0,0,6,8,
+    1,8,1,2,1,2,1,8,1,20,1,6,1,14,1,4,
+    1,8,1,12,1,12,1,24,2,10,1,18,2,122,19,95,
+    77,111,100,117,108,101,76,111,99,107,46,97,99,113,117,105,
+    114,101,99,1,0,0,0,0,0,0,0,2,0,0,0,10,
+    0,0,0,67,0,0,0,115,122,0,0,0,116,0,106,1,
+    131,0,125,1,124,0,106,2,143,98,1,0,124,0,106,3,
+    124,1,107,3,114,34,116,4,100,1,131,1,130,1,124,0,
+    106,5,100,2,107,4,115,48,116,6,130,1,124,0,4,0,
+    106,5,100,3,56,0,2,0,95,5,124,0,106,5,100,2,
+    107,2,114,108,100,0,124,0,95,3,124,0,106,7,114,108,
+    124,0,4,0,106,7,100,3,56,0,2,0,95,7,124,0,
+    106,8,106,9,131,0,1,0,87,0,100,0,81,0,82,0,
+    88,0,100,0,83,0,41,4,78,122,31,99,97,110,110,111,
     116,32,114,101,108,101,97,115,101,32,117,110,45,97,99,113,
-    117,105,114,101,100,32,108,111,99,107,114,33,0,0,0,41,
-    2,114,24,0,0,0,114,36,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,35,0,0,0,132,0,0,0,115,6,0,0,0,0,
-    1,10,1,8,1,122,24,95,68,117,109,109,121,77,111,100,
-    117,108,101,76,111,99,107,46,114,101,108,101,97,115,101,99,
-    1,0,0,0,0,0,0,0,1,0,0,0,4,0,0,0,
-    67,0,0,0,115,18,0,0,0,100,1,106,0,124,0,106,
-    1,116,2,124,0,131,1,131,2,83,0,41,2,78,122,28,
-    95,68,117,109,109,121,77,111,100,117,108,101,76,111,99,107,
-    40,123,33,114,125,41,32,97,116,32,123,125,41,3,114,38,
-    0,0,0,114,15,0,0,0,114,39,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,40,0,0,0,137,0,0,0,115,2,0,0,
-    0,0,1,122,25,95,68,117,109,109,121,77,111,100,117,108,
-    101,76,111,99,107,46,95,95,114,101,112,114,95,95,78,41,
-    8,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,34,0,0,0,114,
-    35,0,0,0,114,40,0,0,0,114,10,0,0,0,114,10,
-    0,0,0,114,10,0,0,0,114,11,0,0,0,114,41,0,
-    0,0,120,0,0,0,115,10,0,0,0,8,2,4,2,8,
-    4,8,4,8,5,114,41,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,18,95,77,111,100,
-    117,108,101,76,111,99,107,77,97,110,97,103,101,114,99,2,
-    0,0,0,0,0,0,0,2,0,0,0,2,0,0,0,67,
-    0,0,0,115,16,0,0,0,124,1,124,0,95,0,100,0,
-    124,0,95,1,100,0,83,0,41,1,78,41,2,218,5,95,
-    110,97,109,101,218,5,95,108,111,99,107,41,2,114,26,0,
-    0,0,114,15,0,0,0,114,10,0,0,0,114,10,0,0,
-    0,114,11,0,0,0,114,27,0,0,0,143,0,0,0,115,
-    4,0,0,0,0,1,6,1,122,27,95,77,111,100,117,108,
-    101,76,111,99,107,77,97,110,97,103,101,114,46,95,95,105,
-    110,105,116,95,95,99,1,0,0,0,0,0,0,0,1,0,
-    0,0,2,0,0,0,67,0,0,0,115,26,0,0,0,116,
-    0,124,0,106,1,131,1,124,0,95,2,124,0,106,2,106,
-    3,131,0,1,0,100,0,83,0,41,1,78,41,4,218,16,
-    95,103,101,116,95,109,111,100,117,108,101,95,108,111,99,107,
-    114,43,0,0,0,114,44,0,0,0,114,34,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,218,9,95,95,101,110,116,101,114,95,95,
-    147,0,0,0,115,4,0,0,0,0,1,12,1,122,28,95,
-    77,111,100,117,108,101,76,111,99,107,77,97,110,97,103,101,
-    114,46,95,95,101,110,116,101,114,95,95,99,1,0,0,0,
-    0,0,0,0,3,0,0,0,1,0,0,0,79,0,0,0,
-    115,14,0,0,0,124,0,106,0,106,1,131,0,1,0,100,
-    0,83,0,41,1,78,41,2,114,44,0,0,0,114,35,0,
-    0,0,41,3,114,26,0,0,0,218,4,97,114,103,115,90,
-    6,107,119,97,114,103,115,114,10,0,0,0,114,10,0,0,
-    0,114,11,0,0,0,218,8,95,95,101,120,105,116,95,95,
-    151,0,0,0,115,2,0,0,0,0,1,122,27,95,77,111,
-    100,117,108,101,76,111,99,107,77,97,110,97,103,101,114,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,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,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,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,
-    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,65,99,113,117,105,114,101,47,114,101,108,101,97,115,
-    101,32,105,110,116,101,114,110,97,108,108,121,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,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,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,
+    117,105,114,101,100,32,108,111,99,107,114,19,0,0,0,114,
+    33,0,0,0,41,10,114,20,0,0,0,114,28,0,0,0,
+    114,21,0,0,0,114,23,0,0,0,218,12,82,117,110,116,
+    105,109,101,69,114,114,111,114,114,24,0,0,0,218,14,65,
+    115,115,101,114,116,105,111,110,69,114,114,111,114,114,25,0,
+    0,0,114,22,0,0,0,114,35,0,0,0,41,2,114,26,
+    0,0,0,114,31,0,0,0,114,10,0,0,0,114,10,0,
+    0,0,114,11,0,0,0,114,35,0,0,0,103,0,0,0,
+    115,22,0,0,0,0,1,8,1,8,1,10,1,8,1,14,
+    1,14,1,10,1,6,1,6,1,14,1,122,19,95,77,111,
+    100,117,108,101,76,111,99,107,46,114,101,108,101,97,115,101,
+    99,1,0,0,0,0,0,0,0,1,0,0,0,4,0,0,
+    0,67,0,0,0,115,18,0,0,0,100,1,106,0,124,0,
+    106,1,116,2,124,0,131,1,131,2,83,0,41,2,78,122,
+    23,95,77,111,100,117,108,101,76,111,99,107,40,123,33,114,
+    125,41,32,97,116,32,123,125,41,3,218,6,102,111,114,109,
+    97,116,114,15,0,0,0,218,2,105,100,41,1,114,26,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,218,8,95,95,114,101,112,114,95,95,116,0,0,0,115,
+    2,0,0,0,0,1,122,20,95,77,111,100,117,108,101,76,
+    111,99,107,46,95,95,114,101,112,114,95,95,78,41,9,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,32,0,0,0,114,34,0,
+    0,0,114,35,0,0,0,114,40,0,0,0,114,10,0,0,
+    0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
+    114,18,0,0,0,52,0,0,0,115,12,0,0,0,8,4,
+    4,2,8,8,8,12,8,25,8,13,114,18,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,48,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,100,7,132,0,90,6,100,8,100,
+    9,132,0,90,7,100,10,83,0,41,11,218,16,95,68,117,
+    109,109,121,77,111,100,117,108,101,76,111,99,107,122,86,65,
+    32,115,105,109,112,108,101,32,95,77,111,100,117,108,101,76,
+    111,99,107,32,101,113,117,105,118,97,108,101,110,116,32,102,
+    111,114,32,80,121,116,104,111,110,32,98,117,105,108,100,115,
+    32,119,105,116,104,111,117,116,10,32,32,32,32,109,117,108,
+    116,105,45,116,104,114,101,97,100,105,110,103,32,115,117,112,
+    112,111,114,116,46,99,2,0,0,0,0,0,0,0,2,0,
+    0,0,2,0,0,0,67,0,0,0,115,16,0,0,0,124,
+    1,124,0,95,0,100,1,124,0,95,1,100,0,83,0,41,
+    2,78,114,19,0,0,0,41,2,114,15,0,0,0,114,24,
+    0,0,0,41,2,114,26,0,0,0,114,15,0,0,0,114,
+    10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,27,
+    0,0,0,124,0,0,0,115,4,0,0,0,0,1,6,1,
+    122,25,95,68,117,109,109,121,77,111,100,117,108,101,76,111,
+    99,107,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,
-    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,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,
+    115,18,0,0,0,124,0,4,0,106,0,100,1,55,0,2,
+    0,95,0,100,2,83,0,41,3,78,114,33,0,0,0,84,
+    41,1,114,24,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,34,0,
+    0,0,128,0,0,0,115,4,0,0,0,0,1,14,1,122,
+    24,95,68,117,109,109,121,77,111,100,117,108,101,76,111,99,
+    107,46,97,99,113,117,105,114,101,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,2,114,18,116,1,100,
+    2,131,1,130,1,124,0,4,0,106,0,100,3,56,0,2,
+    0,95,0,100,0,83,0,41,4,78,114,19,0,0,0,122,
+    31,99,97,110,110,111,116,32,114,101,108,101,97,115,101,32,
+    117,110,45,97,99,113,117,105,114,101,100,32,108,111,99,107,
+    114,33,0,0,0,41,2,114,24,0,0,0,114,36,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,35,0,0,0,132,0,0,0,
+    115,6,0,0,0,0,1,10,1,8,1,122,24,95,68,117,
+    109,109,121,77,111,100,117,108,101,76,111,99,107,46,114,101,
+    108,101,97,115,101,99,1,0,0,0,0,0,0,0,1,0,
+    0,0,4,0,0,0,67,0,0,0,115,18,0,0,0,100,
+    1,106,0,124,0,106,1,116,2,124,0,131,1,131,2,83,
+    0,41,2,78,122,28,95,68,117,109,109,121,77,111,100,117,
+    108,101,76,111,99,107,40,123,33,114,125,41,32,97,116,32,
+    123,125,41,3,114,38,0,0,0,114,15,0,0,0,114,39,
+    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,40,0,0,0,137,0,
+    0,0,115,2,0,0,0,0,1,122,25,95,68,117,109,109,
+    121,77,111,100,117,108,101,76,111,99,107,46,95,95,114,101,
+    112,114,95,95,78,41,8,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,34,0,0,0,114,35,0,0,0,114,40,0,0,0,114,
+    10,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
+    0,0,0,114,41,0,0,0,120,0,0,0,115,10,0,0,
+    0,8,2,4,2,8,4,8,4,8,5,114,41,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,18,95,77,111,100,117,108,101,76,111,99,107,77,97,110,
+    97,103,101,114,99,2,0,0,0,0,0,0,0,2,0,0,
+    0,2,0,0,0,67,0,0,0,115,16,0,0,0,124,1,
+    124,0,95,0,100,0,124,0,95,1,100,0,83,0,41,1,
+    78,41,2,218,5,95,110,97,109,101,218,5,95,108,111,99,
+    107,41,2,114,26,0,0,0,114,15,0,0,0,114,10,0,
+    0,0,114,10,0,0,0,114,11,0,0,0,114,27,0,0,
+    0,143,0,0,0,115,4,0,0,0,0,1,6,1,122,27,
+    95,77,111,100,117,108,101,76,111,99,107,77,97,110,97,103,
+    101,114,46,95,95,105,110,105,116,95,95,99,1,0,0,0,
+    0,0,0,0,1,0,0,0,2,0,0,0,67,0,0,0,
+    115,26,0,0,0,116,0,124,0,106,1,131,1,124,0,95,
+    2,124,0,106,2,106,3,131,0,1,0,100,0,83,0,41,
+    1,78,41,4,218,16,95,103,101,116,95,109,111,100,117,108,
+    101,95,108,111,99,107,114,43,0,0,0,114,44,0,0,0,
+    114,34,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,218,9,95,95,101,
+    110,116,101,114,95,95,147,0,0,0,115,4,0,0,0,0,
+    1,12,1,122,28,95,77,111,100,117,108,101,76,111,99,107,
+    77,97,110,97,103,101,114,46,95,95,101,110,116,101,114,95,
+    95,99,1,0,0,0,0,0,0,0,3,0,0,0,1,0,
+    0,0,79,0,0,0,115,14,0,0,0,124,0,106,0,106,
+    1,131,0,1,0,100,0,83,0,41,1,78,41,2,114,44,
+    0,0,0,114,35,0,0,0,41,3,114,26,0,0,0,218,
+    4,97,114,103,115,90,6,107,119,97,114,103,115,114,10,0,
+    0,0,114,10,0,0,0,114,11,0,0,0,218,8,95,95,
+    101,120,105,116,95,95,151,0,0,0,115,2,0,0,0,0,
+    1,122,27,95,77,111,100,117,108,101,76,111,99,107,77,97,
+    110,97,103,101,114,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,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,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,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,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,65,99,113,117,105,114,101,47,
+    114,101,108,101,97,115,101,32,105,110,116,101,114,110,97,108,
+    108,121,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,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,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,
-    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,
+    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,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,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,
+    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,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,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,
-    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,
+    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,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,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,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,
+    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,
-    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,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,
+    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,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,
+    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,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,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,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,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,
+    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,106,0,0,0,62,
+    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,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,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,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,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,182,0,0,0,116,0,124,0,100,1,131,2,114,
-    178,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,118,124,1,68,0,93,110,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,172,1,0,125,5,1,
-    0,122,38,124,5,106,9,124,4,107,2,114,154,116,10,106,
-    11,106,12,124,4,116,13,131,2,100,5,107,9,114,154,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,14,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,114,14,0,0,0,114,80,0,0,0,114,30,0,0,
-    0,114,180,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,34,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,18,1,2,1,24,1,114,189,0,0,0,
+    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,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,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,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,41,1,218,9,114,101,99,117,114,115,105,118,101,
+    99,3,0,0,0,1,0,0,0,8,0,0,0,17,0,0,
+    0,67,0,0,0,115,236,0,0,0,116,0,124,0,100,1,
+    131,2,114,232,120,220,124,1,68,0,93,212,125,4,116,1,
+    124,4,116,2,131,2,115,78,124,3,114,46,124,0,106,3,
+    100,2,23,0,125,5,110,4,100,3,125,5,116,4,100,4,
+    124,5,155,0,100,5,116,5,124,4,131,1,106,3,155,0,
+    157,4,131,1,130,1,113,16,124,4,100,6,107,2,114,122,
+    124,3,12,0,114,228,116,0,124,0,100,7,131,2,114,228,
+    116,6,124,0,124,0,106,7,124,2,100,8,100,9,141,4,
+    1,0,113,16,116,0,124,0,124,4,131,2,115,16,100,10,
+    106,8,124,0,106,3,124,4,131,2,125,6,121,14,116,9,
+    124,2,124,6,131,2,1,0,87,0,113,16,4,0,116,10,
+    107,10,114,226,1,0,125,7,1,0,122,38,124,7,106,11,
+    124,6,107,2,114,208,116,12,106,13,106,14,124,6,116,15,
+    131,2,100,11,107,9,114,208,119,16,130,0,87,0,89,0,
+    100,11,100,11,125,7,126,7,88,0,113,16,88,0,113,16,
+    87,0,124,0,83,0,41,12,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,122,8,46,
+    95,95,97,108,108,95,95,122,13,96,96,102,114,111,109,32,
+    108,105,115,116,39,39,122,8,73,116,101,109,32,105,110,32,
+    122,18,32,109,117,115,116,32,98,101,32,115,116,114,44,32,
+    110,111,116,32,250,1,42,218,7,95,95,97,108,108,95,95,
+    84,41,1,114,183,0,0,0,122,5,123,125,46,123,125,78,
+    41,16,114,4,0,0,0,114,171,0,0,0,114,172,0,0,
+    0,114,1,0,0,0,114,173,0,0,0,114,13,0,0,0,
+    218,16,95,104,97,110,100,108,101,95,102,114,111,109,108,105,
+    115,116,114,185,0,0,0,114,38,0,0,0,114,59,0,0,
+    0,114,177,0,0,0,114,15,0,0,0,114,14,0,0,0,
+    114,80,0,0,0,114,30,0,0,0,114,180,0,0,0,41,
+    8,114,84,0,0,0,218,8,102,114,111,109,108,105,115,116,
+    114,178,0,0,0,114,183,0,0,0,218,1,120,90,5,119,
+    104,101,114,101,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,114,186,0,0,0,229,3,0,0,115,42,0,0,
+    0,0,10,10,1,10,1,10,1,4,1,12,2,4,1,28,
+    2,8,1,16,1,10,1,10,1,10,1,14,1,2,1,14,
+    1,16,4,10,1,18,1,2,1,24,1,114,186,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,
@@ -1642,9 +1652,9 @@ const unsigned char _Py_M__importlib[] = {
     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,5,4,0,0,115,30,0,0,0,0,
+    107,97,103,101,95,95,11,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,
+    1,6,2,6,2,10,1,8,1,8,1,14,1,114,192,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,
@@ -1688,17 +1698,17 @@ const unsigned char _Py_M__importlib[] = {
     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,
+    0,0,114,192,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,
+    0,114,1,0,0,0,114,186,0,0,0,41,9,114,15,0,
+    0,0,114,191,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,32,4,0,0,115,26,0,0,0,0,11,8,1,10,2,
+    95,38,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,
+    26,3,32,2,114,195,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,
@@ -1708,8 +1718,8 @@ const unsigned char _Py_M__importlib[] = {
     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,67,4,0,0,
-    115,8,0,0,0,0,1,10,1,8,1,12,1,114,197,0,
+    105,110,95,102,114,111,109,95,110,97,109,101,73,4,0,0,
+    115,8,0,0,0,0,1,10,1,8,1,12,1,114,196,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,
@@ -1748,7 +1758,7 @@ const unsigned char _Py_M__importlib[] = {
     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,
+    114,134,0,0,0,114,1,0,0,0,114,196,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,
@@ -1759,11 +1769,11 @@ const unsigned char _Py_M__importlib[] = {
     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,74,4,0,0,115,50,0,0,0,0,
+    95,115,101,116,117,112,80,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,
+    1,114,200,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,
@@ -1773,15 +1783,15 @@ const unsigned char _Py_M__importlib[] = {
     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,
+    114,200,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,121,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,0,41,3,114,198,0,0,0,114,199,0,0,0,114,
+    201,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,
+    0,0,0,114,202,0,0,0,127,4,0,0,115,12,0,0,
+    0,0,2,10,2,12,1,12,3,8,1,4,1,114,202,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,
@@ -1797,9 +1807,9 @@ const unsigned char _Py_M__importlib[] = {
     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,
+    180,0,0,0,114,181,0,0,0,114,182,0,0,0,114,186,
+    0,0,0,114,192,0,0,0,114,195,0,0,0,114,196,0,
+    0,0,114,200,0,0,0,114,202,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,
@@ -1807,6 +1817,6 @@ const unsigned char _Py_M__importlib[] = {
     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,32,8,27,18,35,8,7,8,
+    27,6,3,8,16,10,15,14,38,8,27,18,35,8,7,8,
     47,
 };


From solipsis at pitrou.net  Thu Oct 26 05:07:00 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 26 Oct 2017 09:07:00 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=11
Message-ID: <20171026090657.102026.A534DAF55FFDBF8C@psf.io>

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

test_collections leaked [0, 7, 0] memory blocks, sum=7
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=0


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

From webhook-mailer at python.org  Thu Oct 26 09:09:09 2017
From: webhook-mailer at python.org (xdegaye)
Date: Thu, 26 Oct 2017 13:09:09 -0000
Subject: [Python-checkins] bpo-30697: Fix PyErr_NormalizeException() when no
 memory (GH-2327)
Message-ID: <mailman.51.1509023351.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/56d1f5ca32892c7643eb8cee49c40c1644f1abfe
commit: 56d1f5ca32892c7643eb8cee49c40c1644f1abfe
branch: master
author: xdegaye <xdegaye at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-26T15:09:06+02:00
summary:

bpo-30697: Fix PyErr_NormalizeException() when no memory (GH-2327)

files:
A Misc/NEWS.d/next/C API/2017-06-30-11-58-01.bpo-30697.Q3T_8n.rst
M Doc/whatsnew/3.7.rst
M Include/pyerrors.h
M Lib/test/test_exceptions.py
M Modules/_testcapimodule.c
M Objects/exceptions.c
M PC/python3.def
M Python/errors.c

diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index 17e4e0a8813..d3c3c1f7537 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -440,6 +440,11 @@ Build and C API Changes
   download a copy of 32-bit Python for this purpose.  (Contributed by Zachary
   Ware in :issue:`30450`.)
 
+* The ``PyExc_RecursionErrorInst`` singleton that was part of the public API
+  has been removed as its members being never cleared may cause a segfault
+  during finalization of the interpreter. Contributed by Xavier de Gaye in
+  :issue:`22898` and :issue:`30697`.
+
 * Support for building ``--without-threads`` is removed.
   (Contributed by Antoine Pitrou in :issue:`31370`.).
 
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index 94182012246..f289471be20 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -220,8 +220,6 @@ PyAPI_DATA(PyObject *) PyExc_IOError;
 PyAPI_DATA(PyObject *) PyExc_WindowsError;
 #endif
 
-PyAPI_DATA(PyObject *) PyExc_RecursionErrorInst;
-
 /* Predefined warning categories */
 PyAPI_DATA(PyObject *) PyExc_Warning;
 PyAPI_DATA(PyObject *) PyExc_UserWarning;
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index cef8d44ffaa..8dceb5c8e79 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -10,8 +10,8 @@
 
 from test.support import (TESTFN, captured_stderr, check_impl_detail,
                           check_warnings, cpython_only, gc_collect, run_unittest,
-                          no_tracing, unlink, import_module, script_helper)
-
+                          no_tracing, unlink, import_module, script_helper,
+                          SuppressCrashReport)
 class NaiveException(Exception):
     def __init__(self, x):
         self.x = x
@@ -936,6 +936,105 @@ def g():
         self.assertIsInstance(v, RecursionError, type(v))
         self.assertIn("maximum recursion depth exceeded", str(v))
 
+    @cpython_only
+    def test_recursion_normalizing_exception(self):
+        # Issue #22898.
+        # Test that a RecursionError is raised when tstate->recursion_depth is
+        # equal to recursion_limit in PyErr_NormalizeException() and check
+        # that a ResourceWarning is printed.
+        # Prior to #22898, the recursivity of PyErr_NormalizeException() was
+        # controled by tstate->recursion_depth and a PyExc_RecursionErrorInst
+        # singleton was being used in that case, that held traceback data and
+        # locals indefinitely and would cause a segfault in _PyExc_Fini() upon
+        # finalization of these locals.
+        code = """if 1:
+            import sys
+            from _testcapi import get_recursion_depth
+
+            class MyException(Exception): pass
+
+            def setrecursionlimit(depth):
+                while 1:
+                    try:
+                        sys.setrecursionlimit(depth)
+                        return depth
+                    except RecursionError:
+                        # sys.setrecursionlimit() raises a RecursionError if
+                        # the new recursion limit is too low (issue #25274).
+                        depth += 1
+
+            def recurse(cnt):
+                cnt -= 1
+                if cnt:
+                    recurse(cnt)
+                else:
+                    generator.throw(MyException)
+
+            def gen():
+                f = open(%a, mode='rb', buffering=0)
+                yield
+
+            generator = gen()
+            next(generator)
+            recursionlimit = sys.getrecursionlimit()
+            depth = get_recursion_depth()
+            try:
+                # Upon the last recursive invocation of recurse(),
+                # tstate->recursion_depth is equal to (recursion_limit - 1)
+                # and is equal to recursion_limit when _gen_throw() calls
+                # PyErr_NormalizeException().
+                recurse(setrecursionlimit(depth + 2) - depth - 1)
+            finally:
+                sys.setrecursionlimit(recursionlimit)
+                print('Done.')
+        """ % __file__
+        rc, out, err = script_helper.assert_python_failure("-Wd", "-c", code)
+        # Check that the program does not fail with SIGABRT.
+        self.assertEqual(rc, 1)
+        self.assertIn(b'RecursionError', err)
+        self.assertIn(b'ResourceWarning', err)
+        self.assertIn(b'Done.', out)
+
+    @cpython_only
+    def test_recursion_normalizing_infinite_exception(self):
+        # Issue #30697. Test that a RecursionError is raised when
+        # PyErr_NormalizeException() maximum recursion depth has been
+        # exceeded.
+        code = """if 1:
+            import _testcapi
+            try:
+                raise _testcapi.RecursingInfinitelyError
+            finally:
+                print('Done.')
+        """
+        rc, out, err = script_helper.assert_python_failure("-c", code)
+        self.assertEqual(rc, 1)
+        self.assertIn(b'RecursionError: maximum recursion depth exceeded '
+                      b'while normalizing an exception', err)
+        self.assertIn(b'Done.', out)
+
+    @cpython_only
+    def test_recursion_normalizing_with_no_memory(self):
+        # Issue #30697. Test that in the abort that occurs when there is no
+        # memory left and the size of the Python frames stack is greater than
+        # the size of the list of preallocated MemoryError instances, the
+        # Fatal Python error message mentions MemoryError.
+        code = """if 1:
+            import _testcapi
+            class C(): pass
+            def recurse(cnt):
+                cnt -= 1
+                if cnt:
+                    recurse(cnt)
+                else:
+                    _testcapi.set_nomemory(0)
+                    C()
+            recurse(16)
+        """
+        with SuppressCrashReport():
+            rc, out, err = script_helper.assert_python_failure("-c", code)
+            self.assertIn(b'Fatal Python error: Cannot recover from '
+                          b'MemoryErrors while normalizing exceptions.', err)
 
     @cpython_only
     def test_MemoryError(self):
diff --git a/Misc/NEWS.d/next/C API/2017-06-30-11-58-01.bpo-30697.Q3T_8n.rst b/Misc/NEWS.d/next/C API/2017-06-30-11-58-01.bpo-30697.Q3T_8n.rst
new file mode 100644
index 00000000000..ccd9605d247
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2017-06-30-11-58-01.bpo-30697.Q3T_8n.rst	
@@ -0,0 +1,4 @@
+The `PyExc_RecursionErrorInst` singleton is removed and
+`PyErr_NormalizeException()` does not use it anymore. This singleton is
+persistent and its members being never cleared may cause a segfault during
+finalization of the interpreter. See also issue #22898.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 0e1e772b5c1..899c3d93701 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -4940,6 +4940,61 @@ static PyTypeObject awaitType = {
 };
 
 
+static int recurse_infinitely_error_init(PyObject *, PyObject *, PyObject *);
+
+static PyTypeObject PyRecursingInfinitelyError_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "RecursingInfinitelyError",   /* tp_name */
+    sizeof(PyBaseExceptionObject), /* tp_basicsize */
+    0,                          /* tp_itemsize */
+    0,                          /* tp_dealloc */
+    0,                          /* tp_print */
+    0,                          /* tp_getattr */
+    0,                          /* tp_setattr */
+    0,                          /* tp_reserved */
+    0,                          /* tp_repr */
+    0,                          /* tp_as_number */
+    0,                          /* tp_as_sequence */
+    0,                          /* tp_as_mapping */
+    0,                          /* tp_hash */
+    0,                          /* tp_call */
+    0,                          /* tp_str */
+    0,                          /* tp_getattro */
+    0,                          /* tp_setattro */
+    0,                          /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
+    "Instantiating this exception starts infinite recursion.", /* tp_doc */
+    0,                          /* tp_traverse */
+    0,                          /* tp_clear */
+    0,                          /* tp_richcompare */
+    0,                          /* tp_weaklistoffset */
+    0,                          /* tp_iter */
+    0,                          /* tp_iternext */
+    0,                          /* tp_methods */
+    0,                          /* tp_members */
+    0,                          /* tp_getset */
+    0,                          /* tp_base */
+    0,                          /* tp_dict */
+    0,                          /* tp_descr_get */
+    0,                          /* tp_descr_set */
+    0,                          /* tp_dictoffset */
+    (initproc)recurse_infinitely_error_init, /* tp_init */
+    0,                          /* tp_alloc */
+    0,                          /* tp_new */
+};
+
+static int
+recurse_infinitely_error_init(PyObject *self, PyObject *args, PyObject *kwds)
+{
+    PyObject *type = (PyObject *)&PyRecursingInfinitelyError_Type;
+
+    /* Instantiating this exception starts infinite recursion. */
+    Py_INCREF(type);
+    PyErr_SetObject(type, NULL);
+    return -1;
+}
+
+
 static struct PyModuleDef _testcapimodule = {
     PyModuleDef_HEAD_INIT,
     "_testcapi",
@@ -4981,6 +5036,14 @@ PyInit__testcapi(void)
     Py_INCREF(&awaitType);
     PyModule_AddObject(m, "awaitType", (PyObject *)&awaitType);
 
+    PyRecursingInfinitelyError_Type.tp_base = (PyTypeObject *)PyExc_Exception;
+    if (PyType_Ready(&PyRecursingInfinitelyError_Type) < 0) {
+        return NULL;
+    }
+    Py_INCREF(&PyRecursingInfinitelyError_Type);
+    PyModule_AddObject(m, "RecursingInfinitelyError",
+                       (PyObject *)&PyRecursingInfinitelyError_Type);
+
     PyModule_AddObject(m, "CHAR_MAX", PyLong_FromLong(CHAR_MAX));
     PyModule_AddObject(m, "CHAR_MIN", PyLong_FromLong(CHAR_MIN));
     PyModule_AddObject(m, "UCHAR_MAX", PyLong_FromLong(UCHAR_MAX));
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 42b3fc7bb1b..637d7660d35 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -2409,12 +2409,6 @@ SimpleExtendsException(PyExc_Warning, ResourceWarning,
 
 
 
-/* Pre-computed RecursionError instance for when recursion depth is reached.
-   Meant to be used when normalizing the exception for exceeding the recursion
-   depth will cause its own infinite recursion.
-*/
-PyObject *PyExc_RecursionErrorInst = NULL;
-
 #define PRE_INIT(TYPE) \
     if (!(_PyExc_ ## TYPE.tp_flags & Py_TPFLAGS_READY)) { \
         if (PyType_Ready(&_PyExc_ ## TYPE) < 0) \
@@ -2674,37 +2668,11 @@ _PyExc_Init(PyObject *bltinmod)
     ADD_ERRNO(TimeoutError, ETIMEDOUT)
 
     preallocate_memerrors();
-
-    if (!PyExc_RecursionErrorInst) {
-        PyExc_RecursionErrorInst = BaseException_new(&_PyExc_RecursionError, NULL, NULL);
-        if (!PyExc_RecursionErrorInst)
-            Py_FatalError("Cannot pre-allocate RecursionError instance for "
-                            "recursion errors");
-        else {
-            PyBaseExceptionObject *err_inst =
-                (PyBaseExceptionObject *)PyExc_RecursionErrorInst;
-            PyObject *args_tuple;
-            PyObject *exc_message;
-            exc_message = PyUnicode_FromString("maximum recursion depth exceeded");
-            if (!exc_message)
-                Py_FatalError("cannot allocate argument for RecursionError "
-                                "pre-allocation");
-            args_tuple = PyTuple_Pack(1, exc_message);
-            if (!args_tuple)
-                Py_FatalError("cannot allocate tuple for RecursionError "
-                                "pre-allocation");
-            Py_DECREF(exc_message);
-            if (BaseException_init(err_inst, args_tuple, NULL))
-                Py_FatalError("init of pre-allocated RecursionError failed");
-            Py_DECREF(args_tuple);
-        }
-    }
 }
 
 void
 _PyExc_Fini(void)
 {
-    Py_CLEAR(PyExc_RecursionErrorInst);
     free_preallocated_memerrors();
     Py_CLEAR(errnomap);
 }
diff --git a/PC/python3.def b/PC/python3.def
index 1d089ec28b1..a4c0415242b 100644
--- a/PC/python3.def
+++ b/PC/python3.def
@@ -224,7 +224,6 @@ EXPORTS
   PyExc_PermissionError=python37.PyExc_PermissionError DATA
   PyExc_ProcessLookupError=python37.PyExc_ProcessLookupError DATA
   PyExc_RecursionError=python37.PyExc_RecursionError DATA
-  PyExc_RecursionErrorInst=python37.PyExc_RecursionErrorInst DATA
   PyExc_ReferenceError=python37.PyExc_ReferenceError DATA
   PyExc_ResourceWarning=python37.PyExc_ResourceWarning DATA
   PyExc_RuntimeError=python37.PyExc_RuntimeError DATA
diff --git a/Python/errors.c b/Python/errors.c
index 51fc791f45b..13ebb192c54 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -218,20 +218,24 @@ PyErr_ExceptionMatches(PyObject *exc)
 }
 
 
+#ifndef Py_NORMALIZE_RECURSION_LIMIT
+#define Py_NORMALIZE_RECURSION_LIMIT 32
+#endif
+
 /* Used in many places to normalize a raised exception, including in
    eval_code2(), do_raise(), and PyErr_Print()
 
    XXX: should PyErr_NormalizeException() also call
             PyException_SetTraceback() with the resulting value and tb?
 */
-void
-PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb)
+static void
+PyErr_NormalizeExceptionEx(PyObject **exc, PyObject **val,
+                           PyObject **tb, int recursion_depth)
 {
     PyObject *type = *exc;
     PyObject *value = *val;
     PyObject *inclass = NULL;
     PyObject *initial_tb = NULL;
-    PyThreadState *tstate = NULL;
 
     if (type == NULL) {
         /* There was no exception, so nothing to do. */
@@ -293,6 +297,10 @@ PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb)
 finally:
     Py_DECREF(type);
     Py_DECREF(value);
+    if (recursion_depth + 1 == Py_NORMALIZE_RECURSION_LIMIT) {
+        PyErr_SetString(PyExc_RecursionError, "maximum recursion depth "
+                        "exceeded while normalizing an exception");
+    }
     /* If the new exception doesn't set a traceback and the old
        exception had a traceback, use the old traceback for the
        new exception.  It's better than nothing.
@@ -305,20 +313,26 @@ PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb)
         else
             Py_DECREF(initial_tb);
     }
-    /* normalize recursively */
-    tstate = PyThreadState_GET();
-    if (++tstate->recursion_depth > Py_GetRecursionLimit()) {
-        --tstate->recursion_depth;
-        /* throw away the old exception and use the recursion error instead */
-        Py_INCREF(PyExc_RecursionError);
-        Py_SETREF(*exc, PyExc_RecursionError);
-        Py_INCREF(PyExc_RecursionErrorInst);
-        Py_SETREF(*val, PyExc_RecursionErrorInst);
-        /* just keeping the old traceback */
-        return;
+    /* Normalize recursively.
+     * Abort when Py_NORMALIZE_RECURSION_LIMIT has been exceeded and the
+     * corresponding RecursionError could not be normalized.*/
+    if (++recursion_depth > Py_NORMALIZE_RECURSION_LIMIT) {
+        if (PyErr_GivenExceptionMatches(*exc, PyExc_MemoryError)) {
+            Py_FatalError("Cannot recover from MemoryErrors "
+                          "while normalizing exceptions.");
+        }
+        else {
+            Py_FatalError("Cannot recover from the recursive normalization "
+                          "of an exception.");
+        }
     }
-    PyErr_NormalizeException(exc, val, tb);
-    --tstate->recursion_depth;
+    PyErr_NormalizeExceptionEx(exc, val, tb, recursion_depth);
+}
+
+void
+PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb)
+{
+    PyErr_NormalizeExceptionEx(exc, val, tb, 0);
 }
 
 


From webhook-mailer at python.org  Thu Oct 26 09:59:43 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 26 Oct 2017 13:59:43 -0000
Subject: [Python-checkins] Fix trailing whitespaces in C files. (#4130)
Message-ID: <mailman.52.1509026384.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/bdf4298ae2c1d720fd808520267ca3a4e56df842
commit: bdf4298ae2c1d720fd808520267ca3a4e56df842
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-26T16:59:40+03:00
summary:

Fix trailing whitespaces in C files. (#4130)

files:
M Include/pystate.h
M Include/pytime.h
M Modules/overlapped.c
M Python/pystate.c

diff --git a/Include/pystate.h b/Include/pystate.h
index 0821238a0ac..93815850f3b 100644
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -125,8 +125,8 @@ typedef struct _ts PyThreadState;
 #else
 
 typedef struct _err_stackitem {
-    /* This struct represents an entry on the exception stack, which is a 
-     * per-coroutine state. (Coroutine in the computer science sense, 
+    /* This struct represents an entry on the exception stack, which is a
+     * per-coroutine state. (Coroutine in the computer science sense,
      * including the thread and generators).
      * This ensures that the exception state is not impacted by "yields"
      * from an except handler.
diff --git a/Include/pytime.h b/Include/pytime.h
index 9ec9b03f19e..9f489180fff 100644
--- a/Include/pytime.h
+++ b/Include/pytime.h
@@ -30,14 +30,14 @@ typedef enum {
     /* Round to nearest with ties going to nearest even integer.
        For example, used to round from a Python float. */
     _PyTime_ROUND_HALF_EVEN=2,
-    /* Round away from zero 
+    /* Round away from zero
        For example, used for timeout. _PyTime_ROUND_CEILING rounds
        -1e-9 to 0 milliseconds which causes bpo-31786 issue.
        _PyTime_ROUND_UP rounds -1e-9 to -1 millisecond which keeps
        the timeout sign as expected. select.poll(timeout) must block
        for negative values." */
     _PyTime_ROUND_UP=3,
-    /* _PyTime_ROUND_TIMEOUT (an alias for _PyTime_ROUND_UP) should be 
+    /* _PyTime_ROUND_TIMEOUT (an alias for _PyTime_ROUND_UP) should be
        used for timeouts. */
     _PyTime_ROUND_TIMEOUT = _PyTime_ROUND_UP
 } _PyTime_round_t;
diff --git a/Modules/overlapped.c b/Modules/overlapped.c
index 9355ce60f4d..e66e8566840 100644
--- a/Modules/overlapped.c
+++ b/Modules/overlapped.c
@@ -804,7 +804,7 @@ do_WSARecv(OverlappedObject *self, HANDLE handle,
     WSABUF wsabuf;
     int ret;
     DWORD err;
-    
+
     wsabuf.buf = bufstart;
     wsabuf.len = buflen;
 
diff --git a/Python/pystate.c b/Python/pystate.c
index 82ebf4da7db..55ff64951b0 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -450,7 +450,7 @@ PyThreadState_Clear(PyThreadState *tstate)
     Py_CLEAR(tstate->exc_state.exc_type);
     Py_CLEAR(tstate->exc_state.exc_value);
     Py_CLEAR(tstate->exc_state.exc_traceback);
-    
+
     /* The stack of exception states should contain just this thread. */
     assert(tstate->exc_info->previous_item == NULL);
     if (Py_VerboseFlag && tstate->exc_info != &tstate->exc_state) {


From webhook-mailer at python.org  Thu Oct 26 10:00:16 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 26 Oct 2017 14:00:16 -0000
Subject: [Python-checkins] Fix trailing whitespaces in C and Python files.
 (#4131)
Message-ID: <mailman.53.1509026416.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/d94ef8fe94ed192a24a71117c07e6c7b60a8ac6c
commit: d94ef8fe94ed192a24a71117c07e6c7b60a8ac6c
branch: 3.6
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-26T17:00:13+03:00
summary:

Fix trailing whitespaces in C and Python files. (#4131)

files:
M Include/pytime.h
M Lib/email/utils.py
M Lib/test/test_code.py
M Lib/test/test_inspect.py
M PC/_testconsole.c
M PC/msvcrtmodule.c

diff --git a/Include/pytime.h b/Include/pytime.h
index 9e1f304fd48..158c460aee6 100644
--- a/Include/pytime.h
+++ b/Include/pytime.h
@@ -30,14 +30,14 @@ typedef enum {
     /* Round to nearest with ties going to nearest even integer.
        For example, used to round from a Python float. */
     _PyTime_ROUND_HALF_EVEN=2,
-    /* Round away from zero 
+    /* Round away from zero
        For example, used for timeout. _PyTime_ROUND_CEILING rounds
        -1e-9 to 0 milliseconds which causes bpo-31786 issue.
        _PyTime_ROUND_UP rounds -1e-9 to -1 millisecond which keeps
        the timeout sign as expected. select.poll(timeout) must block
        for negative values." */
     _PyTime_ROUND_UP=3,
-    /* _PyTime_ROUND_TIMEOUT (an alias for _PyTime_ROUND_UP) should be 
+    /* _PyTime_ROUND_TIMEOUT (an alias for _PyTime_ROUND_UP) should be
        used for timeouts. */
     _PyTime_ROUND_TIMEOUT = _PyTime_ROUND_UP
 } _PyTime_round_t;
diff --git a/Lib/email/utils.py b/Lib/email/utils.py
index e2bfb362c6e..39c22406078 100644
--- a/Lib/email/utils.py
+++ b/Lib/email/utils.py
@@ -217,7 +217,7 @@ def parsedate_to_datetime(data):
 def parseaddr(addr):
     """
     Parse addr into its constituent realname and email address parts.
-    
+
     Return a tuple of realname and email address, unless the parse fails, in
     which case return a 2-tuple of ('', '').
     """
diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index 68537482ac9..90cb584ac40 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -231,7 +231,7 @@ def callback(code):
     SetExtra.restype = ctypes.c_int
 
     GetExtra = py._PyCode_GetExtra
-    GetExtra.argtypes = (ctypes.py_object, ctypes.c_ssize_t, 
+    GetExtra.argtypes = (ctypes.py_object, ctypes.c_ssize_t,
                          ctypes.POINTER(ctypes.c_voidp))
     GetExtra.restype = ctypes.c_int
 
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index b194b27aba3..bdad38643b9 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -2021,7 +2021,7 @@ def test_staticmethod(*args):  # NOQA
                          ((('args', ..., ..., 'var_positional'),), ...))
         self.assertEqual(self.signature(A.f3),
                          ((('args', ..., ..., 'var_positional'),), ...))
-        self.assertEqual(self.signature(A.f4), 
+        self.assertEqual(self.signature(A.f4),
                          ((('args', ..., ..., 'var_positional'),
                             ('kwargs', ..., ..., 'var_keyword')), ...))
     @cpython_only
diff --git a/PC/_testconsole.c b/PC/_testconsole.c
index 1c93679e435..23d1286ed4f 100644
--- a/PC/_testconsole.c
+++ b/PC/_testconsole.c
@@ -46,7 +46,7 @@ _testconsole_write_input_impl(PyObject *module, PyObject *file,
 /*[clinic end generated code: output=48f9563db34aedb3 input=4c774f2d05770bc6]*/
 {
     INPUT_RECORD *rec = NULL;
-    
+
     if (!PyWindowsConsoleIO_Check(file)) {
         PyErr_SetString(PyExc_TypeError, "expected raw console object");
         return NULL;
@@ -59,7 +59,7 @@ _testconsole_write_input_impl(PyObject *module, PyObject *file,
     if (!rec)
         goto error;
     memset(rec, 0, sizeof(INPUT_RECORD) * size);
-    
+
     INPUT_RECORD *prec = rec;
     for (DWORD i = 0; i < size; ++i, ++p, ++prec) {
         prec->EventType = KEY_EVENT;
@@ -80,7 +80,7 @@ _testconsole_write_input_impl(PyObject *module, PyObject *file,
     }
 
     PyMem_Free((void*)rec);
-    
+
     Py_RETURN_NONE;
 error:
     if (rec)
diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c
index 4797cdc2c05..b1bf28b1edb 100644
--- a/PC/msvcrtmodule.c
+++ b/PC/msvcrtmodule.c
@@ -353,7 +353,7 @@ msvcrt_ungetch_impl(PyObject *module, char char_value)
 /*[clinic end generated code: output=c6942a0efa119000 input=22f07ee9001bbf0f]*/
 {
     int res;
-    
+
     _Py_BEGIN_SUPPRESS_IPH
     res = _ungetch(char_value);
     _Py_END_SUPPRESS_IPH


From webhook-mailer at python.org  Thu Oct 26 11:48:50 2017
From: webhook-mailer at python.org (xdegaye)
Date: Thu, 26 Oct 2017 15:48:50 -0000
Subject: [Python-checkins] [3.6] bpo-30697: Fix PyErr_NormalizeException()
 when no memory (GH-2327). (#4135)
Message-ID: <mailman.54.1509032934.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/4b27d51222be751125e6800453a39360a2dec11d
commit: 4b27d51222be751125e6800453a39360a2dec11d
branch: 3.6
author: xdegaye <xdegaye at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-26T17:48:48+02:00
summary:

[3.6] bpo-30697: Fix PyErr_NormalizeException() when no memory (GH-2327). (#4135)

(cherry picked from commit 56d1f5ca32892c7643eb8cee49c40c1644f1abfe)

files:
A Misc/NEWS.d/next/C API/2017-06-30-11-58-01.bpo-30697.Q3T_8n.rst
M Doc/whatsnew/3.6.rst
M Include/pyerrors.h
M Lib/test/test_exceptions.py
M Modules/_testcapimodule.c
M Objects/exceptions.c
M PC/python3.def
M Python/errors.c

diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index 1301f4ca1d8..847b50140a6 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -1852,6 +1852,11 @@ Build and C API Changes
 * The :c:func:`PyUnicode_FSConverter` and :c:func:`PyUnicode_FSDecoder`
   functions will now accept :term:`path-like objects <path-like object>`.
 
+* The ``PyExc_RecursionErrorInst`` singleton that was part of the public API
+  has been removed as its members being never cleared may cause a segfault
+  during finalization of the interpreter. Contributed by Xavier de Gaye in
+  :issue:`22898` and :issue:`30697`.
+
 
 Other Improvements
 ==================
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index 8c1dbc5047b..c28c1373f82 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -219,8 +219,6 @@ PyAPI_DATA(PyObject *) PyExc_IOError;
 PyAPI_DATA(PyObject *) PyExc_WindowsError;
 #endif
 
-PyAPI_DATA(PyObject *) PyExc_RecursionErrorInst;
-
 /* Predefined warning categories */
 PyAPI_DATA(PyObject *) PyExc_Warning;
 PyAPI_DATA(PyObject *) PyExc_UserWarning;
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 7eb08b746c0..f3bf223a8a4 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -10,8 +10,8 @@
 
 from test.support import (TESTFN, captured_stderr, check_impl_detail,
                           check_warnings, cpython_only, gc_collect, run_unittest,
-                          no_tracing, unlink, import_module, script_helper)
-
+                          no_tracing, unlink, import_module, script_helper,
+                          SuppressCrashReport)
 class NaiveException(Exception):
     def __init__(self, x):
         self.x = x
@@ -936,6 +936,105 @@ def g():
         self.assertTrue(isinstance(v, RecursionError), type(v))
         self.assertIn("maximum recursion depth exceeded", str(v))
 
+    @cpython_only
+    def test_recursion_normalizing_exception(self):
+        # Issue #22898.
+        # Test that a RecursionError is raised when tstate->recursion_depth is
+        # equal to recursion_limit in PyErr_NormalizeException() and check
+        # that a ResourceWarning is printed.
+        # Prior to #22898, the recursivity of PyErr_NormalizeException() was
+        # controled by tstate->recursion_depth and a PyExc_RecursionErrorInst
+        # singleton was being used in that case, that held traceback data and
+        # locals indefinitely and would cause a segfault in _PyExc_Fini() upon
+        # finalization of these locals.
+        code = """if 1:
+            import sys
+            from _testcapi import get_recursion_depth
+
+            class MyException(Exception): pass
+
+            def setrecursionlimit(depth):
+                while 1:
+                    try:
+                        sys.setrecursionlimit(depth)
+                        return depth
+                    except RecursionError:
+                        # sys.setrecursionlimit() raises a RecursionError if
+                        # the new recursion limit is too low (issue #25274).
+                        depth += 1
+
+            def recurse(cnt):
+                cnt -= 1
+                if cnt:
+                    recurse(cnt)
+                else:
+                    generator.throw(MyException)
+
+            def gen():
+                f = open(%a, mode='rb', buffering=0)
+                yield
+
+            generator = gen()
+            next(generator)
+            recursionlimit = sys.getrecursionlimit()
+            depth = get_recursion_depth()
+            try:
+                # Upon the last recursive invocation of recurse(),
+                # tstate->recursion_depth is equal to (recursion_limit - 1)
+                # and is equal to recursion_limit when _gen_throw() calls
+                # PyErr_NormalizeException().
+                recurse(setrecursionlimit(depth + 2) - depth - 1)
+            finally:
+                sys.setrecursionlimit(recursionlimit)
+                print('Done.')
+        """ % __file__
+        rc, out, err = script_helper.assert_python_failure("-Wd", "-c", code)
+        # Check that the program does not fail with SIGABRT.
+        self.assertEqual(rc, 1)
+        self.assertIn(b'RecursionError', err)
+        self.assertIn(b'ResourceWarning', err)
+        self.assertIn(b'Done.', out)
+
+    @cpython_only
+    def test_recursion_normalizing_infinite_exception(self):
+        # Issue #30697. Test that a RecursionError is raised when
+        # PyErr_NormalizeException() maximum recursion depth has been
+        # exceeded.
+        code = """if 1:
+            import _testcapi
+            try:
+                raise _testcapi.RecursingInfinitelyError
+            finally:
+                print('Done.')
+        """
+        rc, out, err = script_helper.assert_python_failure("-c", code)
+        self.assertEqual(rc, 1)
+        self.assertIn(b'RecursionError: maximum recursion depth exceeded '
+                      b'while normalizing an exception', err)
+        self.assertIn(b'Done.', out)
+
+    @cpython_only
+    def test_recursion_normalizing_with_no_memory(self):
+        # Issue #30697. Test that in the abort that occurs when there is no
+        # memory left and the size of the Python frames stack is greater than
+        # the size of the list of preallocated MemoryError instances, the
+        # Fatal Python error message mentions MemoryError.
+        code = """if 1:
+            import _testcapi
+            class C(): pass
+            def recurse(cnt):
+                cnt -= 1
+                if cnt:
+                    recurse(cnt)
+                else:
+                    _testcapi.set_nomemory(0)
+                    C()
+            recurse(16)
+        """
+        with SuppressCrashReport():
+            rc, out, err = script_helper.assert_python_failure("-c", code)
+            self.assertIn(b'Fatal Python error: Cannot recover from '
+                          b'MemoryErrors while normalizing exceptions.', err)
 
     @cpython_only
     def test_MemoryError(self):
diff --git a/Misc/NEWS.d/next/C API/2017-06-30-11-58-01.bpo-30697.Q3T_8n.rst b/Misc/NEWS.d/next/C API/2017-06-30-11-58-01.bpo-30697.Q3T_8n.rst
new file mode 100644
index 00000000000..ccd9605d247
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2017-06-30-11-58-01.bpo-30697.Q3T_8n.rst	
@@ -0,0 +1,4 @@
+The `PyExc_RecursionErrorInst` singleton is removed and
+`PyErr_NormalizeException()` does not use it anymore. This singleton is
+persistent and its members being never cleared may cause a segfault during
+finalization of the interpreter. See also issue #22898.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 00626ccba49..c2c63e94db3 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -4862,6 +4862,61 @@ static PyTypeObject awaitType = {
 };
 
 
+static int recurse_infinitely_error_init(PyObject *, PyObject *, PyObject *);
+
+static PyTypeObject PyRecursingInfinitelyError_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "RecursingInfinitelyError",   /* tp_name */
+    sizeof(PyBaseExceptionObject), /* tp_basicsize */
+    0,                          /* tp_itemsize */
+    0,                          /* tp_dealloc */
+    0,                          /* tp_print */
+    0,                          /* tp_getattr */
+    0,                          /* tp_setattr */
+    0,                          /* tp_reserved */
+    0,                          /* tp_repr */
+    0,                          /* tp_as_number */
+    0,                          /* tp_as_sequence */
+    0,                          /* tp_as_mapping */
+    0,                          /* tp_hash */
+    0,                          /* tp_call */
+    0,                          /* tp_str */
+    0,                          /* tp_getattro */
+    0,                          /* tp_setattro */
+    0,                          /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
+    "Instantiating this exception starts infinite recursion.", /* tp_doc */
+    0,                          /* tp_traverse */
+    0,                          /* tp_clear */
+    0,                          /* tp_richcompare */
+    0,                          /* tp_weaklistoffset */
+    0,                          /* tp_iter */
+    0,                          /* tp_iternext */
+    0,                          /* tp_methods */
+    0,                          /* tp_members */
+    0,                          /* tp_getset */
+    0,                          /* tp_base */
+    0,                          /* tp_dict */
+    0,                          /* tp_descr_get */
+    0,                          /* tp_descr_set */
+    0,                          /* tp_dictoffset */
+    (initproc)recurse_infinitely_error_init, /* tp_init */
+    0,                          /* tp_alloc */
+    0,                          /* tp_new */
+};
+
+static int
+recurse_infinitely_error_init(PyObject *self, PyObject *args, PyObject *kwds)
+{
+    PyObject *type = (PyObject *)&PyRecursingInfinitelyError_Type;
+
+    /* Instantiating this exception starts infinite recursion. */
+    Py_INCREF(type);
+    PyErr_SetObject(type, NULL);
+    return -1;
+}
+
+
 static struct PyModuleDef _testcapimodule = {
     PyModuleDef_HEAD_INIT,
     "_testcapi",
@@ -4903,6 +4958,14 @@ PyInit__testcapi(void)
     Py_INCREF(&awaitType);
     PyModule_AddObject(m, "awaitType", (PyObject *)&awaitType);
 
+    PyRecursingInfinitelyError_Type.tp_base = (PyTypeObject *)PyExc_Exception;
+    if (PyType_Ready(&PyRecursingInfinitelyError_Type) < 0) {
+        return NULL;
+    }
+    Py_INCREF(&PyRecursingInfinitelyError_Type);
+    PyModule_AddObject(m, "RecursingInfinitelyError",
+                       (PyObject *)&PyRecursingInfinitelyError_Type);
+
     PyModule_AddObject(m, "CHAR_MAX", PyLong_FromLong(CHAR_MAX));
     PyModule_AddObject(m, "CHAR_MIN", PyLong_FromLong(CHAR_MIN));
     PyModule_AddObject(m, "UCHAR_MAX", PyLong_FromLong(UCHAR_MAX));
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 271e293e325..df4899372a5 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -2430,12 +2430,6 @@ SimpleExtendsException(PyExc_Warning, ResourceWarning,
 
 
 
-/* Pre-computed RecursionError instance for when recursion depth is reached.
-   Meant to be used when normalizing the exception for exceeding the recursion
-   depth will cause its own infinite recursion.
-*/
-PyObject *PyExc_RecursionErrorInst = NULL;
-
 #define PRE_INIT(TYPE) \
     if (!(_PyExc_ ## TYPE.tp_flags & Py_TPFLAGS_READY)) { \
         if (PyType_Ready(&_PyExc_ ## TYPE) < 0) \
@@ -2697,37 +2691,11 @@ _PyExc_Init(PyObject *bltinmod)
     ADD_ERRNO(TimeoutError, ETIMEDOUT);
 
     preallocate_memerrors();
-
-    if (!PyExc_RecursionErrorInst) {
-        PyExc_RecursionErrorInst = BaseException_new(&_PyExc_RecursionError, NULL, NULL);
-        if (!PyExc_RecursionErrorInst)
-            Py_FatalError("Cannot pre-allocate RecursionError instance for "
-                            "recursion errors");
-        else {
-            PyBaseExceptionObject *err_inst =
-                (PyBaseExceptionObject *)PyExc_RecursionErrorInst;
-            PyObject *args_tuple;
-            PyObject *exc_message;
-            exc_message = PyUnicode_FromString("maximum recursion depth exceeded");
-            if (!exc_message)
-                Py_FatalError("cannot allocate argument for RecursionError "
-                                "pre-allocation");
-            args_tuple = PyTuple_Pack(1, exc_message);
-            if (!args_tuple)
-                Py_FatalError("cannot allocate tuple for RecursionError "
-                                "pre-allocation");
-            Py_DECREF(exc_message);
-            if (BaseException_init(err_inst, args_tuple, NULL))
-                Py_FatalError("init of pre-allocated RecursionError failed");
-            Py_DECREF(args_tuple);
-        }
-    }
 }
 
 void
 _PyExc_Fini(void)
 {
-    Py_CLEAR(PyExc_RecursionErrorInst);
     free_preallocated_memerrors();
     Py_CLEAR(errnomap);
 }
diff --git a/PC/python3.def b/PC/python3.def
index ff70718fc37..4fc4a6814ee 100644
--- a/PC/python3.def
+++ b/PC/python3.def
@@ -224,7 +224,6 @@ EXPORTS
   PyExc_PermissionError=python36.PyExc_PermissionError DATA
   PyExc_ProcessLookupError=python36.PyExc_ProcessLookupError DATA
   PyExc_RecursionError=python36.PyExc_RecursionError DATA
-  PyExc_RecursionErrorInst=python36.PyExc_RecursionErrorInst DATA
   PyExc_ReferenceError=python36.PyExc_ReferenceError DATA
   PyExc_ResourceWarning=python36.PyExc_ResourceWarning DATA
   PyExc_RuntimeError=python36.PyExc_RuntimeError DATA
diff --git a/Python/errors.c b/Python/errors.c
index 2f39f9d473d..78c0524a1d8 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -217,20 +217,24 @@ PyErr_ExceptionMatches(PyObject *exc)
 }
 
 
+#ifndef Py_NORMALIZE_RECURSION_LIMIT
+#define Py_NORMALIZE_RECURSION_LIMIT 32
+#endif
+
 /* Used in many places to normalize a raised exception, including in
    eval_code2(), do_raise(), and PyErr_Print()
 
    XXX: should PyErr_NormalizeException() also call
             PyException_SetTraceback() with the resulting value and tb?
 */
-void
-PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb)
+static void
+PyErr_NormalizeExceptionEx(PyObject **exc, PyObject **val,
+                           PyObject **tb, int recursion_depth)
 {
     PyObject *type = *exc;
     PyObject *value = *val;
     PyObject *inclass = NULL;
     PyObject *initial_tb = NULL;
-    PyThreadState *tstate = NULL;
 
     if (type == NULL) {
         /* There was no exception, so nothing to do. */
@@ -292,6 +296,10 @@ PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb)
 finally:
     Py_DECREF(type);
     Py_DECREF(value);
+    if (recursion_depth + 1 == Py_NORMALIZE_RECURSION_LIMIT) {
+        PyErr_SetString(PyExc_RecursionError, "maximum recursion depth "
+                        "exceeded while normalizing an exception");
+    }
     /* If the new exception doesn't set a traceback and the old
        exception had a traceback, use the old traceback for the
        new exception.  It's better than nothing.
@@ -304,20 +312,26 @@ PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb)
         else
             Py_DECREF(initial_tb);
     }
-    /* normalize recursively */
-    tstate = PyThreadState_GET();
-    if (++tstate->recursion_depth > Py_GetRecursionLimit()) {
-        --tstate->recursion_depth;
-        /* throw away the old exception and use the recursion error instead */
-        Py_INCREF(PyExc_RecursionError);
-        Py_SETREF(*exc, PyExc_RecursionError);
-        Py_INCREF(PyExc_RecursionErrorInst);
-        Py_SETREF(*val, PyExc_RecursionErrorInst);
-        /* just keeping the old traceback */
-        return;
+    /* Normalize recursively.
+     * Abort when Py_NORMALIZE_RECURSION_LIMIT has been exceeded and the
+     * corresponding RecursionError could not be normalized.*/
+    if (++recursion_depth > Py_NORMALIZE_RECURSION_LIMIT) {
+        if (PyErr_GivenExceptionMatches(*exc, PyExc_MemoryError)) {
+            Py_FatalError("Cannot recover from MemoryErrors "
+                          "while normalizing exceptions.");
+        }
+        else {
+            Py_FatalError("Cannot recover from the recursive normalization "
+                          "of an exception.");
+        }
     }
-    PyErr_NormalizeException(exc, val, tb);
-    --tstate->recursion_depth;
+    PyErr_NormalizeExceptionEx(exc, val, tb, recursion_depth);
+}
+
+void
+PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb)
+{
+    PyErr_NormalizeExceptionEx(exc, val, tb, 0);
 }
 
 


From webhook-mailer at python.org  Thu Oct 26 14:49:22 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Thu, 26 Oct 2017 18:49:22 -0000
Subject: [Python-checkins] bpo-30553: Add status code 421 to http.HTTPStatus
 (GH-2589)
Message-ID: <mailman.55.1509043765.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/52ad72dd0a5a56414cc29b7c9b03259169825f35
commit: 52ad72dd0a5a56414cc29b7c9b03259169825f35
branch: master
author: Vitor Pereira <vmsousapereira at gmail.com>
committer: Berker Peksag <berker.peksag at gmail.com>
date: 2017-10-26T21:49:19+03:00
summary:

bpo-30553: Add status code 421 to http.HTTPStatus (GH-2589)

files:
A Misc/NEWS.d/next/Library/2017-07-05-14-48-26.bpo-30553.Oupsxo.rst
M Doc/library/http.rst
M Lib/http/__init__.py
M Lib/test/test_httplib.py

diff --git a/Doc/library/http.rst b/Doc/library/http.rst
index be661c5e8c2..7c34004a3ae 100644
--- a/Doc/library/http.rst
+++ b/Doc/library/http.rst
@@ -98,6 +98,7 @@ Code    Enum Name                           Details
 ``415`` ``UNSUPPORTED_MEDIA_TYPE``          HTTP/1.1 :rfc:`7231`, Section 6.5.13
 ``416`` ``REQUEST_RANGE_NOT_SATISFIABLE``   HTTP/1.1 Range Requests :rfc:`7233`, Section 4.4
 ``417`` ``EXPECTATION_FAILED``              HTTP/1.1 :rfc:`7231`, Section 6.5.14
+``421`` ``MISDIRECTED_REQUEST``             HTTP/2 :rfc:`7540`, Section 9.1.2
 ``422`` ``UNPROCESSABLE_ENTITY``            WebDAV :rfc:`4918`, Section 11.2
 ``423`` ``LOCKED``                          WebDAV :rfc:`4918`, Section 11.3
 ``424`` ``FAILED_DEPENDENCY``               WebDAV :rfc:`4918`, Section 11.4
@@ -122,3 +123,6 @@ In order to preserve backwards compatibility, enum values are also present
 in the :mod:`http.client` module in the form of constants. The enum name is
 equal to the constant name (i.e. ``http.HTTPStatus.OK`` is also available as
 ``http.client.OK``).
+
+.. versionchanged:: 3.7
+   Added ``421 MISDIRECTED_REQUEST`` status code.
diff --git a/Lib/http/__init__.py b/Lib/http/__init__.py
index d4334cc88f9..aed94a58504 100644
--- a/Lib/http/__init__.py
+++ b/Lib/http/__init__.py
@@ -15,6 +15,7 @@ class HTTPStatus(IntEnum):
         * RFC 7238: Permanent Redirect
         * RFC 2295: Transparent Content Negotiation in HTTP
         * RFC 2774: An HTTP Extension Framework
+        * RFC 7540: Hypertext Transfer Protocol Version 2 (HTTP/2)
     """
     def __new__(cls, value, phrase, description=''):
         obj = int.__new__(cls, value)
@@ -98,6 +99,8 @@ def __new__(cls, value, phrase, description=''):
         'Cannot satisfy request range')
     EXPECTATION_FAILED = (417, 'Expectation Failed',
         'Expect condition could not be satisfied')
+    MISDIRECTED_REQUEST = (421, 'Misdirected Request',
+        'Server is not able to produce a response')
     UNPROCESSABLE_ENTITY = 422, 'Unprocessable Entity'
     LOCKED = 423, 'Locked'
     FAILED_DEPENDENCY = 424, 'Failed Dependency'
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index bec994ed293..5591f1d9e3d 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -1354,6 +1354,7 @@ def test_client_constants(self):
             'UNSUPPORTED_MEDIA_TYPE',
             'REQUESTED_RANGE_NOT_SATISFIABLE',
             'EXPECTATION_FAILED',
+            'MISDIRECTED_REQUEST',
             'UNPROCESSABLE_ENTITY',
             'LOCKED',
             'FAILED_DEPENDENCY',
diff --git a/Misc/NEWS.d/next/Library/2017-07-05-14-48-26.bpo-30553.Oupsxo.rst b/Misc/NEWS.d/next/Library/2017-07-05-14-48-26.bpo-30553.Oupsxo.rst
new file mode 100644
index 00000000000..51f0d5b9922
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-07-05-14-48-26.bpo-30553.Oupsxo.rst
@@ -0,0 +1,2 @@
+Add HTTP/2 status code 421 (Misdirected Request) to
+:class:`http.HTTPStatus`. Patch by Vitor Pereira.


From webhook-mailer at python.org  Thu Oct 26 15:34:15 2017
From: webhook-mailer at python.org (Alexander Belopolsky)
Date: Thu, 26 Oct 2017 19:34:15 -0000
Subject: [Python-checkins] Closes bpo-28281: Remove year (1-9999) limits on
 the weekday() function. (#4109)
Message-ID: <mailman.56.1509046458.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/66c88ce30ca2b23daa37038e1a3c0de98f241f50
commit: 66c88ce30ca2b23daa37038e1a3c0de98f241f50
branch: master
author: Alexander Belopolsky <abalkin at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2017-10-26T15:34:11-04:00
summary:

Closes bpo-28281: Remove year (1-9999) limits on the weekday() function. (#4109)

Patch by Mark Gollahon.

files:
A Misc/NEWS.d/next/Library/2017-10-26-14-54-38.bpo-28281.7ZN5FG.rst
M Doc/library/calendar.rst
M Lib/calendar.py
M Lib/test/test_calendar.py
M Misc/ACKS

diff --git a/Doc/library/calendar.rst b/Doc/library/calendar.rst
index 8fe93fd4de3..56b75ef0f85 100644
--- a/Doc/library/calendar.rst
+++ b/Doc/library/calendar.rst
@@ -19,11 +19,13 @@ the week to Sunday (6) or to any other weekday.  Parameters that specify dates
 are given as integers. For related
 functionality, see also the :mod:`datetime` and :mod:`time` modules.
 
-Most of these functions and classes rely on the :mod:`datetime` module which
-uses an idealized calendar, the current Gregorian calendar extended
+The functions and classes defined in this module
+use an idealized calendar, the current Gregorian calendar extended indefinitely
 in both directions.  This matches the definition of the "proleptic Gregorian"
 calendar in Dershowitz and Reingold's book "Calendrical Calculations", where
-it's the base calendar for all computations.
+it's the base calendar for all computations.  Zero and negative years are
+interpreted as prescribed by the ISO 8601 standard.  Year 0 is 1 BC, year -1 is
+2 BC, and so on.
 
 
 .. class:: Calendar(firstweekday=0)
diff --git a/Lib/calendar.py b/Lib/calendar.py
index fb594e0f5b0..3828c43ed27 100644
--- a/Lib/calendar.py
+++ b/Lib/calendar.py
@@ -111,8 +111,9 @@ def leapdays(y1, y2):
 
 
 def weekday(year, month, day):
-    """Return weekday (0-6 ~ Mon-Sun) for year (1970-...), month (1-12),
-       day (1-31)."""
+    """Return weekday (0-6 ~ Mon-Sun) for year, month (1-12), day (1-31)."""
+    if not datetime.MINYEAR <= year <= datetime.MAXYEAR:
+        year = 2000 + year % 400
     return datetime.date(year, month, day).weekday()
 
 
diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
index ad8b6bb6b93..6241d114d33 100644
--- a/Lib/test/test_calendar.py
+++ b/Lib/test/test_calendar.py
@@ -9,6 +9,56 @@
 import datetime
 import os
 
+# From https://en.wikipedia.org/wiki/Leap_year_starting_on_Saturday
+result_0_02_text = """\
+     February 0
+Mo Tu We Th Fr Sa Su
+    1  2  3  4  5  6
+ 7  8  9 10 11 12 13
+14 15 16 17 18 19 20
+21 22 23 24 25 26 27
+28 29
+"""
+
+result_0_text = """\
+                                   0
+
+      January                   February                   March
+Mo Tu We Th Fr Sa Su      Mo Tu We Th Fr Sa Su      Mo Tu We Th Fr Sa Su
+                1  2          1  2  3  4  5  6             1  2  3  4  5
+ 3  4  5  6  7  8  9       7  8  9 10 11 12 13       6  7  8  9 10 11 12
+10 11 12 13 14 15 16      14 15 16 17 18 19 20      13 14 15 16 17 18 19
+17 18 19 20 21 22 23      21 22 23 24 25 26 27      20 21 22 23 24 25 26
+24 25 26 27 28 29 30      28 29                     27 28 29 30 31
+31
+
+       April                      May                       June
+Mo Tu We Th Fr Sa Su      Mo Tu We Th Fr Sa Su      Mo Tu We Th Fr Sa Su
+                1  2       1  2  3  4  5  6  7                1  2  3  4
+ 3  4  5  6  7  8  9       8  9 10 11 12 13 14       5  6  7  8  9 10 11
+10 11 12 13 14 15 16      15 16 17 18 19 20 21      12 13 14 15 16 17 18
+17 18 19 20 21 22 23      22 23 24 25 26 27 28      19 20 21 22 23 24 25
+24 25 26 27 28 29 30      29 30 31                  26 27 28 29 30
+
+        July                     August                  September
+Mo Tu We Th Fr Sa Su      Mo Tu We Th Fr Sa Su      Mo Tu We Th Fr Sa Su
+                1  2          1  2  3  4  5  6                   1  2  3
+ 3  4  5  6  7  8  9       7  8  9 10 11 12 13       4  5  6  7  8  9 10
+10 11 12 13 14 15 16      14 15 16 17 18 19 20      11 12 13 14 15 16 17
+17 18 19 20 21 22 23      21 22 23 24 25 26 27      18 19 20 21 22 23 24
+24 25 26 27 28 29 30      28 29 30 31               25 26 27 28 29 30
+31
+
+      October                   November                  December
+Mo Tu We Th Fr Sa Su      Mo Tu We Th Fr Sa Su      Mo Tu We Th Fr Sa Su
+                   1             1  2  3  4  5                   1  2  3
+ 2  3  4  5  6  7  8       6  7  8  9 10 11 12       4  5  6  7  8  9 10
+ 9 10 11 12 13 14 15      13 14 15 16 17 18 19      11 12 13 14 15 16 17
+16 17 18 19 20 21 22      20 21 22 23 24 25 26      18 19 20 21 22 23 24
+23 24 25 26 27 28 29      27 28 29 30               25 26 27 28 29 30 31
+30 31
+"""
+
 result_2004_01_text = """\
     January 2004
 Mo Tu We Th Fr Sa Su
@@ -343,12 +393,20 @@ def test_output(self):
             self.normalize_calendar(calendar.calendar(2004)),
             self.normalize_calendar(result_2004_text)
         )
+        self.assertEqual(
+            self.normalize_calendar(calendar.calendar(0)),
+            self.normalize_calendar(result_0_text)
+        )
 
     def test_output_textcalendar(self):
         self.assertEqual(
             calendar.TextCalendar().formatyear(2004),
             result_2004_text
         )
+        self.assertEqual(
+            calendar.TextCalendar().formatyear(0),
+            result_0_text
+        )
 
     def test_output_htmlcalendar_encoding_ascii(self):
         self.check_htmlcalendar_encoding('ascii', 'ascii')
@@ -393,6 +451,10 @@ def test_formatmonth(self):
             calendar.TextCalendar().formatmonth(2004, 1),
             result_2004_01_text
         )
+        self.assertEqual(
+            calendar.TextCalendar().formatmonth(0, 2),
+            result_0_02_text
+        )
 
     def test_formatmonthname_with_year(self):
         self.assertEqual(
diff --git a/Misc/ACKS b/Misc/ACKS
index 7b174c63535..ac7a258df18 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -545,6 +545,7 @@ Karan Goel
 Jeroen Van Goey
 Christoph Gohlke
 Tim Golden
+Mark Gollahon
 Guilherme Gon?alves
 Tiago Gon?alves
 Chris Gonnerman
diff --git a/Misc/NEWS.d/next/Library/2017-10-26-14-54-38.bpo-28281.7ZN5FG.rst b/Misc/NEWS.d/next/Library/2017-10-26-14-54-38.bpo-28281.7ZN5FG.rst
new file mode 100644
index 00000000000..e7681dd4e8f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-26-14-54-38.bpo-28281.7ZN5FG.rst
@@ -0,0 +1,3 @@
+Remove year (1-9999) limits on the Calendar.weekday() function.
+
+Patch by Mark Gollahon.


From webhook-mailer at python.org  Thu Oct 26 17:28:41 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Thu, 26 Oct 2017 21:28:41 -0000
Subject: [Python-checkins] bpo-28936: Detect lexically first syntax error
 first (#4097)
Message-ID: <mailman.57.1509053326.2817.python-checkins@python.org>

https://github.com/python/cpython/commit/8c83c23fa32405aa9212f028d234f4129d105a23
commit: 8c83c23fa32405aa9212f028d234f4129d105a23
branch: master
author: Ivan Levkivskyi <levkivskyi at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-27T00:28:35+03:00
summary:

bpo-28936: Detect lexically first syntax error first (#4097)

Lexically first global and nonlocal syntax errors at given scope should be detected first.

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-23-23-39-26.bpo-28936.C288Jh.rst
M Lib/test/test_syntax.py
M Python/symtable.c

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 7ce3d75a892..5d36581859b 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -400,12 +400,25 @@
 Misuse of the nonlocal and global statement can lead to a few unique syntax errors.
 
    >>> def f():
+   ...     print(x)
+   ...     global x
+   Traceback (most recent call last):
+     ...
+   SyntaxError: name 'x' is used prior to global declaration
+
+   >>> def f():
    ...     x = 1
    ...     global x
    Traceback (most recent call last):
      ...
    SyntaxError: name 'x' is assigned to before global declaration
 
+   >>> def f(x):
+   ...     global x
+   Traceback (most recent call last):
+     ...
+   SyntaxError: name 'x' is parameter and global
+
    >>> def f():
    ...     x = 1
    ...     def g():
@@ -560,7 +573,6 @@
 
 import re
 import unittest
-import warnings
 
 from test import support
 
@@ -596,19 +608,25 @@ def test_assign_call(self):
     def test_assign_del(self):
         self._check_error("del f()", "delete")
 
-    def test_global_err_then_warn(self):
-        # Bug #763201:  The SyntaxError raised for one global statement
-        # shouldn't be clobbered by a SyntaxWarning issued for a later one.
+    def test_global_param_err_first(self):
         source = """if 1:
             def error(a):
                 global a  # SyntaxError
-            def warning():
+            def error2():
+                b = 1
+                global b  # SyntaxError
+            """
+        self._check_error(source, "parameter and global", lineno=3)
+
+    def test_nonlocal_param_err_first(self):
+        source = """if 1:
+            def error(a):
+                nonlocal a  # SyntaxError
+            def error2():
                 b = 1
-                global b  # SyntaxWarning
+                global b  # SyntaxError
             """
-        warnings.filterwarnings(action='ignore', category=SyntaxWarning)
-        self._check_error(source, "global")
-        warnings.filters.pop(0)
+        self._check_error(source, "parameter and nonlocal", lineno=3)
 
     def test_break_outside_loop(self):
         self._check_error("break", "outside loop")
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-23-23-39-26.bpo-28936.C288Jh.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-23-23-39-26.bpo-28936.C288Jh.rst
new file mode 100644
index 00000000000..8ebdf32e5be
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-23-23-39-26.bpo-28936.C288Jh.rst	
@@ -0,0 +1,2 @@
+Ensure that lexically first syntax error involving a parameter and ``global``
+or ``nonlocal`` is detected first at a given scope. Patch by Ivan Levkivskyi.
diff --git a/Python/symtable.c b/Python/symtable.c
index 2658b917d7a..55815c91cc9 100644
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -9,6 +9,12 @@
 #include "structmember.h"
 
 /* error strings used for warnings */
+#define GLOBAL_PARAM \
+"name '%U' is parameter and global"
+
+#define NONLOCAL_PARAM \
+"name '%U' is parameter and nonlocal"
+
 #define GLOBAL_AFTER_ASSIGN \
 "name '%U' is assigned to before global declaration"
 
@@ -465,12 +471,6 @@ analyze_name(PySTEntryObject *ste, PyObject *scopes, PyObject *name, long flags,
              PyObject *global)
 {
     if (flags & DEF_GLOBAL) {
-        if (flags & DEF_PARAM) {
-            PyErr_Format(PyExc_SyntaxError,
-                        "name '%U' is parameter and global",
-                        name);
-            return error_at_directive(ste, name);
-        }
         if (flags & DEF_NONLOCAL) {
             PyErr_Format(PyExc_SyntaxError,
                          "name '%U' is nonlocal and global",
@@ -485,12 +485,6 @@ analyze_name(PySTEntryObject *ste, PyObject *scopes, PyObject *name, long flags,
         return 1;
     }
     if (flags & DEF_NONLOCAL) {
-        if (flags & DEF_PARAM) {
-            PyErr_Format(PyExc_SyntaxError,
-                         "name '%U' is parameter and nonlocal",
-                         name);
-            return error_at_directive(ste, name);
-        }
         if (!bound) {
             PyErr_Format(PyExc_SyntaxError,
                          "nonlocal declaration not allowed at module level");
@@ -1284,9 +1278,11 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)
             long cur = symtable_lookup(st, name);
             if (cur < 0)
                 VISIT_QUIT(st, 0);
-            if (cur & (DEF_LOCAL | USE | DEF_ANNOT)) {
-                char* msg;
-                if (cur & USE) {
+            if (cur & (DEF_PARAM | DEF_LOCAL | USE | DEF_ANNOT)) {
+                const char* msg;
+                if (cur & DEF_PARAM) {
+                    msg = GLOBAL_PARAM;
+                } else if (cur & USE) {
                     msg = GLOBAL_AFTER_USE;
                 } else if (cur & DEF_ANNOT) {
                     msg = GLOBAL_ANNOT;
@@ -1315,9 +1311,11 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)
             long cur = symtable_lookup(st, name);
             if (cur < 0)
                 VISIT_QUIT(st, 0);
-            if (cur & (DEF_LOCAL | USE | DEF_ANNOT)) {
-                char* msg;
-                if (cur & USE) {
+            if (cur & (DEF_PARAM | DEF_LOCAL | USE | DEF_ANNOT)) {
+                const char* msg;
+                if (cur & DEF_PARAM) {
+                    msg = NONLOCAL_PARAM;
+                } else if (cur & USE) {
                     msg = NONLOCAL_AFTER_USE;
                 } else if (cur & DEF_ANNOT) {
                     msg = NONLOCAL_ANNOT;


From lp_benchmark_robot at intel.com  Thu Oct 26 17:51:27 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Thu, 26 Oct 2017 14:51:27 -0700
Subject: [Python-checkins] [1 up,
 64 flat] Results for Python (master branch) 2017-10-26
Message-ID: <592b7b06-cb13-473f-a47e-d1348109426f@orsmsx151.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-26 03:02:48-07:00.
  - commit:		275d2d9
  - previous commit:	95f1a7b
  - revision date:	2017-10-26 11:27:46+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| 0.985% |  +0.604%   |  +6.274%   |  +6.355%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.044% |  +0.417%   |  +21.406%  |  +12.825%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 1.030% |  +0.403%   |  +22.242%  |  +12.730%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.369% |  -0.391%   |  +20.473%  |  +12.576%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 2.930% |  -1.694%   |  +8.040%   |  +9.356%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 2.232% |  +0.081%   |  +11.087%  |  +9.713%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.772% |  +0.672%   |  +8.107%   |  +9.180%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.803% |  +0.407%   |  +3.845%   |  +5.509%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.468% |  +1.614%   |  +7.420%   |  +19.712%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 3.921% |  +1.665%   |  +10.758%  |  +12.048%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.244% |  +0.060%   |  +5.198%   |  +5.931%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.661% |  +1.072%   |  +5.811%   |  +4.796%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.609% |  +1.515%   |  +4.677%   |  +4.867%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.695% |  -0.466%   |  +13.073%  |  +7.749%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.175% |  +0.204%   |  +9.393%   |  +8.904%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.805% |  +0.611%   |  +6.586%   |  +10.766%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.493% |  +0.663%   |  +11.153%  |  +9.877%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 2.491% |  -1.418%   |  +9.645%   |  +8.552%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.806% |  +0.395%   |  +3.693%   |  +7.690%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 1.111% |  +1.553%   |  +1.710%   |  +9.429%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.770% |  -0.101%   |  +9.835%   |  +11.178%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 3.016% |  +1.353%   |  +47.887%  |  +10.983%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.954% |  -1.543%   |  +9.284%   |  +12.962%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.551% |  +0.305%   |  +17.530%  |  +11.857%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 1.929% |  -0.276%   |  +8.827%   |  +10.131%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.340% |  -0.184%   |  +3.632%   |  +6.247%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.983% |  -0.857%   |  -0.752%   |  +1.852%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.714% |  +1.247%   |  +6.877%   |  +6.624%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.609% |  -0.868%   |  +6.541%   |  +7.741%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.949% |  +1.019%   |  -0.877%   |  +22.593%  |
+-----+------------------------+--------+------------+------------+------------+
| :-) |             pickle_dict| 0.489% |  +1.987%   |  +1.706%   |  +19.084%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.719% |  +0.318%   |  +5.111%   |  +14.942%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 4.934% |  -0.538%   |  +11.343%  |  +9.127%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.153% |  +0.253%   |  +0.397%   |  +9.880%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.125% |  +0.123%   |  +11.344%  |  +4.526%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.089% |  +0.154%   |  +2.695%   |  +4.525%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.434% |  -0.599%   |  +10.546%  |  +12.793%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 6.048% |  -2.741%   |  +0.945%   |  +8.961%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.570% |  +1.594%   |  +0.397%   |  +9.780%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 1.362% |  -0.364%   |  -1.339%   |  +0.184%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 2.105% |  +0.578%   |  +6.448%   |  +6.089%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.555% |  -0.377%   |  +8.574%   |  +15.428%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.555% |  -0.231%   |  -0.064%   |  +3.003%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.523% |  +0.608%   |  +27.797%  |  +5.640%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.645% |  +0.758%   |  +6.067%   |  +4.020%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.476% |  +1.506%   |  +15.483%  |  +6.014%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 0.743% |  +0.159%   |  +2.754%   |  -4.040%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.504% |  +1.724%   |  +6.821%   |  +2.374%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.186% |  -0.367%   |  +6.755%   |  +6.250%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.293% |  -1.218%   |  +6.421%   |  +4.663%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 5.665% |  -1.875%   |  +17.804%  |  +10.006%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.591% |  -1.388%   |  +10.432%  |  +8.417%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.767% |  +0.055%   |  +9.680%   |  +6.576%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 5.013% |  -1.284%   |  +9.644%   |  +10.024%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.485% |  -1.565%   |  +10.804%  |  +9.535%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 4.018% |  +0.757%   |  +23.473%  |  +9.306%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.210% |  -0.584%   |  +6.145%   |  +6.881%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 0.935% |  +0.552%   |  +2.653%   |  -1.657%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 3.802% |  +0.461%   |  +11.112%  |  +17.460%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 1.161% |  +1.375%   |  +3.004%   |  +18.262%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 1.598% |  +0.563%   |  +8.259%   |  +5.708%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 0.791% |  +0.177%   |  +6.898%   |  +7.071%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.368% |  +0.015%   |  +3.838%   |  +7.172%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 2.149% |  -0.258%   |  -5.540%   |  +12.424%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 0.942% |  +0.370%   |  +7.887%   |  +8.274%   |
+-----+------------------------+--------+------------+------------+------------+

* 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-10-26

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 Oct 27 00:42:19 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Fri, 27 Oct 2017 04:42:19 -0000
Subject: [Python-checkins] bpo-31053: Remove redundant 'venv' argument in
 venv example (GH-2907)
Message-ID: <mailman.0.1509079342.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/d609b0c24ebdb748cabcc6c062dfc86f9000e6c4
commit: d609b0c24ebdb748cabcc6c062dfc86f9000e6c4
branch: master
author: cocoatomo <cocoatomo77 at gmail.com>
committer: Berker Peksag <berker.peksag at gmail.com>
date: 2017-10-27T07:42:11+03:00
summary:

bpo-31053: Remove redundant 'venv' argument in venv example (GH-2907)

files:
M Doc/using/venv-create.inc

diff --git a/Doc/using/venv-create.inc b/Doc/using/venv-create.inc
index 53f431b5cfd..4292592ba7a 100644
--- a/Doc/using/venv-create.inc
+++ b/Doc/using/venv-create.inc
@@ -33,7 +33,7 @@ On Windows, invoke the ``venv`` command as follows::
 Alternatively, if you configured the ``PATH`` and ``PATHEXT`` variables for
 your :ref:`Python installation <using-on-windows>`::
 
-    c:\>python -m venv myenv c:\path\to\myenv
+    c:\>python -m venv c:\path\to\myenv
 
 The command, if run with ``-h``, will show the available options::
 


From webhook-mailer at python.org  Fri Oct 27 00:47:03 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Fri, 27 Oct 2017 04:47:03 -0000
Subject: [Python-checkins] bpo-31053: Remove redundant 'venv' argument in
 venv example (GH-2907)
Message-ID: <mailman.1.1509079626.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/37d1d967eed4018ef397dd9d1515683e5b6b55e7
commit: 37d1d967eed4018ef397dd9d1515683e5b6b55e7
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Berker Peksag <berker.peksag at gmail.com>
date: 2017-10-27T07:47:00+03:00
summary:

bpo-31053: Remove redundant 'venv' argument in venv example (GH-2907)

(cherry picked from commit d609b0c24ebdb748cabcc6c062dfc86f9000e6c4)

files:
M Doc/using/venv-create.inc

diff --git a/Doc/using/venv-create.inc b/Doc/using/venv-create.inc
index 53f431b5cfd..4292592ba7a 100644
--- a/Doc/using/venv-create.inc
+++ b/Doc/using/venv-create.inc
@@ -33,7 +33,7 @@ On Windows, invoke the ``venv`` command as follows::
 Alternatively, if you configured the ``PATH`` and ``PATHEXT`` variables for
 your :ref:`Python installation <using-on-windows>`::
 
-    c:\>python -m venv myenv c:\path\to\myenv
+    c:\>python -m venv c:\path\to\myenv
 
 The command, if run with ``-h``, will show the available options::
 


From webhook-mailer at python.org  Fri Oct 27 03:04:36 2017
From: webhook-mailer at python.org (Vinay Sajip)
Date: Fri, 27 Oct 2017 07:04:36 -0000
Subject: [Python-checkins] bpo-30989: Sort in TimedRotatingFileHandler only
 when needed. (GH-2812)
Message-ID: <mailman.2.1509087877.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/afad147b59fe84b12317f7340ddd2deeecb22321
commit: afad147b59fe84b12317f7340ddd2deeecb22321
branch: master
author: Lovesh Harchandani <lovesh at users.noreply.github.com>
committer: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: 2017-10-27T08:04:33+01:00
summary:

bpo-30989: Sort in TimedRotatingFileHandler only when needed. (GH-2812)

TimedRotatingFileHandler.getFilesToDelete() now sorts only when needed.

files:
M Lib/logging/handlers.py

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index a815f033e60..d1871acfa4b 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -353,10 +353,10 @@ def getFilesToDelete(self):
                 suffix = fileName[plen:]
                 if self.extMatch.match(suffix):
                     result.append(os.path.join(dirName, fileName))
-        result.sort()
         if len(result) < self.backupCount:
             result = []
         else:
+            result.sort()
             result = result[:len(result) - self.backupCount]
         return result
 


From webhook-mailer at python.org  Fri Oct 27 03:06:23 2017
From: webhook-mailer at python.org (Vinay Sajip)
Date: Fri, 27 Oct 2017 07:06:23 -0000
Subject: [Python-checkins] Fixed sorting order of the LogRecord attributes
 in the documentation. (GH-4133)
Message-ID: <mailman.3.1509087984.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/2f3d6993d7ca4a4d218e0d63b126c94bc00a03b8
commit: 2f3d6993d7ca4a4d218e0d63b126c94bc00a03b8
branch: master
author: Arthur Darcet <arthur+github at darcet.fr>
committer: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: 2017-10-27T08:06:20+01:00
summary:

Fixed sorting order of the LogRecord attributes in the documentation. (GH-4133)

files:
M Doc/library/logging.rst

diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index d2c6c90c41c..148f131cac5 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -779,15 +779,15 @@ the options available to you.
 | lineno         | ``%(lineno)d``          | Source line number where the logging call was |
 |                |                         | issued (if available).                        |
 +----------------+-------------------------+-----------------------------------------------+
+| message        | ``%(message)s``         | The logged message, computed as ``msg %       |
+|                |                         | args``. This is set when                      |
+|                |                         | :meth:`Formatter.format` is invoked.          |
++----------------+-------------------------+-----------------------------------------------+
 | module         | ``%(module)s``          | Module (name portion of ``filename``).        |
 +----------------+-------------------------+-----------------------------------------------+
 | msecs          | ``%(msecs)d``           | Millisecond portion of the time when the      |
 |                |                         | :class:`LogRecord` was created.               |
 +----------------+-------------------------+-----------------------------------------------+
-| message        | ``%(message)s``         | The logged message, computed as ``msg %       |
-|                |                         | args``. This is set when                      |
-|                |                         | :meth:`Formatter.format` is invoked.          |
-+----------------+-------------------------+-----------------------------------------------+
 | msg            | You shouldn't need to   | The format string passed in the original      |
 |                | format this yourself.   | logging call. Merged with ``args`` to         |
 |                |                         | produce ``message``, or an arbitrary object   |


From solipsis at pitrou.net  Fri Oct 27 05:08:11 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 27 Oct 2017 09:08:11 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=69
Message-ID: <20171027090810.9521.B617B8234A5F0D74@psf.io>

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

test_functools leaked [0, 3, 1] memory blocks, sum=4
test_multiprocessing_spawn leaked [0, 44, 0] references, sum=44
test_multiprocessing_spawn leaked [0, 21, -2] memory blocks, sum=19
test_multiprocessing_spawn leaked [0, 2, 0] file descriptors, sum=2


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

From webhook-mailer at python.org  Fri Oct 27 05:46:10 2017
From: webhook-mailer at python.org (Nick Coghlan)
Date: Fri, 27 Oct 2017 09:46:10 -0000
Subject: [Python-checkins] bpo-31877: Add _Py_LegacyLocaleDetected and
 _PyCoerceLegacyLocale to pylifecycle.h (GH-4134)
Message-ID: <mailman.4.1509097572.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/031c4bfadb69feeda82ce886d6b0cadc638d2e1e
commit: 031c4bfadb69feeda82ce886d6b0cadc638d2e1e
branch: master
author: Erik Bray <erik.m.bray at gmail.com>
committer: Nick Coghlan <ncoghlan at gmail.com>
date: 2017-10-27T19:46:03+10:00
summary:

bpo-31877: Add _Py_LegacyLocaleDetected and _PyCoerceLegacyLocale to pylifecycle.h (GH-4134)

Only declaring these as interns inside the CLI's main C module
caused build problems on some platforms (notably Cygwin), so
this switches them to a regular underscore prefixed "private" C
API declaration.

files:
M Include/pylifecycle.h
M Programs/python.c

diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h
index e1737b5972b..8bbce7fd61d 100644
--- a/Include/pylifecycle.h
+++ b/Include/pylifecycle.h
@@ -133,6 +133,12 @@ PyAPI_FUNC(int) _PyOS_URandom(void *buffer, Py_ssize_t size);
 PyAPI_FUNC(int) _PyOS_URandomNonblock(void *buffer, Py_ssize_t size);
 #endif /* !Py_LIMITED_API */
 
+/* Legacy locale support */
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(void) _Py_CoerceLegacyLocale(void);
+PyAPI_FUNC(int) _Py_LegacyLocaleDetected(void);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Programs/python.c b/Programs/python.c
index 03f8295045c..4f6b9198c85 100644
--- a/Programs/python.c
+++ b/Programs/python.c
@@ -15,20 +15,6 @@ wmain(int argc, wchar_t **argv)
 }
 #else
 
-/* Access private pylifecycle helper API to better handle the legacy C locale
- *
- * The legacy C locale assumes ASCII as the default text encoding, which
- * causes problems not only for the CPython runtime, but also other
- * components like GNU readline.
- *
- * Accordingly, when the CLI detects it, it attempts to coerce it to a
- * more capable UTF-8 based alternative.
- *
- * See the documentation of the PYTHONCOERCECLOCALE setting for more details.
- *
- */
-extern int _Py_LegacyLocaleDetected(void);
-extern void _Py_CoerceLegacyLocale(void);
 
 int
 main(int argc, char **argv)
@@ -78,6 +64,16 @@ main(int argc, char **argv)
     setlocale(LC_ALL, "");
 #endif
 
+    /* The legacy C locale assumes ASCII as the default text encoding, which
+     * causes problems not only for the CPython runtime, but also other
+     * components like GNU readline.
+     *
+     * Accordingly, when the CLI detects it, it attempts to coerce it to a
+     * more capable UTF-8 based alternative.
+     *
+     * See the documentation of the PYTHONCOERCECLOCALE setting for more
+     * details.
+     */
     if (_Py_LegacyLocaleDetected()) {
         _Py_CoerceLegacyLocale();
     }


From webhook-mailer at python.org  Fri Oct 27 06:01:19 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Fri, 27 Oct 2017 10:01:19 -0000
Subject: [Python-checkins] Fix _socket module compilation on Cygwin. (#4137)
Message-ID: <mailman.5.1509098480.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/63ae04461fb0cc93ca57cd151103a8dd295581d6
commit: 63ae04461fb0cc93ca57cd151103a8dd295581d6
branch: master
author: Erik Bray <erik.m.bray at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-27T13:01:17+03:00
summary:

Fix _socket module compilation on Cygwin. (#4137)

files:
M Modules/socketmodule.c

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 0758f9bd409..6f114efe31e 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -234,7 +234,7 @@ if_indextoname(index) -- return the corresponding interface name\n\
 # include <ctype.h>
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__CYGWIN__)
 # include <sys/ioctl.h>
 #endif
 


From webhook-mailer at python.org  Fri Oct 27 07:25:22 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Fri, 27 Oct 2017 11:25:22 -0000
Subject: [Python-checkins] bpo-31545: Update documentation containing
 timedelta repr. (GH-3687)
Message-ID: <mailman.6.1509103533.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/843ea47a034307c7b1ca642dd70f0269255b289a
commit: 843ea47a034307c7b1ca642dd70f0269255b289a
branch: master
author: Utkarsh Upadhyay <mail at musicallyut.in>
committer: Berker Peksag <berker.peksag at gmail.com>
date: 2017-10-27T14:25:15+03:00
summary:

bpo-31545: Update documentation containing timedelta repr. (GH-3687)

This is a fix to the documentation to reflect the changes merged
in as part of bpo-30302.

files:
M Doc/library/datetime.rst

diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index d032d283eb9..dce51a16e86 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -365,13 +365,13 @@ Example usage:
     True
     >>> ten_years = 10 * year
     >>> ten_years, ten_years.days // 365
-    (datetime.timedelta(3650), 10)
+    (datetime.timedelta(days=3650), 10)
     >>> nine_years = ten_years - year
     >>> nine_years, nine_years.days // 365
-    (datetime.timedelta(3285), 9)
+    (datetime.timedelta(days=3285), 9)
     >>> three_years = nine_years // 3
     >>> three_years, three_years.days // 365
-    (datetime.timedelta(1095), 3)
+    (datetime.timedelta(days=1095), 3)
     >>> abs(three_years - ten_years) == 2 * three_years + year
     True
 
@@ -1354,12 +1354,12 @@ Using datetime with tzinfo:
     >>> dt1.dst()
     datetime.timedelta(0)
     >>> dt1.utcoffset()
-    datetime.timedelta(0, 3600)
+    datetime.timedelta(seconds=3600)
     >>> dt2 = datetime(2006, 6, 14, 13, 0, tzinfo=gmt1)
     >>> dt2.dst()
-    datetime.timedelta(0, 3600)
+    datetime.timedelta(seconds=3600)
     >>> dt2.utcoffset()
-    datetime.timedelta(0, 7200)
+    datetime.timedelta(seconds=7200)
     >>> # Convert datetime to another time zone
     >>> dt3 = dt2.astimezone(GMT2())
     >>> dt3     # doctest: +ELLIPSIS


From webhook-mailer at python.org  Fri Oct 27 08:27:09 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 27 Oct 2017 12:27:09 -0000
Subject: [Python-checkins] bpo-16135: Cleanup: Code rot left over from OS/2
 support (GH-4147)
Message-ID: <mailman.7.1509107232.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/03eb11f0b354751248b427455b89e9340cfd2b47
commit: 03eb11f0b354751248b427455b89e9340cfd2b47
branch: master
author: Erik Bray <erik.m.bray at gmail.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-10-27T05:27:06-07:00
summary:

bpo-16135: Cleanup: Code rot left over from OS/2 support (GH-4147)

Remove dangling references to PYCC_VACPP that are not relelvant
since removal of OS/2 support.

files:
M Modules/posixmodule.c
M Modules/socketmodule.c

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 661fa1312ad..de32327b304 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -210,15 +210,11 @@ extern char        *ctermid_r(char *);
 #endif
 
 #ifndef HAVE_UNISTD_H
-#if defined(PYCC_VACPP)
-extern int mkdir(char *);
-#else
 #if ( defined(__WATCOMC__) || defined(_MSC_VER) ) && !defined(__QNX__)
 extern int mkdir(const char *);
 #else
 extern int mkdir(const char *, mode_t);
 #endif
-#endif
 #if defined(__IBMC__) || defined(__IBMCPP__)
 extern int chdir(char *);
 extern int rmdir(char *);
@@ -3886,7 +3882,7 @@ os_mkdir_impl(PyObject *module, path_t *path, int mode, int dir_fd)
         result = mkdirat(dir_fd, path->narrow, mode);
     else
 #endif
-#if ( defined(__WATCOMC__) || defined(PYCC_VACPP) ) && !defined(__QNX__)
+#if defined(__WATCOMC__) && !defined(__QNX__)
         result = mkdir(path->narrow);
 #else
         result = mkdir(path->narrow, mode);
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 6f114efe31e..643148e53f9 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -226,13 +226,6 @@ if_indextoname(index) -- return the corresponding interface name\n\
 # include "pythread.h"
 #endif
 
-#if defined(PYCC_VACPP)
-# include <types.h>
-# include <io.h>
-# include <sys/ioctl.h>
-# include <utils.h>
-# include <ctype.h>
-#endif
 
 #if defined(__APPLE__) || defined(__CYGWIN__)
 # include <sys/ioctl.h>


From webhook-mailer at python.org  Fri Oct 27 08:35:13 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Fri, 27 Oct 2017 12:35:13 -0000
Subject: [Python-checkins] bpo-31174: Improve the code of
 test_tools.test_unparse. (#4146)
Message-ID: <mailman.8.1509107719.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/7351f9e5a91c403d15c6d556f9989b443f1296f9
commit: 7351f9e5a91c403d15c6d556f9989b443f1296f9
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-27T15:35:11+03:00
summary:

bpo-31174: Improve the code of test_tools.test_unparse. (#4146)

files:
M Lib/test/test_tools/test_unparse.py

diff --git a/Lib/test/test_tools/test_unparse.py b/Lib/test/test_tools/test_unparse.py
index bab49df3312..f3386f5e31a 100644
--- a/Lib/test/test_tools/test_unparse.py
+++ b/Lib/test/test_tools/test_unparse.py
@@ -268,12 +268,13 @@ class DirectoryTestCase(ASTTestCase):
     # test directories, relative to the root of the distribution
     test_directories = 'Lib', os.path.join('Lib', 'test')
 
-    def get_names(self):
-        if DirectoryTestCase.NAMES is not None:
-            return DirectoryTestCase.NAMES
+    @classmethod
+    def get_names(cls):
+        if cls.NAMES is not None:
+            return cls.NAMES
 
         names = []
-        for d in self.test_directories:
+        for d in cls.test_directories:
             test_dir = os.path.join(basepath, d)
             for n in os.listdir(test_dir):
                 if n.endswith('.py') and not n.startswith('bad'):
@@ -282,10 +283,9 @@ def get_names(self):
         # Test limited subset of files unless the 'cpu' resource is specified.
         if not test.support.is_resource_enabled("cpu"):
             names = random.sample(names, 10)
-            # bpo-31174: Store the names sample to always test the same files.
-            # It prevents false alarms when hunting reference leaks.
-            DirectoryTestCase.NAMES = names
-
+        # bpo-31174: Store the names sample to always test the same files.
+        # It prevents false alarms when hunting reference leaks.
+        cls.NAMES = names
         return names
 
     def test_files(self):


From webhook-mailer at python.org  Fri Oct 27 09:17:39 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Fri, 27 Oct 2017 13:17:39 -0000
Subject: [Python-checkins] bpo-31174: Improve the code of
 test_tools.test_unparse. (GH-4146) (#4148)
Message-ID: <mailman.9.1509110263.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/bb78898224c99cbf9c6beed8706869f9b66967c2
commit: bb78898224c99cbf9c6beed8706869f9b66967c2
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-27T16:17:36+03:00
summary:

bpo-31174: Improve the code of test_tools.test_unparse. (GH-4146) (#4148)

(cherry picked from commit 7351f9e5a91c403d15c6d556f9989b443f1296f9)

files:
M Lib/test/test_tools/test_unparse.py

diff --git a/Lib/test/test_tools/test_unparse.py b/Lib/test/test_tools/test_unparse.py
index bab49df3312..f3386f5e31a 100644
--- a/Lib/test/test_tools/test_unparse.py
+++ b/Lib/test/test_tools/test_unparse.py
@@ -268,12 +268,13 @@ class DirectoryTestCase(ASTTestCase):
     # test directories, relative to the root of the distribution
     test_directories = 'Lib', os.path.join('Lib', 'test')
 
-    def get_names(self):
-        if DirectoryTestCase.NAMES is not None:
-            return DirectoryTestCase.NAMES
+    @classmethod
+    def get_names(cls):
+        if cls.NAMES is not None:
+            return cls.NAMES
 
         names = []
-        for d in self.test_directories:
+        for d in cls.test_directories:
             test_dir = os.path.join(basepath, d)
             for n in os.listdir(test_dir):
                 if n.endswith('.py') and not n.startswith('bad'):
@@ -282,10 +283,9 @@ def get_names(self):
         # Test limited subset of files unless the 'cpu' resource is specified.
         if not test.support.is_resource_enabled("cpu"):
             names = random.sample(names, 10)
-            # bpo-31174: Store the names sample to always test the same files.
-            # It prevents false alarms when hunting reference leaks.
-            DirectoryTestCase.NAMES = names
-
+        # bpo-31174: Store the names sample to always test the same files.
+        # It prevents false alarms when hunting reference leaks.
+        cls.NAMES = names
         return names
 
     def test_files(self):


From webhook-mailer at python.org  Fri Oct 27 10:27:20 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 27 Oct 2017 14:27:20 -0000
Subject: [Python-checkins] faulthandler: use _PyTime_t rather than double
 for timeout (#4139)
Message-ID: <mailman.10.1509114441.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/93fd478231bba0c00a3561ea8db31774909ec714
commit: 93fd478231bba0c00a3561ea8db31774909ec714
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-27T07:27:12-07:00
summary:

faulthandler: use _PyTime_t rather than double for timeout (#4139)

Use the _PyTime_t type rather than double for the faulthandler
timeout in dump_traceback_later().

This change should fix the following Coverity warning:

CID 1420311:  Incorrect expression  (UNINTENDED_INTEGER_DIVISION)
Dividing integer expressions "9223372036854775807LL" and "1000LL",
and then converting the integer quotient to type "double". Any
remainder, or fractional part of the quotient, is ignored.

    if ((timeout * 1e6) >= (double) PY_TIMEOUT_MAX) {

The warning comes from (double)PY_TIMEOUT_MAX with:

    #define PY_TIMEOUT_MAX (PY_LLONG_MAX / 1000)

files:
M Modules/faulthandler.c

diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
index dba646b1287..9b51f7e30a9 100644
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -607,30 +607,33 @@ cancel_dump_traceback_later(void)
     }
 }
 
+#define SEC_TO_US (1000 * 1000)
+
 static char*
-format_timeout(double timeout)
+format_timeout(_PyTime_t us)
 {
-    unsigned long us, sec, min, hour;
-    double intpart, fracpart;
+    unsigned long sec, min, hour;
     char buffer[100];
 
-    fracpart = modf(timeout, &intpart);
-    sec = (unsigned long)intpart;
-    us = (unsigned long)(fracpart * 1e6);
+    /* the downcast is safe: the caller check that 0 < us <= LONG_MAX */
+    sec = (unsigned long)(us / SEC_TO_US);
+    us %= SEC_TO_US;
+
     min = sec / 60;
     sec %= 60;
     hour = min / 60;
     min %= 60;
 
-    if (us != 0)
+    if (us != 0) {
         PyOS_snprintf(buffer, sizeof(buffer),
-                      "Timeout (%lu:%02lu:%02lu.%06lu)!\n",
-                      hour, min, sec, us);
-    else
+                      "Timeout (%lu:%02lu:%02lu.%06u)!\n",
+                      hour, min, sec, (unsigned int)us);
+    }
+    else {
         PyOS_snprintf(buffer, sizeof(buffer),
                       "Timeout (%lu:%02lu:%02lu)!\n",
                       hour, min, sec);
-
+    }
     return _PyMem_Strdup(buffer);
 }
 
@@ -639,8 +642,8 @@ faulthandler_dump_traceback_later(PyObject *self,
                                    PyObject *args, PyObject *kwargs)
 {
     static char *kwlist[] = {"timeout", "repeat", "file", "exit", NULL};
-    double timeout;
-    PY_TIMEOUT_T timeout_us;
+    PyObject *timeout_obj;
+    _PyTime_t timeout, timeout_us;
     int repeat = 0;
     PyObject *file = NULL;
     int fd;
@@ -650,18 +653,25 @@ faulthandler_dump_traceback_later(PyObject *self,
     size_t header_len;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-        "d|iOi:dump_traceback_later", kwlist,
-        &timeout, &repeat, &file, &exit))
+        "O|iOi:dump_traceback_later", kwlist,
+        &timeout_obj, &repeat, &file, &exit))
         return NULL;
-    if ((timeout * 1e6) >= (double) PY_TIMEOUT_MAX) {
-        PyErr_SetString(PyExc_OverflowError,  "timeout value is too large");
+
+    if (_PyTime_FromSecondsObject(&timeout, timeout_obj,
+                                  _PyTime_ROUND_TIMEOUT) < 0) {
         return NULL;
     }
-    timeout_us = (PY_TIMEOUT_T)(timeout * 1e6);
+    timeout_us = _PyTime_AsMicroseconds(timeout, _PyTime_ROUND_TIMEOUT);
     if (timeout_us <= 0) {
         PyErr_SetString(PyExc_ValueError, "timeout must be greater than 0");
         return NULL;
     }
+    /* Limit to LONG_MAX seconds for format_timeout() */
+    if (timeout_us >= PY_TIMEOUT_MAX || timeout_us / SEC_TO_US >= LONG_MAX) {
+        PyErr_SetString(PyExc_OverflowError,
+                        "timeout value is too large");
+        return NULL;
+    }
 
     tstate = get_thread_state();
     if (tstate == NULL)
@@ -672,7 +682,7 @@ faulthandler_dump_traceback_later(PyObject *self,
         return NULL;
 
     /* format the timeout */
-    header = format_timeout(timeout);
+    header = format_timeout(timeout_us);
     if (header == NULL)
         return PyErr_NoMemory();
     header_len = strlen(header);
@@ -683,7 +693,8 @@ faulthandler_dump_traceback_later(PyObject *self,
     Py_XINCREF(file);
     Py_XSETREF(thread.file, file);
     thread.fd = fd;
-    thread.timeout_us = timeout_us;
+    /* the downcast is safe: we check that 0 < timeout_us < PY_TIMEOUT_MAX */
+    thread.timeout_us = (PY_TIMEOUT_T)timeout_us;
     thread.repeat = repeat;
     thread.interp = tstate->interp;
     thread.exit = exit;


From lp_benchmark_robot at intel.com  Fri Oct 27 18:25:29 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Fri, 27 Oct 2017 15:25:29 -0700
Subject: [Python-checkins] [1 down, 2 up,
 62 flat] Results for Python (master branch) 2017-10-27
Message-ID: <e3cd7123-ff99-442b-91a2-87fd6bf144a6@orsmsx106.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-27 03:02:51-07:00.
  - commit:		63ae044
  - previous commit:	275d2d9
  - revision date:	2017-10-27 13:01:17+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.122% |  -1.713%   |  +4.669%   |  +7.809%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |             call_method| 2.175% |  +5.085%   |  +25.402%  |  +5.390%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 3.372% |  +4.335%   |  +25.613%  |  +5.771%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) |     call_method_unknown| 1.342% |  +5.179%   |  +24.591%  |  +3.149%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 5.957% |  -0.818%   |  +7.288%   |  +9.404%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.693% |  +0.438%   |  +11.476%  |  +8.279%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.487% |  +0.116%   |  +8.213%   |  +9.627%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.829% |  -0.391%   |  +3.469%   |  +6.246%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.421% |  -2.305%   |  +5.286%   |  +20.367%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 6.734% |  -2.046%   |  +8.932%   |  +12.809%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.181% |  -0.427%   |  +4.793%   |  +5.970%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.501% |  -0.295%   |  +5.533%   |  +4.238%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 1.048% |  -1.784%   |  +2.976%   |  +5.566%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 1.155% |  +0.359%   |  +13.384%  |  +8.908%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 2.143% |  +0.635%   |  +9.968%   |  +9.032%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.797% |  -0.701%   |  +5.932%   |  +11.171%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 1.101% |  -1.302%   |  +9.996%   |  +11.269%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 2.793% |  -0.766%   |  +8.953%   |  +8.198%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.910% |  -0.435%   |  +3.274%   |  +9.372%   |
+-----+------------------------+--------+------------+------------+------------+
| :-( |              json_loads| 1.353% |  -5.258%   |  -3.458%   |  +14.191%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.457% |  -0.155%   |  +9.696%   |  +8.458%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.797% |  -1.734%   |  +46.983%  |  +12.988%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.662% |  +0.647%   |  +9.872%   |  +11.026%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.519% |  +1.158%   |  +18.484%  |  +11.381%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 1.992% |  +1.199%   |  +9.921%   |  +9.173%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.997% |  +0.189%   |  +3.814%   |  +5.059%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.846% |  -1.158%   |  -1.919%   |  +2.354%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.931% |  +0.236%   |  +7.097%   |  +7.008%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 0.923% |  +1.233%   |  +7.694%   |  +7.048%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 2.431% |  -0.100%   |  -0.978%   |  +21.027%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.288% |  +1.428%   |  +3.110%   |  +20.626%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.985% |  -0.505%   |  +4.632%   |  +17.428%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 4.503% |  -1.503%   |  +10.011%  |  +9.691%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.170% |  +0.079%   |  +0.475%   |  +10.345%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.129% |  +0.125%   |  +11.455%  |  +4.339%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.089% |  -0.016%   |  +2.680%   |  +4.562%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.528% |  -0.637%   |  +9.976%   |  +12.236%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.662% |  +0.355%   |  +1.298%   |  +11.547%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 1.156% |  -1.883%   |  -1.479%   |  +9.585%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.915% |  -3.465%   |  -4.851%   |  +2.096%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 1.487% |  -0.184%   |  +6.276%   |  +4.944%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.688% |  -1.158%   |  +7.515%   |  +14.671%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.376% |  +0.904%   |  +0.840%   |  +2.290%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.172% |  +0.043%   |  +27.828%  |  +7.229%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.779% |  -0.967%   |  +5.158%   |  +3.450%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 3.030% |  -0.889%   |  +14.731%  |  +6.720%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 1.841% |  -2.540%   |  +0.284%   |  +1.048%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.465% |  +0.892%   |  +7.652%   |  +0.141%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.037% |  -0.298%   |  +6.477%   |  +5.811%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.931% |  +0.100%   |  +6.515%   |  +4.087%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 3.582% |  +2.489%   |  +19.851%  |  +6.859%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.907% |  +0.601%   |  +10.970%  |  +8.179%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 2.066% |  -0.640%   |  +9.101%   |  +6.715%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.685% |  +0.569%   |  +10.158%  |  +8.740%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.174% |  -0.282%   |  +10.553%  |  +9.623%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 4.816% |  -2.070%   |  +21.889%  |  +11.777%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.094% |  -0.114%   |  +6.038%   |  +6.346%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.014% |  -0.628%   |  +2.042%   |  -0.961%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 6.035% |  -0.367%   |  +10.786%  |  +17.293%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.323% |  -0.553%   |  +2.468%   |  +17.604%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 2.166% |  -0.337%   |  +7.950%   |  +5.491%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 1.105% |  -0.974%   |  +5.992%   |  +7.432%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.431% |  -0.205%   |  +3.641%   |  +6.441%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 2.415% |  +0.562%   |  -4.947%   |  +11.983%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.166% |  -0.762%   |  +7.185%   |  +8.337%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

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

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 Oct 27 20:22:52 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 28 Oct 2017 00:22:52 -0000
Subject: [Python-checkins] bpo-31860: Make the font sample in the IDLE font
 configuration dialog editable. (#4106)
Message-ID: <mailman.11.1509150172.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/ed6554c487fb2403bc88be6deee611c7a4171d33
commit: ed6554c487fb2403bc88be6deee611c7a4171d33
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-10-27T20:22:44-04:00
summary:

bpo-31860: Make the font sample in the IDLE font configuration dialog editable. (#4106)

Changes persist while IDLE remains open

files:
A Misc/NEWS.d/next/IDLE/2017-10-24-16-21-50.bpo-31860.gECuWx.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 cea85580d43..099f5262b1e 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -189,6 +189,11 @@ def cancel(self):
         """
         self.destroy()
 
+    def destroy(self):
+        global font_sample_text
+        font_sample_text = self.fontpage.font_sample.get('1.0', 'end')
+        super().destroy()
+
     def help(self):
         """Create textview for config dialog help.
 
@@ -429,6 +434,35 @@ def save_all_changed_extensions(self):
 #     def other_methods():
 #         # Define tab-specific behavior.
 
+font_sample_text = (
+    '<ASCII/Latin1>\n'
+    'AaBbCcDdEeFfGgHhIiJj\n1234567890#:+=(){}[]\n'
+    '\u00a2\u00a3\u00a5\u00a7\u00a9\u00ab\u00ae\u00b6\u00bd\u011e'
+    '\u00c0\u00c1\u00c2\u00c3\u00c4\u00c5\u00c7\u00d0\u00d8\u00df\n'
+    '\n<IPA,Greek,Cyrillic>\n'
+    '\u0250\u0255\u0258\u025e\u025f\u0264\u026b\u026e\u0270\u0277'
+    '\u027b\u0281\u0283\u0286\u028e\u029e\u02a2\u02ab\u02ad\u02af\n'
+    '\u0391\u03b1\u0392\u03b2\u0393\u03b3\u0394\u03b4\u0395\u03b5'
+    '\u0396\u03b6\u0397\u03b7\u0398\u03b8\u0399\u03b9\u039a\u03ba\n'
+    '\u0411\u0431\u0414\u0434\u0416\u0436\u041f\u043f\u0424\u0444'
+    '\u0427\u0447\u042a\u044a\u042d\u044d\u0460\u0464\u046c\u04dc\n'
+    '\n<Hebrew, Arabic>\n'
+    '\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5\u05d6\u05d7\u05d8\u05d9'
+    '\u05da\u05db\u05dc\u05dd\u05de\u05df\u05e0\u05e1\u05e2\u05e3\n'
+    '\u0627\u0628\u062c\u062f\u0647\u0648\u0632\u062d\u0637\u064a'
+    '\u0660\u0661\u0662\u0663\u0664\u0665\u0666\u0667\u0668\u0669\n'
+    '\n<Devanagari, Tamil>\n'
+    '\u0966\u0967\u0968\u0969\u096a\u096b\u096c\u096d\u096e\u096f'
+    '\u0905\u0906\u0907\u0908\u0909\u090a\u090f\u0910\u0913\u0914\n'
+    '\u0be6\u0be7\u0be8\u0be9\u0bea\u0beb\u0bec\u0bed\u0bee\u0bef'
+    '\u0b85\u0b87\u0b89\u0b8e\n'
+    '\n<East Asian>\n'
+    '\u3007\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\n'
+    '\u6c49\u5b57\u6f22\u5b57\u4eba\u6728\u706b\u571f\u91d1\u6c34\n'
+    '\uac00\ub0d0\ub354\ub824\ubaa8\ubd64\uc218\uc720\uc988\uce58\n'
+    '\u3042\u3044\u3046\u3048\u304a\u30a2\u30a4\u30a6\u30a8\u30aa\n'
+    )
+
 
 class FontPage(Frame):
 
@@ -494,7 +528,8 @@ def create_page_font_tab(self):
         frame_font = LabelFrame(
                 self, borderwidth=2, relief=GROOVE, text=' Shell/Editor Font ')
         frame_sample = LabelFrame(
-                self, borderwidth=2, relief=GROOVE, text=' Font Sample ')
+                self, borderwidth=2, relief=GROOVE,
+                text=' Font Sample (Editable) ')
         frame_indent = LabelFrame(
                 self, borderwidth=2, relief=GROOVE, text=' Indentation Width ')
         # frame_font.
@@ -516,36 +551,8 @@ def create_page_font_tab(self):
                 frame_font_param, variable=self.font_bold,
                 onvalue=1, offvalue=0, text='Bold')
         # frame_sample.
-        sample = (
-            '<ASCII/Latin1>\n'
-            'AaBbCcDdEeFfGgHhIiJj\n1234567890#:+=(){}[]\n'
-            '\u00a2\u00a3\u00a5\u00a7\u00a9\u00ab\u00ae\u00b6\u00bd\u011e'
-            '\u00c0\u00c1\u00c2\u00c3\u00c4\u00c5\u00c7\u00d0\u00d8\u00df\n'
-            '\n<IPA,Greek,Cyrillic>\n'
-            '\u0250\u0255\u0258\u025e\u025f\u0264\u026b\u026e\u0270\u0277'
-            '\u027b\u0281\u0283\u0286\u028e\u029e\u02a2\u02ab\u02ad\u02af\n'
-            '\u0391\u03b1\u0392\u03b2\u0393\u03b3\u0394\u03b4\u0395\u03b5'
-            '\u0396\u03b6\u0397\u03b7\u0398\u03b8\u0399\u03b9\u039a\u03ba\n'
-            '\u0411\u0431\u0414\u0434\u0416\u0436\u041f\u043f\u0424\u0444'
-            '\u0427\u0447\u042a\u044a\u042d\u044d\u0460\u0464\u046c\u04dc\n'
-            '\n<Hebrew, Arabic>\n'
-            '\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5\u05d6\u05d7\u05d8\u05d9'
-            '\u05da\u05db\u05dc\u05dd\u05de\u05df\u05e0\u05e1\u05e2\u05e3\n'
-            '\u0627\u0628\u062c\u062f\u0647\u0648\u0632\u062d\u0637\u064a'
-            '\u0660\u0661\u0662\u0663\u0664\u0665\u0666\u0667\u0668\u0669\n'
-            '\n<Devanagari, Tamil>\n'
-            '\u0966\u0967\u0968\u0969\u096a\u096b\u096c\u096d\u096e\u096f'
-            '\u0905\u0906\u0907\u0908\u0909\u090a\u090f\u0910\u0913\u0914\n'
-            '\u0be6\u0be7\u0be8\u0be9\u0bea\u0beb\u0bec\u0bed\u0bee\u0bef'
-            '\u0b85\u0b87\u0b89\u0b8e\n'
-            '\n<East Asian>\n'
-            '\u3007\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\n'
-            '\u6c49\u5b57\u6f22\u5b57\u4eba\u6728\u706b\u571f\u91d1\u6c34\n'
-            '\uac00\ub0d0\ub354\ub824\ubaa8\ubd64\uc218\uc720\uc988\uce58\n'
-            '\u3042\u3044\u3046\u3048\u304a\u30a2\u30a4\u30a6\u30a8\u30aa\n'
-            )
-        temp_font = tkFont.Font(self, ('courier', 10, 'normal'))
-        self.font_sample = Label(frame_sample, text=sample, font=temp_font)
+        self.font_sample = Text(frame_sample, width=20, height=20)
+        self.font_sample.insert(END, font_sample_text)
         # frame_indent.
         indent_title = Label(
                 frame_indent, justify=LEFT,
@@ -2153,6 +2160,8 @@ def detach(self):
 Devanagari and Tamil lines start with digits.  The East Asian lines
 are Chinese digits, Chinese Hanzi, Korean Hangul, and Japanese
 Hiragana and Katakana.
+
+You can edit the font sample. Changes remain until IDLE is closed.
 ''',
     'Highlights': '''
 Highlighting:
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index dc7f69c2af8..982dc0b7eff 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -44,10 +44,9 @@ def tearDownModule():
     tracers.detach()
     tracers.clear()
     changes.clear()
-    del dialog
     root.update_idletasks()
     root.destroy()
-    del root
+    root = dialog = None
 
 
 class FontPageTest(unittest.TestCase):
@@ -192,6 +191,7 @@ def test_font_set(self):
     def test_set_samples(self):
         d = self.page
         del d.set_samples  # Unmask method for test
+        orig_samples = d.font_sample, d.highlight_sample
         d.font_sample, d.highlight_sample = {}, {}
         d.font_name.set('test')
         d.font_size.set('5')
@@ -202,7 +202,7 @@ def test_set_samples(self):
         d.set_samples()
         self.assertTrue(d.font_sample == d.highlight_sample == expected)
 
-        del d.font_sample, d.highlight_sample
+        d.font_sample, d.highlight_sample = orig_samples
         d.set_samples = Func()  # Re-mask for other tests.
 
 
diff --git a/Misc/NEWS.d/next/IDLE/2017-10-24-16-21-50.bpo-31860.gECuWx.rst b/Misc/NEWS.d/next/IDLE/2017-10-24-16-21-50.bpo-31860.gECuWx.rst
new file mode 100644
index 00000000000..a1c115e3f78
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-10-24-16-21-50.bpo-31860.gECuWx.rst
@@ -0,0 +1,2 @@
+The font sample in the IDLE configuration dialog is now editable.
+Changes persist while IDLE remains open


From webhook-mailer at python.org  Fri Oct 27 20:26:15 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 28 Oct 2017 00:26:15 -0000
Subject: [Python-checkins] IDLE -- Restrict shell prompt manipulaton to the
 shell. (#4143)
Message-ID: <mailman.12.1509150376.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/e86172d63af5827a3c2b55b80351cb38a26190eb
commit: e86172d63af5827a3c2b55b80351cb38a26190eb
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-10-27T20:26:12-04:00
summary:

IDLE -- Restrict shell prompt manipulaton to the shell. (#4143)

Editor and output windows only see an empty last prompt line.
This simplifies the code and fixes a minor bug when newline is inserted.
Sys.ps1, if present, is read on Shell start-up, but is not set or changed.

files:
A Misc/NEWS.d/next/IDLE/2017-10-26-20-20-19.bpo-31858.VuSA_e.rst
M Lib/idlelib/editor.py
M Lib/idlelib/pyshell.py

diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py
index 87d1eef01ec..68450c921f2 100644
--- a/Lib/idlelib/editor.py
+++ b/Lib/idlelib/editor.py
@@ -99,10 +99,6 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
         self.flist = flist
         root = root or flist.root
         self.root = root
-        try:
-            sys.ps1
-        except AttributeError:
-            sys.ps1 = '>>> '
         self.menubar = Menu(root)
         self.top = top = windows.ListedToplevel(root, menu=self.menubar)
         if flist:
@@ -116,6 +112,8 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
             self.top.instance_dict = {}
         self.recent_files_path = os.path.join(
                 idleConf.userdir, 'recent-files.lst')
+
+        self.prompt_last_line = ''  # Override in PyShell
         self.text_frame = text_frame = Frame(top)
         self.vbar = vbar = Scrollbar(text_frame, name='vbar')
         self.width = idleConf.GetOption('main', 'EditorWindow',
@@ -1213,13 +1211,9 @@ def smart_backspace_event(self, event):
         assert have > 0
         want = ((have - 1) // self.indentwidth) * self.indentwidth
         # Debug prompt is multilined....
-        if self.context_use_ps1:
-            last_line_of_prompt = sys.ps1.split('\n')[-1]
-        else:
-            last_line_of_prompt = ''
         ncharsdeleted = 0
         while 1:
-            if chars == last_line_of_prompt:
+            if chars == self.prompt_last_line:  # '' unless PyShell
                 break
             chars = chars[:-1]
             ncharsdeleted = ncharsdeleted + 1
@@ -1288,8 +1282,7 @@ def newline_and_indent_event(self, event):
             indent = line[:i]
             # strip whitespace before insert point unless it's in the prompt
             i = 0
-            last_line_of_prompt = sys.ps1.split('\n')[-1]
-            while line and line[-1] in " \t" and line != last_line_of_prompt:
+            while line and line[-1] in " \t" and line != self.prompt_last_line:
                 line = line[:-1]
                 i = i+1
             if i:
diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py
index 168eeae9ad8..8b07d52cc48 100755
--- a/Lib/idlelib/pyshell.py
+++ b/Lib/idlelib/pyshell.py
@@ -857,15 +857,17 @@ def __init__(self, flist=None):
             fixwordbreaks(root)
             root.withdraw()
             flist = PyShellFileList(root)
-        #
+
         OutputWindow.__init__(self, flist, None, None)
-        #
-##        self.config(usetabs=1, indentwidth=8, context_use_ps1=1)
+
         self.usetabs = True
         # indentwidth must be 8 when using tabs.  See note in EditorWindow:
         self.indentwidth = 8
-        self.context_use_ps1 = True
-        #
+
+        self.sys_ps1 = sys.ps1 if hasattr(sys, 'ps1') else '>>> '
+        self.prompt_last_line = self.sys_ps1.split('\n')[-1]
+        self.prompt = self.sys_ps1  # Changes when debug active
+
         text = self.text
         text.configure(wrap="char")
         text.bind("<<newline-and-indent>>", self.enter_callback)
@@ -878,7 +880,7 @@ def __init__(self, flist=None):
         if use_subprocess:
             text.bind("<<view-restart>>", self.view_restart_mark)
             text.bind("<<restart-shell>>", self.restart_shell)
-        #
+
         self.save_stdout = sys.stdout
         self.save_stderr = sys.stderr
         self.save_stdin = sys.stdin
@@ -951,7 +953,7 @@ def close_debugger(self):
                 debugger_r.close_remote_debugger(self.interp.rpcclt)
             self.resetoutput()
             self.console.write("[DEBUG OFF]\n")
-            sys.ps1 = ">>> "
+            self.prompt = self.sys_ps1
             self.showprompt()
         self.set_debugger_indicator()
 
@@ -963,7 +965,7 @@ def open_debugger(self):
             dbg_gui = debugger.Debugger(self)
         self.interp.setdebugger(dbg_gui)
         dbg_gui.load_breakpoints()
-        sys.ps1 = "[DEBUG ON]\n>>> "
+        self.prompt = "[DEBUG ON]\n" + self.sys_ps1
         self.showprompt()
         self.set_debugger_indicator()
 
@@ -1248,11 +1250,7 @@ def restart_shell(self, event=None):
 
     def showprompt(self):
         self.resetoutput()
-        try:
-            s = str(sys.ps1)
-        except:
-            s = ""
-        self.console.write(s)
+        self.console.write(self.prompt)
         self.text.mark_set("insert", "end-1c")
         self.set_line_and_column()
         self.io.reset_undo()
diff --git a/Misc/NEWS.d/next/IDLE/2017-10-26-20-20-19.bpo-31858.VuSA_e.rst b/Misc/NEWS.d/next/IDLE/2017-10-26-20-20-19.bpo-31858.VuSA_e.rst
new file mode 100644
index 00000000000..2ad9dc9662f
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-10-26-20-20-19.bpo-31858.VuSA_e.rst
@@ -0,0 +1,4 @@
+IDLE -- Restrict shell prompt manipulaton to the shell. Editor and output
+windows only see an empty last prompt line.  This simplifies the code and
+fixes a minor bug when newline is inserted. Sys.ps1, if present, is read on
+Shell start-up, but is not set or changed.


From webhook-mailer at python.org  Fri Oct 27 20:59:40 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 28 Oct 2017 00:59:40 -0000
Subject: [Python-checkins] bpo-31860: Make the font sample in the IDLE font
 configuration dialog editable. (GH-4106) (#4154)
Message-ID: <mailman.13.1509152381.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/6a2957de08e0c2d73f3124d12874b408cda4633d
commit: 6a2957de08e0c2d73f3124d12874b408cda4633d
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-10-27T20:59:38-04:00
summary:

bpo-31860: Make the font sample in the IDLE font configuration dialog editable. (GH-4106) (#4154)

Changes persist while IDLE remains open
(cherry picked from commit ed6554c487fb2403bc88be6deee611c7a4171d33)

files:
A Misc/NEWS.d/next/IDLE/2017-10-24-16-21-50.bpo-31860.gECuWx.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 cea85580d43..099f5262b1e 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -189,6 +189,11 @@ def cancel(self):
         """
         self.destroy()
 
+    def destroy(self):
+        global font_sample_text
+        font_sample_text = self.fontpage.font_sample.get('1.0', 'end')
+        super().destroy()
+
     def help(self):
         """Create textview for config dialog help.
 
@@ -429,6 +434,35 @@ def save_all_changed_extensions(self):
 #     def other_methods():
 #         # Define tab-specific behavior.
 
+font_sample_text = (
+    '<ASCII/Latin1>\n'
+    'AaBbCcDdEeFfGgHhIiJj\n1234567890#:+=(){}[]\n'
+    '\u00a2\u00a3\u00a5\u00a7\u00a9\u00ab\u00ae\u00b6\u00bd\u011e'
+    '\u00c0\u00c1\u00c2\u00c3\u00c4\u00c5\u00c7\u00d0\u00d8\u00df\n'
+    '\n<IPA,Greek,Cyrillic>\n'
+    '\u0250\u0255\u0258\u025e\u025f\u0264\u026b\u026e\u0270\u0277'
+    '\u027b\u0281\u0283\u0286\u028e\u029e\u02a2\u02ab\u02ad\u02af\n'
+    '\u0391\u03b1\u0392\u03b2\u0393\u03b3\u0394\u03b4\u0395\u03b5'
+    '\u0396\u03b6\u0397\u03b7\u0398\u03b8\u0399\u03b9\u039a\u03ba\n'
+    '\u0411\u0431\u0414\u0434\u0416\u0436\u041f\u043f\u0424\u0444'
+    '\u0427\u0447\u042a\u044a\u042d\u044d\u0460\u0464\u046c\u04dc\n'
+    '\n<Hebrew, Arabic>\n'
+    '\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5\u05d6\u05d7\u05d8\u05d9'
+    '\u05da\u05db\u05dc\u05dd\u05de\u05df\u05e0\u05e1\u05e2\u05e3\n'
+    '\u0627\u0628\u062c\u062f\u0647\u0648\u0632\u062d\u0637\u064a'
+    '\u0660\u0661\u0662\u0663\u0664\u0665\u0666\u0667\u0668\u0669\n'
+    '\n<Devanagari, Tamil>\n'
+    '\u0966\u0967\u0968\u0969\u096a\u096b\u096c\u096d\u096e\u096f'
+    '\u0905\u0906\u0907\u0908\u0909\u090a\u090f\u0910\u0913\u0914\n'
+    '\u0be6\u0be7\u0be8\u0be9\u0bea\u0beb\u0bec\u0bed\u0bee\u0bef'
+    '\u0b85\u0b87\u0b89\u0b8e\n'
+    '\n<East Asian>\n'
+    '\u3007\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\n'
+    '\u6c49\u5b57\u6f22\u5b57\u4eba\u6728\u706b\u571f\u91d1\u6c34\n'
+    '\uac00\ub0d0\ub354\ub824\ubaa8\ubd64\uc218\uc720\uc988\uce58\n'
+    '\u3042\u3044\u3046\u3048\u304a\u30a2\u30a4\u30a6\u30a8\u30aa\n'
+    )
+
 
 class FontPage(Frame):
 
@@ -494,7 +528,8 @@ def create_page_font_tab(self):
         frame_font = LabelFrame(
                 self, borderwidth=2, relief=GROOVE, text=' Shell/Editor Font ')
         frame_sample = LabelFrame(
-                self, borderwidth=2, relief=GROOVE, text=' Font Sample ')
+                self, borderwidth=2, relief=GROOVE,
+                text=' Font Sample (Editable) ')
         frame_indent = LabelFrame(
                 self, borderwidth=2, relief=GROOVE, text=' Indentation Width ')
         # frame_font.
@@ -516,36 +551,8 @@ def create_page_font_tab(self):
                 frame_font_param, variable=self.font_bold,
                 onvalue=1, offvalue=0, text='Bold')
         # frame_sample.
-        sample = (
-            '<ASCII/Latin1>\n'
-            'AaBbCcDdEeFfGgHhIiJj\n1234567890#:+=(){}[]\n'
-            '\u00a2\u00a3\u00a5\u00a7\u00a9\u00ab\u00ae\u00b6\u00bd\u011e'
-            '\u00c0\u00c1\u00c2\u00c3\u00c4\u00c5\u00c7\u00d0\u00d8\u00df\n'
-            '\n<IPA,Greek,Cyrillic>\n'
-            '\u0250\u0255\u0258\u025e\u025f\u0264\u026b\u026e\u0270\u0277'
-            '\u027b\u0281\u0283\u0286\u028e\u029e\u02a2\u02ab\u02ad\u02af\n'
-            '\u0391\u03b1\u0392\u03b2\u0393\u03b3\u0394\u03b4\u0395\u03b5'
-            '\u0396\u03b6\u0397\u03b7\u0398\u03b8\u0399\u03b9\u039a\u03ba\n'
-            '\u0411\u0431\u0414\u0434\u0416\u0436\u041f\u043f\u0424\u0444'
-            '\u0427\u0447\u042a\u044a\u042d\u044d\u0460\u0464\u046c\u04dc\n'
-            '\n<Hebrew, Arabic>\n'
-            '\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5\u05d6\u05d7\u05d8\u05d9'
-            '\u05da\u05db\u05dc\u05dd\u05de\u05df\u05e0\u05e1\u05e2\u05e3\n'
-            '\u0627\u0628\u062c\u062f\u0647\u0648\u0632\u062d\u0637\u064a'
-            '\u0660\u0661\u0662\u0663\u0664\u0665\u0666\u0667\u0668\u0669\n'
-            '\n<Devanagari, Tamil>\n'
-            '\u0966\u0967\u0968\u0969\u096a\u096b\u096c\u096d\u096e\u096f'
-            '\u0905\u0906\u0907\u0908\u0909\u090a\u090f\u0910\u0913\u0914\n'
-            '\u0be6\u0be7\u0be8\u0be9\u0bea\u0beb\u0bec\u0bed\u0bee\u0bef'
-            '\u0b85\u0b87\u0b89\u0b8e\n'
-            '\n<East Asian>\n'
-            '\u3007\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\n'
-            '\u6c49\u5b57\u6f22\u5b57\u4eba\u6728\u706b\u571f\u91d1\u6c34\n'
-            '\uac00\ub0d0\ub354\ub824\ubaa8\ubd64\uc218\uc720\uc988\uce58\n'
-            '\u3042\u3044\u3046\u3048\u304a\u30a2\u30a4\u30a6\u30a8\u30aa\n'
-            )
-        temp_font = tkFont.Font(self, ('courier', 10, 'normal'))
-        self.font_sample = Label(frame_sample, text=sample, font=temp_font)
+        self.font_sample = Text(frame_sample, width=20, height=20)
+        self.font_sample.insert(END, font_sample_text)
         # frame_indent.
         indent_title = Label(
                 frame_indent, justify=LEFT,
@@ -2153,6 +2160,8 @@ def detach(self):
 Devanagari and Tamil lines start with digits.  The East Asian lines
 are Chinese digits, Chinese Hanzi, Korean Hangul, and Japanese
 Hiragana and Katakana.
+
+You can edit the font sample. Changes remain until IDLE is closed.
 ''',
     'Highlights': '''
 Highlighting:
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index dc7f69c2af8..982dc0b7eff 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -44,10 +44,9 @@ def tearDownModule():
     tracers.detach()
     tracers.clear()
     changes.clear()
-    del dialog
     root.update_idletasks()
     root.destroy()
-    del root
+    root = dialog = None
 
 
 class FontPageTest(unittest.TestCase):
@@ -192,6 +191,7 @@ def test_font_set(self):
     def test_set_samples(self):
         d = self.page
         del d.set_samples  # Unmask method for test
+        orig_samples = d.font_sample, d.highlight_sample
         d.font_sample, d.highlight_sample = {}, {}
         d.font_name.set('test')
         d.font_size.set('5')
@@ -202,7 +202,7 @@ def test_set_samples(self):
         d.set_samples()
         self.assertTrue(d.font_sample == d.highlight_sample == expected)
 
-        del d.font_sample, d.highlight_sample
+        d.font_sample, d.highlight_sample = orig_samples
         d.set_samples = Func()  # Re-mask for other tests.
 
 
diff --git a/Misc/NEWS.d/next/IDLE/2017-10-24-16-21-50.bpo-31860.gECuWx.rst b/Misc/NEWS.d/next/IDLE/2017-10-24-16-21-50.bpo-31860.gECuWx.rst
new file mode 100644
index 00000000000..a1c115e3f78
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-10-24-16-21-50.bpo-31860.gECuWx.rst
@@ -0,0 +1,2 @@
+The font sample in the IDLE configuration dialog is now editable.
+Changes persist while IDLE remains open


From webhook-mailer at python.org  Fri Oct 27 21:39:40 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 28 Oct 2017 01:39:40 -0000
Subject: [Python-checkins] IDLE -- Restrict shell prompt manipulaton to the
 shell. (GH-4143) (#4155)
Message-ID: <mailman.14.1509154782.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/eb5aa3624eef693a5afa5a347784d4e294d8ea41
commit: eb5aa3624eef693a5afa5a347784d4e294d8ea41
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-10-27T21:39:37-04:00
summary:

IDLE -- Restrict shell prompt manipulaton to the shell. (GH-4143) (#4155)

Editor and output windows only see an empty last prompt line.
This simplifies the code and fixes a minor bug when newline is inserted.
Sys.ps1, if present, is read on Shell start-up, but is not set or changed.
(cherry picked from commit e86172d63af5827a3c2b55b80351cb38a26190eb)

files:
A Misc/NEWS.d/next/IDLE/2017-10-26-20-20-19.bpo-31858.VuSA_e.rst
M Lib/idlelib/editor.py
M Lib/idlelib/pyshell.py

diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py
index 87d1eef01ec..68450c921f2 100644
--- a/Lib/idlelib/editor.py
+++ b/Lib/idlelib/editor.py
@@ -99,10 +99,6 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
         self.flist = flist
         root = root or flist.root
         self.root = root
-        try:
-            sys.ps1
-        except AttributeError:
-            sys.ps1 = '>>> '
         self.menubar = Menu(root)
         self.top = top = windows.ListedToplevel(root, menu=self.menubar)
         if flist:
@@ -116,6 +112,8 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
             self.top.instance_dict = {}
         self.recent_files_path = os.path.join(
                 idleConf.userdir, 'recent-files.lst')
+
+        self.prompt_last_line = ''  # Override in PyShell
         self.text_frame = text_frame = Frame(top)
         self.vbar = vbar = Scrollbar(text_frame, name='vbar')
         self.width = idleConf.GetOption('main', 'EditorWindow',
@@ -1213,13 +1211,9 @@ def smart_backspace_event(self, event):
         assert have > 0
         want = ((have - 1) // self.indentwidth) * self.indentwidth
         # Debug prompt is multilined....
-        if self.context_use_ps1:
-            last_line_of_prompt = sys.ps1.split('\n')[-1]
-        else:
-            last_line_of_prompt = ''
         ncharsdeleted = 0
         while 1:
-            if chars == last_line_of_prompt:
+            if chars == self.prompt_last_line:  # '' unless PyShell
                 break
             chars = chars[:-1]
             ncharsdeleted = ncharsdeleted + 1
@@ -1288,8 +1282,7 @@ def newline_and_indent_event(self, event):
             indent = line[:i]
             # strip whitespace before insert point unless it's in the prompt
             i = 0
-            last_line_of_prompt = sys.ps1.split('\n')[-1]
-            while line and line[-1] in " \t" and line != last_line_of_prompt:
+            while line and line[-1] in " \t" and line != self.prompt_last_line:
                 line = line[:-1]
                 i = i+1
             if i:
diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py
index 168eeae9ad8..8b07d52cc48 100755
--- a/Lib/idlelib/pyshell.py
+++ b/Lib/idlelib/pyshell.py
@@ -857,15 +857,17 @@ def __init__(self, flist=None):
             fixwordbreaks(root)
             root.withdraw()
             flist = PyShellFileList(root)
-        #
+
         OutputWindow.__init__(self, flist, None, None)
-        #
-##        self.config(usetabs=1, indentwidth=8, context_use_ps1=1)
+
         self.usetabs = True
         # indentwidth must be 8 when using tabs.  See note in EditorWindow:
         self.indentwidth = 8
-        self.context_use_ps1 = True
-        #
+
+        self.sys_ps1 = sys.ps1 if hasattr(sys, 'ps1') else '>>> '
+        self.prompt_last_line = self.sys_ps1.split('\n')[-1]
+        self.prompt = self.sys_ps1  # Changes when debug active
+
         text = self.text
         text.configure(wrap="char")
         text.bind("<<newline-and-indent>>", self.enter_callback)
@@ -878,7 +880,7 @@ def __init__(self, flist=None):
         if use_subprocess:
             text.bind("<<view-restart>>", self.view_restart_mark)
             text.bind("<<restart-shell>>", self.restart_shell)
-        #
+
         self.save_stdout = sys.stdout
         self.save_stderr = sys.stderr
         self.save_stdin = sys.stdin
@@ -951,7 +953,7 @@ def close_debugger(self):
                 debugger_r.close_remote_debugger(self.interp.rpcclt)
             self.resetoutput()
             self.console.write("[DEBUG OFF]\n")
-            sys.ps1 = ">>> "
+            self.prompt = self.sys_ps1
             self.showprompt()
         self.set_debugger_indicator()
 
@@ -963,7 +965,7 @@ def open_debugger(self):
             dbg_gui = debugger.Debugger(self)
         self.interp.setdebugger(dbg_gui)
         dbg_gui.load_breakpoints()
-        sys.ps1 = "[DEBUG ON]\n>>> "
+        self.prompt = "[DEBUG ON]\n" + self.sys_ps1
         self.showprompt()
         self.set_debugger_indicator()
 
@@ -1248,11 +1250,7 @@ def restart_shell(self, event=None):
 
     def showprompt(self):
         self.resetoutput()
-        try:
-            s = str(sys.ps1)
-        except:
-            s = ""
-        self.console.write(s)
+        self.console.write(self.prompt)
         self.text.mark_set("insert", "end-1c")
         self.set_line_and_column()
         self.io.reset_undo()
diff --git a/Misc/NEWS.d/next/IDLE/2017-10-26-20-20-19.bpo-31858.VuSA_e.rst b/Misc/NEWS.d/next/IDLE/2017-10-26-20-20-19.bpo-31858.VuSA_e.rst
new file mode 100644
index 00000000000..2ad9dc9662f
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-10-26-20-20-19.bpo-31858.VuSA_e.rst
@@ -0,0 +1,4 @@
+IDLE -- Restrict shell prompt manipulaton to the shell. Editor and output
+windows only see an empty last prompt line.  This simplifies the code and
+fixes a minor bug when newline is inserted. Sys.ps1, if present, is read on
+Shell start-up, but is not set or changed.


From webhook-mailer at python.org  Fri Oct 27 21:45:21 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 28 Oct 2017 01:45:21 -0000
Subject: [Python-checkins] bpo-31836: Test_code_module now passes with
 sys.ps1, ps2 set (#4070)
Message-ID: <mailman.15.1509155123.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/5a4bbcd479ce86f68bbe12bc8c16e3447f32e13a
commit: 5a4bbcd479ce86f68bbe12bc8c16e3447f32e13a
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-10-27T21:45:19-04:00
summary:

bpo-31836: Test_code_module now passes with sys.ps1, ps2 set (#4070)

files:
A Misc/NEWS.d/next/IDLE/2017-10-21-15-41-53.bpo-31836.fheLME.rst
M Lib/test/test_code_module.py

diff --git a/Lib/test/test_code_module.py b/Lib/test/test_code_module.py
index 1a8f6990dfb..24db0ace801 100644
--- a/Lib/test/test_code_module.py
+++ b/Lib/test/test_code_module.py
@@ -28,16 +28,24 @@ def mock_sys(self):
         self.sysmod = stack.enter_context(prepatch)
         if sys.excepthook is sys.__excepthook__:
             self.sysmod.excepthook = self.sysmod.__excepthook__
+        del self.sysmod.ps1
+        del self.sysmod.ps2
 
     def test_ps1(self):
         self.infunc.side_effect = EOFError('Finished')
         self.console.interact()
         self.assertEqual(self.sysmod.ps1, '>>> ')
+        self.sysmod.ps1 = 'custom1> '
+        self.console.interact()
+        self.assertEqual(self.sysmod.ps1, 'custom1> ')
 
     def test_ps2(self):
         self.infunc.side_effect = EOFError('Finished')
         self.console.interact()
         self.assertEqual(self.sysmod.ps2, '... ')
+        self.sysmod.ps1 = 'custom2> '
+        self.console.interact()
+        self.assertEqual(self.sysmod.ps1, 'custom2> ')
 
     def test_console_stderr(self):
         self.infunc.side_effect = ["'antioch'", "", EOFError('Finished')]
diff --git a/Misc/NEWS.d/next/IDLE/2017-10-21-15-41-53.bpo-31836.fheLME.rst b/Misc/NEWS.d/next/IDLE/2017-10-21-15-41-53.bpo-31836.fheLME.rst
new file mode 100644
index 00000000000..a5c9153e365
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-10-21-15-41-53.bpo-31836.fheLME.rst
@@ -0,0 +1,4 @@
+Test_code_module now passes if run after test_idle, which sets ps1.
+
+The code module uses sys.ps1 if present or sets it to '>>> ' if not.
+Test_code_module now properly tests both behaviors.  Ditto for ps2.


From solipsis at pitrou.net  Sat Oct 28 05:08:04 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 28 Oct 2017 09:08:04 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=2
Message-ID: <20171028090804.112470.E4F655A671B69F57@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_spawn leaked [0, 0, -2] memory blocks, sum=-2


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

From webhook-mailer at python.org  Sat Oct 28 07:43:20 2017
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 28 Oct 2017 11:43:20 -0000
Subject: [Python-checkins] bpo-31836: Test_code_module now passes with
 sys.ps1, ps2 set (GH-4070) (#4156)
Message-ID: <mailman.16.1509191004.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/8ed5644f78e57cd59813097b35906ad6f1775f95
commit: 8ed5644f78e57cd59813097b35906ad6f1775f95
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2017-10-28T07:43:16-04:00
summary:

bpo-31836: Test_code_module now passes with sys.ps1, ps2 set (GH-4070) (#4156)

(cherry picked from commit 5a4bbcd479ce86f68bbe12bc8c16e3447f32e13a)

files:
A Misc/NEWS.d/next/IDLE/2017-10-21-15-41-53.bpo-31836.fheLME.rst
M Lib/test/test_code_module.py

diff --git a/Lib/test/test_code_module.py b/Lib/test/test_code_module.py
index 1a8f6990dfb..24db0ace801 100644
--- a/Lib/test/test_code_module.py
+++ b/Lib/test/test_code_module.py
@@ -28,16 +28,24 @@ def mock_sys(self):
         self.sysmod = stack.enter_context(prepatch)
         if sys.excepthook is sys.__excepthook__:
             self.sysmod.excepthook = self.sysmod.__excepthook__
+        del self.sysmod.ps1
+        del self.sysmod.ps2
 
     def test_ps1(self):
         self.infunc.side_effect = EOFError('Finished')
         self.console.interact()
         self.assertEqual(self.sysmod.ps1, '>>> ')
+        self.sysmod.ps1 = 'custom1> '
+        self.console.interact()
+        self.assertEqual(self.sysmod.ps1, 'custom1> ')
 
     def test_ps2(self):
         self.infunc.side_effect = EOFError('Finished')
         self.console.interact()
         self.assertEqual(self.sysmod.ps2, '... ')
+        self.sysmod.ps1 = 'custom2> '
+        self.console.interact()
+        self.assertEqual(self.sysmod.ps1, 'custom2> ')
 
     def test_console_stderr(self):
         self.infunc.side_effect = ["'antioch'", "", EOFError('Finished')]
diff --git a/Misc/NEWS.d/next/IDLE/2017-10-21-15-41-53.bpo-31836.fheLME.rst b/Misc/NEWS.d/next/IDLE/2017-10-21-15-41-53.bpo-31836.fheLME.rst
new file mode 100644
index 00000000000..a5c9153e365
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-10-21-15-41-53.bpo-31836.fheLME.rst
@@ -0,0 +1,4 @@
+Test_code_module now passes if run after test_idle, which sets ps1.
+
+The code module uses sys.ps1 if present or sets it to '>>> ' if not.
+Test_code_module now properly tests both behaviors.  Ditto for ps2.


From webhook-mailer at python.org  Sat Oct 28 19:12:01 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sat, 28 Oct 2017 23:12:01 -0000
Subject: [Python-checkins] bpo-20047: Make bytearray methods partition() and
 rpartition() rejecting (#4158)
Message-ID: <mailman.17.1509232324.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/a2314283ff87c65e1745a42c2f2b716b1a209128
commit: a2314283ff87c65e1745a42c2f2b716b1a209128
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-29T02:11:54+03:00
summary:

bpo-20047: Make bytearray methods partition() and rpartition() rejecting (#4158)

separators that are not bytes-like objects.

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-28-19-11-05.bpo-20047.GuNAto.rst
M Doc/library/stdtypes.rst
M Lib/test/test_bytes.py
M Objects/bytearrayobject.c
M Objects/bytesobject.c
M Objects/clinic/bytearrayobject.c.h
M Objects/clinic/bytesobject.c.h
M Objects/clinic/unicodeobject.c.h
M Objects/unicodeobject.c

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 2fce851e2e0..0bcafd33b20 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2573,8 +2573,9 @@ arbitrary binary data.
             bytearray.partition(sep)
 
    Split the sequence at the first occurrence of *sep*, and return a 3-tuple
-   containing the part before the separator, the separator, and the part
-   after the separator.  If the separator is not found, return a 3-tuple
+   containing the part before the separator, the separator itself or its
+   bytearray copy, and the part after the separator.
+   If the separator is not found, return a 3-tuple
    containing a copy of the original sequence, followed by two empty bytes or
    bytearray objects.
 
@@ -2629,8 +2630,9 @@ arbitrary binary data.
             bytearray.rpartition(sep)
 
    Split the sequence at the last occurrence of *sep*, and return a 3-tuple
-   containing the part before the separator, the separator, and the part
-   after the separator.  If the separator is not found, return a 3-tuple
+   containing the part before the separator, the separator itself or its
+   bytearray copy, and the part after the separator.
+   If the separator is not found, return a 3-tuple
    containing a copy of the original sequence, followed by two empty bytes or
    bytearray objects.
 
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 18091c1cfd2..1408fb4fb84 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -548,8 +548,16 @@ def test_replace(self):
         self.assertEqual(b.replace(b'i', b'a'), b'massassappa')
         self.assertEqual(b.replace(b'ss', b'x'), b'mixixippi')
 
+    def test_replace_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b'a b').replace, 32, b'')
+
     def test_split_string_error(self):
         self.assertRaises(TypeError, self.type2test(b'a b').split, ' ')
+        self.assertRaises(TypeError, self.type2test(b'a b').rsplit, ' ')
+
+    def test_split_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b'a b').split, 32)
+        self.assertRaises(TypeError, self.type2test(b'a b').rsplit, 32)
 
     def test_split_unicodewhitespace(self):
         for b in (b'a\x1Cb', b'a\x1Db', b'a\x1Eb', b'a\x1Fb'):
@@ -558,9 +566,6 @@ def test_split_unicodewhitespace(self):
         b = self.type2test(b"\x09\x0A\x0B\x0C\x0D\x1C\x1D\x1E\x1F")
         self.assertEqual(b.split(), [b'\x1c\x1d\x1e\x1f'])
 
-    def test_rsplit_string_error(self):
-        self.assertRaises(TypeError, self.type2test(b'a b').rsplit, ' ')
-
     def test_rsplit_unicodewhitespace(self):
         b = self.type2test(b"\x09\x0A\x0B\x0C\x0D\x1C\x1D\x1E\x1F")
         self.assertEqual(b.rsplit(), [b'\x1c\x1d\x1e\x1f'])
@@ -576,6 +581,14 @@ def test_rpartition(self):
         self.assertEqual(b.rpartition(b'i'), (b'mississipp', b'i', b''))
         self.assertEqual(b.rpartition(b'w'), (b'', b'', b'mississippi'))
 
+    def test_partition_string_error(self):
+        self.assertRaises(TypeError, self.type2test(b'a b').partition, ' ')
+        self.assertRaises(TypeError, self.type2test(b'a b').rpartition, ' ')
+
+    def test_partition_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b'a b').partition, 32)
+        self.assertRaises(TypeError, self.type2test(b'a b').rpartition, 32)
+
     def test_pickling(self):
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
             for b in b"", b"a", b"abc", b"\xffab\x80", b"\0\0\377\0\0":
@@ -608,9 +621,14 @@ def test_strip_bytearray(self):
         self.assertEqual(self.type2test(b'abc').rstrip(memoryview(b'ac')), b'ab')
 
     def test_strip_string_error(self):
-        self.assertRaises(TypeError, self.type2test(b'abc').strip, 'b')
-        self.assertRaises(TypeError, self.type2test(b'abc').lstrip, 'b')
-        self.assertRaises(TypeError, self.type2test(b'abc').rstrip, 'b')
+        self.assertRaises(TypeError, self.type2test(b'abc').strip, 'ac')
+        self.assertRaises(TypeError, self.type2test(b'abc').lstrip, 'ac')
+        self.assertRaises(TypeError, self.type2test(b'abc').rstrip, 'ac')
+
+    def test_strip_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b' abc ').strip, 32)
+        self.assertRaises(TypeError, self.type2test(b' abc ').lstrip, 32)
+        self.assertRaises(TypeError, self.type2test(b' abc ').rstrip, 32)
 
     def test_center(self):
         # Fill character can be either bytes or bytearray (issue 12380)
@@ -633,6 +651,11 @@ def test_rjust(self):
             self.assertEqual(b.rjust(7, fill_type(b'-')),
                              self.type2test(b'----abc'))
 
+    def test_xjust_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b'abc').center, 7, 32)
+        self.assertRaises(TypeError, self.type2test(b'abc').ljust, 7, 32)
+        self.assertRaises(TypeError, self.type2test(b'abc').rjust, 7, 32)
+
     def test_ord(self):
         b = self.type2test(b'\0A\x7f\x80\xff')
         self.assertEqual([ord(b[i:i+1]) for i in range(len(b))],
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-28-19-11-05.bpo-20047.GuNAto.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-28-19-11-05.bpo-20047.GuNAto.rst
new file mode 100644
index 00000000000..3594bacd368
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-28-19-11-05.bpo-20047.GuNAto.rst	
@@ -0,0 +1,3 @@
+Bytearray methods partition() and rpartition() now accept only bytes-like
+objects as separator, as documented.  In particular they now raise TypeError
+rather of returning a bogus result when an integer is passed as a separator.
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 840d5b0f9ba..c92cfc01fd1 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -104,6 +104,26 @@ PyByteArray_FromObject(PyObject *input)
                                         input, NULL);
 }
 
+static PyObject *
+_PyByteArray_FromBufferObject(PyObject *obj)
+{
+    PyObject *result;
+    Py_buffer view;
+
+    if (PyObject_GetBuffer(obj, &view, PyBUF_FULL_RO) < 0) {
+        return NULL;
+    }
+    result = PyByteArray_FromStringAndSize(NULL, view.len);
+    if (result != NULL &&
+        PyBuffer_ToContiguous(PyByteArray_AS_STRING(result),
+                              &view, view.len, 'C') < 0)
+    {
+        Py_CLEAR(result);
+    }
+    PyBuffer_Release(&view);
+    return result;
+}
+
 PyObject *
 PyByteArray_FromStringAndSize(const char *bytes, Py_ssize_t size)
 {
@@ -536,7 +556,8 @@ bytearray_setslice(PyByteArrayObject *self, Py_ssize_t lo, Py_ssize_t hi,
     if (values == (PyObject *)self) {
         /* Make a copy and call this function recursively */
         int err;
-        values = PyByteArray_FromObject(values);
+        values = PyByteArray_FromStringAndSize(PyByteArray_AS_STRING(values),
+                                               PyByteArray_GET_SIZE(values));
         if (values == NULL)
             return -1;
         err = bytearray_setslice(self, lo, hi, values);
@@ -1387,19 +1408,19 @@ Partition the bytearray into three parts using the given separator.
 
 This will search for the separator sep in the bytearray. If the separator is
 found, returns a 3-tuple containing the part before the separator, the
-separator itself, and the part after it.
+separator itself, and the part after it as new bytearray objects.
 
-If the separator is not found, returns a 3-tuple containing the original
-bytearray object and two empty bytearray objects.
+If the separator is not found, returns a 3-tuple containing the copy of the
+original bytearray object and two empty bytearray objects.
 [clinic start generated code]*/
 
 static PyObject *
 bytearray_partition(PyByteArrayObject *self, PyObject *sep)
-/*[clinic end generated code: output=45d2525ddd35f957 input=86f89223892b70b5]*/
+/*[clinic end generated code: output=45d2525ddd35f957 input=8f644749ee4fc83a]*/
 {
     PyObject *bytesep, *result;
 
-    bytesep = PyByteArray_FromObject(sep);
+    bytesep = _PyByteArray_FromBufferObject(sep);
     if (! bytesep)
         return NULL;
 
@@ -1420,23 +1441,24 @@ bytearray.rpartition
     sep: object
     /
 
-Partition the bytes into three parts using the given separator.
+Partition the bytearray into three parts using the given separator.
 
-This will search for the separator sep in the bytearray, starting and the end.
+This will search for the separator sep in the bytearray, starting at the end.
 If the separator is found, returns a 3-tuple containing the part before the
-separator, the separator itself, and the part after it.
+separator, the separator itself, and the part after it as new bytearray
+objects.
 
 If the separator is not found, returns a 3-tuple containing two empty bytearray
-objects and the original bytearray object.
+objects and the copy of the original bytearray object.
 [clinic start generated code]*/
 
 static PyObject *
 bytearray_rpartition(PyByteArrayObject *self, PyObject *sep)
-/*[clinic end generated code: output=440de3c9426115e8 input=5f4094f2de87c8f3]*/
+/*[clinic end generated code: output=440de3c9426115e8 input=7e3df3e6cb8fa0ac]*/
 {
     PyObject *bytesep, *result;
 
-    bytesep = PyByteArray_FromObject(sep);
+    bytesep = _PyByteArray_FromBufferObject(sep);
     if (! bytesep)
         return NULL;
 
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 48b6501f7a5..7ba90aa307b 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -1834,7 +1834,7 @@ bytes.rpartition
 
 Partition the bytes into three parts using the given separator.
 
-This will search for the separator sep in the bytes, starting and the end. If
+This will search for the separator sep in the bytes, starting at the end. If
 the separator is found, returns a 3-tuple containing the part before the
 separator, the separator itself, and the part after it.
 
@@ -1844,7 +1844,7 @@ objects and the original bytes object.
 
 static PyObject *
 bytes_rpartition_impl(PyBytesObject *self, Py_buffer *sep)
-/*[clinic end generated code: output=191b114cbb028e50 input=67f689e63a62d478]*/
+/*[clinic end generated code: output=191b114cbb028e50 input=d78db010c8cfdbe1]*/
 {
     return stringlib_rpartition(
         (PyObject*) self,
diff --git a/Objects/clinic/bytearrayobject.c.h b/Objects/clinic/bytearrayobject.c.h
index 319c86e73d8..d45592be559 100644
--- a/Objects/clinic/bytearrayobject.c.h
+++ b/Objects/clinic/bytearrayobject.c.h
@@ -214,10 +214,10 @@ PyDoc_STRVAR(bytearray_partition__doc__,
 "\n"
 "This will search for the separator sep in the bytearray. If the separator is\n"
 "found, returns a 3-tuple containing the part before the separator, the\n"
-"separator itself, and the part after it.\n"
+"separator itself, and the part after it as new bytearray objects.\n"
 "\n"
-"If the separator is not found, returns a 3-tuple containing the original\n"
-"bytearray object and two empty bytearray objects.");
+"If the separator is not found, returns a 3-tuple containing the copy of the\n"
+"original bytearray object and two empty bytearray objects.");
 
 #define BYTEARRAY_PARTITION_METHODDEF    \
     {"partition", (PyCFunction)bytearray_partition, METH_O, bytearray_partition__doc__},
@@ -226,14 +226,15 @@ PyDoc_STRVAR(bytearray_rpartition__doc__,
 "rpartition($self, sep, /)\n"
 "--\n"
 "\n"
-"Partition the bytes into three parts using the given separator.\n"
+"Partition the bytearray into three parts using the given separator.\n"
 "\n"
-"This will search for the separator sep in the bytearray, starting and the end.\n"
+"This will search for the separator sep in the bytearray, starting at the end.\n"
 "If the separator is found, returns a 3-tuple containing the part before the\n"
-"separator, the separator itself, and the part after it.\n"
+"separator, the separator itself, and the part after it as new bytearray\n"
+"objects.\n"
 "\n"
 "If the separator is not found, returns a 3-tuple containing two empty bytearray\n"
-"objects and the original bytearray object.");
+"objects and the copy of the original bytearray object.");
 
 #define BYTEARRAY_RPARTITION_METHODDEF    \
     {"rpartition", (PyCFunction)bytearray_rpartition, METH_O, bytearray_rpartition__doc__},
@@ -711,4 +712,4 @@ bytearray_sizeof(PyByteArrayObject *self, PyObject *Py_UNUSED(ignored))
 {
     return bytearray_sizeof_impl(self);
 }
-/*[clinic end generated code: output=e53f10084457a46b input=a9049054013a1b77]*/
+/*[clinic end generated code: output=c2804d009182328c input=a9049054013a1b77]*/
diff --git a/Objects/clinic/bytesobject.c.h b/Objects/clinic/bytesobject.c.h
index 315f6f25098..9c358b54e33 100644
--- a/Objects/clinic/bytesobject.c.h
+++ b/Objects/clinic/bytesobject.c.h
@@ -86,7 +86,7 @@ PyDoc_STRVAR(bytes_rpartition__doc__,
 "\n"
 "Partition the bytes into three parts using the given separator.\n"
 "\n"
-"This will search for the separator sep in the bytes, starting and the end. If\n"
+"This will search for the separator sep in the bytes, starting at the end. If\n"
 "the separator is found, returns a 3-tuple containing the part before the\n"
 "separator, the separator itself, and the part after it.\n"
 "\n"
@@ -499,4 +499,4 @@ bytes_fromhex(PyTypeObject *type, PyObject *arg)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=9e3374bd7d04c163 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=fc9e02359cc56d36 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/unicodeobject.c.h b/Objects/clinic/unicodeobject.c.h
index ca90e6d9cce..09365277af1 100644
--- a/Objects/clinic/unicodeobject.c.h
+++ b/Objects/clinic/unicodeobject.c.h
@@ -682,7 +682,7 @@ PyDoc_STRVAR(unicode_rpartition__doc__,
 "\n"
 "Partition the string into three parts using the given separator.\n"
 "\n"
-"This will search for the separator in the string, starting and the end. If\n"
+"This will search for the separator in the string, starting at the end. If\n"
 "the separator is found, returns a 3-tuple containing the part before the\n"
 "separator, the separator itself, and the part after it.\n"
 "\n"
@@ -930,4 +930,4 @@ unicode_sizeof(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     return unicode_sizeof_impl(self);
 }
-/*[clinic end generated code: output=8fd799fd7f2cc724 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=816292e81a8a732e input=a9049054013a1b77]*/
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 2f308774d71..6533f4142b5 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -13067,7 +13067,7 @@ str.rpartition as unicode_rpartition = str.partition
 
 Partition the string into three parts using the given separator.
 
-This will search for the separator in the string, starting and the end. If
+This will search for the separator in the string, starting at the end. If
 the separator is found, returns a 3-tuple containing the part before the
 separator, the separator itself, and the part after it.
 
@@ -13077,7 +13077,7 @@ and the original string.
 
 static PyObject *
 unicode_rpartition(PyObject *self, PyObject *sep)
-/*[clinic end generated code: output=1aa13cf1156572aa input=e77c7acb69bdfca6]*/
+/*[clinic end generated code: output=1aa13cf1156572aa input=c4b7db3ef5cf336a]*/
 {
     return PyUnicode_RPartition(self, sep);
 }


From webhook-mailer at python.org  Sun Oct 29 00:06:51 2017
From: webhook-mailer at python.org (Berker Peksag)
Date: Sun, 29 Oct 2017 04:06:51 -0000
Subject: [Python-checkins] bpo-31065: Add doc about Popen.poll returning
 None. (GH-3169)
Message-ID: <mailman.18.1509250015.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/0f1973d06e2116deafb19bbb9443b138187803c7
commit: 0f1973d06e2116deafb19bbb9443b138187803c7
branch: 3.6
author: Berker Peksag <berker.peksag at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-29T07:06:48+03:00
summary:

bpo-31065: Add doc about Popen.poll returning None. (GH-3169)

(cherry picked from commit 006617ff7d6df3fdedcfe53e94ee2c52cc796437)

files:
M Doc/library/subprocess.rst

diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index 27f3e825961..ea7e664f578 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 solipsis at pitrou.net  Sun Oct 29 05:08:07 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 29 Oct 2017 09:08:07 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=3
Message-ID: <20171029090759.9593.A5A7E0722DAAF385@psf.io>

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

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


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

From webhook-mailer at python.org  Sun Oct 29 06:24:51 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sun, 29 Oct 2017 10:24:51 -0000
Subject: [Python-checkins] [3.6] bpo-20047: Make bytearray methods
 partition() and rpartition() rejecting (GH-4158) (#4162)
Message-ID: <mailman.19.1509272696.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/9ea5a3a45b35d01b602e7e4da4f72b2db407e5c6
commit: 9ea5a3a45b35d01b602e7e4da4f72b2db407e5c6
branch: 3.6
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-29T12:24:45+02:00
summary:

[3.6] bpo-20047: Make bytearray methods partition() and rpartition() rejecting (GH-4158) (#4162)

separators that are not bytes-like objects..
(cherry picked from commit a2314283ff87c65e1745a42c2f2b716b1a209128)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-28-19-11-05.bpo-20047.GuNAto.rst
M Doc/library/stdtypes.rst
M Lib/test/test_bytes.py
M Objects/bytearrayobject.c
M Objects/bytesobject.c
M Objects/clinic/bytearrayobject.c.h
M Objects/clinic/bytesobject.c.h

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index b8c4d59363d..75e97b9d8f5 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2564,8 +2564,9 @@ arbitrary binary data.
             bytearray.partition(sep)
 
    Split the sequence at the first occurrence of *sep*, and return a 3-tuple
-   containing the part before the separator, the separator, and the part
-   after the separator.  If the separator is not found, return a 3-tuple
+   containing the part before the separator, the separator itself or its
+   bytearray copy, and the part after the separator.
+   If the separator is not found, return a 3-tuple
    containing a copy of the original sequence, followed by two empty bytes or
    bytearray objects.
 
@@ -2620,8 +2621,9 @@ arbitrary binary data.
             bytearray.rpartition(sep)
 
    Split the sequence at the last occurrence of *sep*, and return a 3-tuple
-   containing the part before the separator, the separator, and the part
-   after the separator.  If the separator is not found, return a 3-tuple
+   containing the part before the separator, the separator itself or its
+   bytearray copy, and the part after the separator.
+   If the separator is not found, return a 3-tuple
    containing a copy of the original sequence, followed by two empty bytes or
    bytearray objects.
 
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index cd82fa64570..6fcc26a0a1b 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -540,8 +540,16 @@ def test_replace(self):
         self.assertEqual(b.replace(b'i', b'a'), b'massassappa')
         self.assertEqual(b.replace(b'ss', b'x'), b'mixixippi')
 
+    def test_replace_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b'a b').replace, 32, b'')
+
     def test_split_string_error(self):
         self.assertRaises(TypeError, self.type2test(b'a b').split, ' ')
+        self.assertRaises(TypeError, self.type2test(b'a b').rsplit, ' ')
+
+    def test_split_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b'a b').split, 32)
+        self.assertRaises(TypeError, self.type2test(b'a b').rsplit, 32)
 
     def test_split_unicodewhitespace(self):
         for b in (b'a\x1Cb', b'a\x1Db', b'a\x1Eb', b'a\x1Fb'):
@@ -550,9 +558,6 @@ def test_split_unicodewhitespace(self):
         b = self.type2test(b"\x09\x0A\x0B\x0C\x0D\x1C\x1D\x1E\x1F")
         self.assertEqual(b.split(), [b'\x1c\x1d\x1e\x1f'])
 
-    def test_rsplit_string_error(self):
-        self.assertRaises(TypeError, self.type2test(b'a b').rsplit, ' ')
-
     def test_rsplit_unicodewhitespace(self):
         b = self.type2test(b"\x09\x0A\x0B\x0C\x0D\x1C\x1D\x1E\x1F")
         self.assertEqual(b.rsplit(), [b'\x1c\x1d\x1e\x1f'])
@@ -568,6 +573,14 @@ def test_rpartition(self):
         self.assertEqual(b.rpartition(b'i'), (b'mississipp', b'i', b''))
         self.assertEqual(b.rpartition(b'w'), (b'', b'', b'mississippi'))
 
+    def test_partition_string_error(self):
+        self.assertRaises(TypeError, self.type2test(b'a b').partition, ' ')
+        self.assertRaises(TypeError, self.type2test(b'a b').rpartition, ' ')
+
+    def test_partition_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b'a b').partition, 32)
+        self.assertRaises(TypeError, self.type2test(b'a b').rpartition, 32)
+
     def test_pickling(self):
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
             for b in b"", b"a", b"abc", b"\xffab\x80", b"\0\0\377\0\0":
@@ -600,9 +613,14 @@ def test_strip_bytearray(self):
         self.assertEqual(self.type2test(b'abc').rstrip(memoryview(b'ac')), b'ab')
 
     def test_strip_string_error(self):
-        self.assertRaises(TypeError, self.type2test(b'abc').strip, 'b')
-        self.assertRaises(TypeError, self.type2test(b'abc').lstrip, 'b')
-        self.assertRaises(TypeError, self.type2test(b'abc').rstrip, 'b')
+        self.assertRaises(TypeError, self.type2test(b'abc').strip, 'ac')
+        self.assertRaises(TypeError, self.type2test(b'abc').lstrip, 'ac')
+        self.assertRaises(TypeError, self.type2test(b'abc').rstrip, 'ac')
+
+    def test_strip_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b' abc ').strip, 32)
+        self.assertRaises(TypeError, self.type2test(b' abc ').lstrip, 32)
+        self.assertRaises(TypeError, self.type2test(b' abc ').rstrip, 32)
 
     def test_center(self):
         # Fill character can be either bytes or bytearray (issue 12380)
@@ -625,6 +643,11 @@ def test_rjust(self):
             self.assertEqual(b.rjust(7, fill_type(b'-')),
                              self.type2test(b'----abc'))
 
+    def test_xjust_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b'abc').center, 7, 32)
+        self.assertRaises(TypeError, self.type2test(b'abc').ljust, 7, 32)
+        self.assertRaises(TypeError, self.type2test(b'abc').rjust, 7, 32)
+
     def test_ord(self):
         b = self.type2test(b'\0A\x7f\x80\xff')
         self.assertEqual([ord(b[i:i+1]) for i in range(len(b))],
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-28-19-11-05.bpo-20047.GuNAto.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-28-19-11-05.bpo-20047.GuNAto.rst
new file mode 100644
index 00000000000..3594bacd368
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-28-19-11-05.bpo-20047.GuNAto.rst	
@@ -0,0 +1,3 @@
+Bytearray methods partition() and rpartition() now accept only bytes-like
+objects as separator, as documented.  In particular they now raise TypeError
+rather of returning a bogus result when an integer is passed as a separator.
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index a9c8ca6f1f3..7653322b829 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -102,6 +102,26 @@ PyByteArray_FromObject(PyObject *input)
                                         input, NULL);
 }
 
+static PyObject *
+_PyByteArray_FromBufferObject(PyObject *obj)
+{
+    PyObject *result;
+    Py_buffer view;
+
+    if (PyObject_GetBuffer(obj, &view, PyBUF_FULL_RO) < 0) {
+        return NULL;
+    }
+    result = PyByteArray_FromStringAndSize(NULL, view.len);
+    if (result != NULL &&
+        PyBuffer_ToContiguous(PyByteArray_AS_STRING(result),
+                              &view, view.len, 'C') < 0)
+    {
+        Py_CLEAR(result);
+    }
+    PyBuffer_Release(&view);
+    return result;
+}
+
 PyObject *
 PyByteArray_FromStringAndSize(const char *bytes, Py_ssize_t size)
 {
@@ -534,7 +554,8 @@ bytearray_setslice(PyByteArrayObject *self, Py_ssize_t lo, Py_ssize_t hi,
     if (values == (PyObject *)self) {
         /* Make a copy and call this function recursively */
         int err;
-        values = PyByteArray_FromObject(values);
+        values = PyByteArray_FromStringAndSize(PyByteArray_AS_STRING(values),
+                                               PyByteArray_GET_SIZE(values));
         if (values == NULL)
             return -1;
         err = bytearray_setslice(self, lo, hi, values);
@@ -1381,19 +1402,19 @@ Partition the bytearray into three parts using the given separator.
 
 This will search for the separator sep in the bytearray. If the separator is
 found, returns a 3-tuple containing the part before the separator, the
-separator itself, and the part after it.
+separator itself, and the part after it as new bytearray objects.
 
-If the separator is not found, returns a 3-tuple containing the original
-bytearray object and two empty bytearray objects.
+If the separator is not found, returns a 3-tuple containing the copy of the
+original bytearray object and two empty bytearray objects.
 [clinic start generated code]*/
 
 static PyObject *
 bytearray_partition(PyByteArrayObject *self, PyObject *sep)
-/*[clinic end generated code: output=45d2525ddd35f957 input=86f89223892b70b5]*/
+/*[clinic end generated code: output=45d2525ddd35f957 input=8f644749ee4fc83a]*/
 {
     PyObject *bytesep, *result;
 
-    bytesep = PyByteArray_FromObject(sep);
+    bytesep = _PyByteArray_FromBufferObject(sep);
     if (! bytesep)
         return NULL;
 
@@ -1414,23 +1435,24 @@ bytearray.rpartition
     sep: object
     /
 
-Partition the bytes into three parts using the given separator.
+Partition the bytearray into three parts using the given separator.
 
-This will search for the separator sep in the bytearray, starting and the end.
+This will search for the separator sep in the bytearray, starting at the end.
 If the separator is found, returns a 3-tuple containing the part before the
-separator, the separator itself, and the part after it.
+separator, the separator itself, and the part after it as new bytearray
+objects.
 
 If the separator is not found, returns a 3-tuple containing two empty bytearray
-objects and the original bytearray object.
+objects and the copy of the original bytearray object.
 [clinic start generated code]*/
 
 static PyObject *
 bytearray_rpartition(PyByteArrayObject *self, PyObject *sep)
-/*[clinic end generated code: output=440de3c9426115e8 input=5f4094f2de87c8f3]*/
+/*[clinic end generated code: output=440de3c9426115e8 input=7e3df3e6cb8fa0ac]*/
 {
     PyObject *bytesep, *result;
 
-    bytesep = PyByteArray_FromObject(sep);
+    bytesep = _PyByteArray_FromBufferObject(sep);
     if (! bytesep)
         return NULL;
 
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 489062e8355..4950d01a6e4 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -1832,7 +1832,7 @@ bytes.rpartition
 
 Partition the bytes into three parts using the given separator.
 
-This will search for the separator sep in the bytes, starting and the end. If
+This will search for the separator sep in the bytes, starting at the end. If
 the separator is found, returns a 3-tuple containing the part before the
 separator, the separator itself, and the part after it.
 
@@ -1842,7 +1842,7 @@ objects and the original bytes object.
 
 static PyObject *
 bytes_rpartition_impl(PyBytesObject *self, Py_buffer *sep)
-/*[clinic end generated code: output=191b114cbb028e50 input=67f689e63a62d478]*/
+/*[clinic end generated code: output=191b114cbb028e50 input=d78db010c8cfdbe1]*/
 {
     return stringlib_rpartition(
         (PyObject*) self,
diff --git a/Objects/clinic/bytearrayobject.c.h b/Objects/clinic/bytearrayobject.c.h
index c75acb75cf8..c164c79f626 100644
--- a/Objects/clinic/bytearrayobject.c.h
+++ b/Objects/clinic/bytearrayobject.c.h
@@ -214,10 +214,10 @@ PyDoc_STRVAR(bytearray_partition__doc__,
 "\n"
 "This will search for the separator sep in the bytearray. If the separator is\n"
 "found, returns a 3-tuple containing the part before the separator, the\n"
-"separator itself, and the part after it.\n"
+"separator itself, and the part after it as new bytearray objects.\n"
 "\n"
-"If the separator is not found, returns a 3-tuple containing the original\n"
-"bytearray object and two empty bytearray objects.");
+"If the separator is not found, returns a 3-tuple containing the copy of the\n"
+"original bytearray object and two empty bytearray objects.");
 
 #define BYTEARRAY_PARTITION_METHODDEF    \
     {"partition", (PyCFunction)bytearray_partition, METH_O, bytearray_partition__doc__},
@@ -226,14 +226,15 @@ PyDoc_STRVAR(bytearray_rpartition__doc__,
 "rpartition($self, sep, /)\n"
 "--\n"
 "\n"
-"Partition the bytes into three parts using the given separator.\n"
+"Partition the bytearray into three parts using the given separator.\n"
 "\n"
-"This will search for the separator sep in the bytearray, starting and the end.\n"
+"This will search for the separator sep in the bytearray, starting at the end.\n"
 "If the separator is found, returns a 3-tuple containing the part before the\n"
-"separator, the separator itself, and the part after it.\n"
+"separator, the separator itself, and the part after it as new bytearray\n"
+"objects.\n"
 "\n"
 "If the separator is not found, returns a 3-tuple containing two empty bytearray\n"
-"objects and the original bytearray object.");
+"objects and the copy of the original bytearray object.");
 
 #define BYTEARRAY_RPARTITION_METHODDEF    \
     {"rpartition", (PyCFunction)bytearray_rpartition, METH_O, bytearray_rpartition__doc__},
@@ -711,4 +712,4 @@ bytearray_sizeof(PyByteArrayObject *self, PyObject *Py_UNUSED(ignored))
 {
     return bytearray_sizeof_impl(self);
 }
-/*[clinic end generated code: output=225342a680391b9c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=8f022100f059226c input=a9049054013a1b77]*/
diff --git a/Objects/clinic/bytesobject.c.h b/Objects/clinic/bytesobject.c.h
index a11ebd27749..191de20f517 100644
--- a/Objects/clinic/bytesobject.c.h
+++ b/Objects/clinic/bytesobject.c.h
@@ -86,7 +86,7 @@ PyDoc_STRVAR(bytes_rpartition__doc__,
 "\n"
 "Partition the bytes into three parts using the given separator.\n"
 "\n"
-"This will search for the separator sep in the bytes, starting and the end. If\n"
+"This will search for the separator sep in the bytes, starting at the end. If\n"
 "the separator is found, returns a 3-tuple containing the part before the\n"
 "separator, the separator itself, and the part after it.\n"
 "\n"
@@ -499,4 +499,4 @@ bytes_fromhex(PyTypeObject *type, PyObject *arg)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=2dc3c93cfd2dc440 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=4ac7e35150d47467 input=a9049054013a1b77]*/


From webhook-mailer at python.org  Sun Oct 29 06:25:41 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Sun, 29 Oct 2017 10:25:41 -0000
Subject: [Python-checkins] [2.7] bpo-20047: Make bytearray methods
 partition() and rpartition() rejecting (GH-4158) (#4163)
Message-ID: <mailman.20.1509272746.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/107f3cc791d223dc06b7c80f0de672e88ae6a8d1
commit: 107f3cc791d223dc06b7c80f0de672e88ae6a8d1
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-29T12:25:38+02:00
summary:

[2.7] bpo-20047: Make bytearray methods partition() and rpartition() rejecting (GH-4158) (#4163)

separators that are not bytes-like objects..
(cherry picked from commit a2314283ff87c65e1745a42c2f2b716b1a209128)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-28-19-11-05.bpo-20047.GuNAto.rst
A Objects/bytesobject.c
M Lib/test/test_bytes.py
M Objects/bytearrayobject.c

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 4a70b33bc0b..ce2c5b21ee3 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -336,8 +336,16 @@ def test_replace(self):
         self.assertEqual(b.replace(b'i', b'a'), b'massassappa')
         self.assertEqual(b.replace(b'ss', b'x'), b'mixixippi')
 
+    def test_replace_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b'a b').replace, 32, b'')
+
     def test_split_string_error(self):
         self.assertRaises(TypeError, self.type2test(b'a b').split, u' ')
+        self.assertRaises(TypeError, self.type2test(b'a b').rsplit, u' ')
+
+    def test_split_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b'a b').split, 32)
+        self.assertRaises(TypeError, self.type2test(b'a b').rsplit, 32)
 
     def test_split_unicodewhitespace(self):
         for b in (b'a\x1Cb', b'a\x1Db', b'a\x1Eb', b'a\x1Fb'):
@@ -346,9 +354,6 @@ def test_split_unicodewhitespace(self):
         b = self.type2test(b"\x09\x0A\x0B\x0C\x0D\x1C\x1D\x1E\x1F")
         self.assertEqual(b.split(), [b'\x1c\x1d\x1e\x1f'])
 
-    def test_rsplit_string_error(self):
-        self.assertRaises(TypeError, self.type2test(b'a b').rsplit, u' ')
-
     def test_rsplit_unicodewhitespace(self):
         b = self.type2test(b"\x09\x0A\x0B\x0C\x0D\x1C\x1D\x1E\x1F")
         self.assertEqual(b.rsplit(), [b'\x1c\x1d\x1e\x1f'])
@@ -364,6 +369,14 @@ def test_rpartition(self):
         self.assertEqual(b.rpartition(b'i'), (b'mississipp', b'i', b''))
         self.assertEqual(b.rpartition(b'w'), (b'', b'', b'mississippi'))
 
+    def test_partition_string_error(self):
+        self.assertRaises(TypeError, self.type2test(b'a b').partition, u' ')
+        self.assertRaises(TypeError, self.type2test(b'a b').rpartition, u' ')
+
+    def test_partition_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b'a b').partition, 32)
+        self.assertRaises(TypeError, self.type2test(b'a b').rpartition, 32)
+
     def test_pickling(self):
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
             for b in b"", b"a", b"abc", b"\xffab\x80", b"\0\0\377\0\0":
@@ -378,9 +391,19 @@ def test_strip_bytearray(self):
         self.assertEqual(self.type2test(b'abc').rstrip(memoryview(b'ac')), b'ab')
 
     def test_strip_string_error(self):
-        self.assertRaises(TypeError, self.type2test(b'abc').strip, u'b')
-        self.assertRaises(TypeError, self.type2test(b'abc').lstrip, u'b')
-        self.assertRaises(TypeError, self.type2test(b'abc').rstrip, u'b')
+        self.assertRaises(TypeError, self.type2test(b'abc').strip, u'ac')
+        self.assertRaises(TypeError, self.type2test(b'abc').lstrip, u'ac')
+        self.assertRaises(TypeError, self.type2test(b'abc').rstrip, u'ac')
+
+    def test_strip_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b' abc ').strip, 32)
+        self.assertRaises(TypeError, self.type2test(b' abc ').lstrip, 32)
+        self.assertRaises(TypeError, self.type2test(b' abc ').rstrip, 32)
+
+    def test_xjust_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b'abc').center, 7, 32)
+        self.assertRaises(TypeError, self.type2test(b'abc').ljust, 7, 32)
+        self.assertRaises(TypeError, self.type2test(b'abc').rjust, 7, 32)
 
     def test_ord(self):
         b = self.type2test(b'\0A\x7f\x80\xff')
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-28-19-11-05.bpo-20047.GuNAto.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-28-19-11-05.bpo-20047.GuNAto.rst
new file mode 100644
index 00000000000..3594bacd368
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-28-19-11-05.bpo-20047.GuNAto.rst	
@@ -0,0 +1,3 @@
+Bytearray methods partition() and rpartition() now accept only bytes-like
+objects as separator, as documented.  In particular they now raise TypeError
+rather of returning a bogus result when an integer is passed as a separator.
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 72f2ad8eea3..04c25061ef5 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -164,6 +164,26 @@ PyByteArray_FromObject(PyObject *input)
                                         input, NULL);
 }
 
+static PyObject *
+_PyByteArray_FromBufferObject(PyObject *obj)
+{
+    PyObject *result;
+    Py_buffer view;
+
+    if (PyObject_GetBuffer(obj, &view, PyBUF_FULL_RO) < 0) {
+        return NULL;
+    }
+    result = PyByteArray_FromStringAndSize(NULL, view.len);
+    if (result != NULL &&
+        PyBuffer_ToContiguous(PyByteArray_AS_STRING(result),
+                              &view, view.len, 'C') < 0)
+    {
+        Py_CLEAR(result);
+    }
+    PyBuffer_Release(&view);
+    return result;
+}
+
 PyObject *
 PyByteArray_FromStringAndSize(const char *bytes, Py_ssize_t size)
 {
@@ -483,7 +503,8 @@ bytearray_setslice(PyByteArrayObject *self, Py_ssize_t lo, Py_ssize_t hi,
     if (values == (PyObject *)self) {
         /* Make a copy and call this function recursively */
         int err;
-        values = PyByteArray_FromObject(values);
+        values = PyByteArray_FromStringAndSize(PyByteArray_AS_STRING(values),
+                                               PyByteArray_GET_SIZE(values));
         if (values == NULL)
             return -1;
         err = bytearray_setslice(self, lo, hi, values);
@@ -2098,7 +2119,7 @@ bytearray_partition(PyByteArrayObject *self, PyObject *sep_obj)
 {
     PyObject *bytesep, *result;
 
-    bytesep = PyByteArray_FromObject(sep_obj);
+    bytesep = _PyByteArray_FromBufferObject(sep_obj);
     if (! bytesep)
         return NULL;
 
@@ -2126,7 +2147,7 @@ bytearray_rpartition(PyByteArrayObject *self, PyObject *sep_obj)
 {
     PyObject *bytesep, *result;
 
-    bytesep = PyByteArray_FromObject(sep_obj);
+    bytesep = _PyByteArray_FromBufferObject(sep_obj);
     if (! bytesep)
         return NULL;
 
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
new file mode 100644
index 00000000000..7ba90aa307b
--- /dev/null
+++ b/Objects/bytesobject.c
@@ -0,0 +1,3432 @@
+/* bytes object implementation */
+
+#define PY_SSIZE_T_CLEAN
+
+#include "Python.h"
+#include "internal/mem.h"
+#include "internal/pystate.h"
+
+#include "bytes_methods.h"
+#include "pystrhex.h"
+#include <stddef.h>
+
+/*[clinic input]
+class bytes "PyBytesObject *" "&PyBytes_Type"
+[clinic start generated code]*/
+/*[clinic end generated code: output=da39a3ee5e6b4b0d input=7a238f965d64892b]*/
+
+#include "clinic/bytesobject.c.h"
+
+#ifdef COUNT_ALLOCS
+Py_ssize_t null_strings, one_strings;
+#endif
+
+static PyBytesObject *characters[UCHAR_MAX + 1];
+static PyBytesObject *nullstring;
+
+/* PyBytesObject_SIZE gives the basic size of a string; any memory allocation
+   for a string of length n should request PyBytesObject_SIZE + n bytes.
+
+   Using PyBytesObject_SIZE instead of sizeof(PyBytesObject) saves
+   3 bytes per string allocation on a typical system.
+*/
+#define PyBytesObject_SIZE (offsetof(PyBytesObject, ob_sval) + 1)
+
+/* Forward declaration */
+Py_LOCAL_INLINE(Py_ssize_t) _PyBytesWriter_GetSize(_PyBytesWriter *writer,
+                                                   char *str);
+
+/*
+   For PyBytes_FromString(), the parameter `str' points to a null-terminated
+   string containing exactly `size' bytes.
+
+   For PyBytes_FromStringAndSize(), the parameter `str' is
+   either NULL or else points to a string containing at least `size' bytes.
+   For PyBytes_FromStringAndSize(), the string in the `str' parameter does
+   not have to be null-terminated.  (Therefore it is safe to construct a
+   substring by calling `PyBytes_FromStringAndSize(origstring, substrlen)'.)
+   If `str' is NULL then PyBytes_FromStringAndSize() will allocate `size+1'
+   bytes (setting the last byte to the null terminating character) and you can
+   fill in the data yourself.  If `str' is non-NULL then the resulting
+   PyBytes object must be treated as immutable and you must not fill in nor
+   alter the data yourself, since the strings may be shared.
+
+   The PyObject member `op->ob_size', which denotes the number of "extra
+   items" in a variable-size object, will contain the number of bytes
+   allocated for string data, not counting the null terminating character.
+   It is therefore equal to the `size' parameter (for
+   PyBytes_FromStringAndSize()) or the length of the string in the `str'
+   parameter (for PyBytes_FromString()).
+*/
+static PyObject *
+_PyBytes_FromSize(Py_ssize_t size, int use_calloc)
+{
+    PyBytesObject *op;
+    assert(size >= 0);
+
+    if (size == 0 && (op = nullstring) != NULL) {
+#ifdef COUNT_ALLOCS
+        null_strings++;
+#endif
+        Py_INCREF(op);
+        return (PyObject *)op;
+    }
+
+    if ((size_t)size > (size_t)PY_SSIZE_T_MAX - PyBytesObject_SIZE) {
+        PyErr_SetString(PyExc_OverflowError,
+                        "byte string is too large");
+        return NULL;
+    }
+
+    /* Inline PyObject_NewVar */
+    if (use_calloc)
+        op = (PyBytesObject *)PyObject_Calloc(1, PyBytesObject_SIZE + size);
+    else
+        op = (PyBytesObject *)PyObject_Malloc(PyBytesObject_SIZE + size);
+    if (op == NULL)
+        return PyErr_NoMemory();
+    (void)PyObject_INIT_VAR(op, &PyBytes_Type, size);
+    op->ob_shash = -1;
+    if (!use_calloc)
+        op->ob_sval[size] = '\0';
+    /* empty byte string singleton */
+    if (size == 0) {
+        nullstring = op;
+        Py_INCREF(op);
+    }
+    return (PyObject *) op;
+}
+
+PyObject *
+PyBytes_FromStringAndSize(const char *str, Py_ssize_t size)
+{
+    PyBytesObject *op;
+    if (size < 0) {
+        PyErr_SetString(PyExc_SystemError,
+            "Negative size passed to PyBytes_FromStringAndSize");
+        return NULL;
+    }
+    if (size == 1 && str != NULL &&
+        (op = characters[*str & UCHAR_MAX]) != NULL)
+    {
+#ifdef COUNT_ALLOCS
+        one_strings++;
+#endif
+        Py_INCREF(op);
+        return (PyObject *)op;
+    }
+
+    op = (PyBytesObject *)_PyBytes_FromSize(size, 0);
+    if (op == NULL)
+        return NULL;
+    if (str == NULL)
+        return (PyObject *) op;
+
+    memcpy(op->ob_sval, str, size);
+    /* share short strings */
+    if (size == 1) {
+        characters[*str & UCHAR_MAX] = op;
+        Py_INCREF(op);
+    }
+    return (PyObject *) op;
+}
+
+PyObject *
+PyBytes_FromString(const char *str)
+{
+    size_t size;
+    PyBytesObject *op;
+
+    assert(str != NULL);
+    size = strlen(str);
+    if (size > PY_SSIZE_T_MAX - PyBytesObject_SIZE) {
+        PyErr_SetString(PyExc_OverflowError,
+            "byte string is too long");
+        return NULL;
+    }
+    if (size == 0 && (op = nullstring) != NULL) {
+#ifdef COUNT_ALLOCS
+        null_strings++;
+#endif
+        Py_INCREF(op);
+        return (PyObject *)op;
+    }
+    if (size == 1 && (op = characters[*str & UCHAR_MAX]) != NULL) {
+#ifdef COUNT_ALLOCS
+        one_strings++;
+#endif
+        Py_INCREF(op);
+        return (PyObject *)op;
+    }
+
+    /* Inline PyObject_NewVar */
+    op = (PyBytesObject *)PyObject_MALLOC(PyBytesObject_SIZE + size);
+    if (op == NULL)
+        return PyErr_NoMemory();
+    (void)PyObject_INIT_VAR(op, &PyBytes_Type, size);
+    op->ob_shash = -1;
+    memcpy(op->ob_sval, str, size+1);
+    /* share short strings */
+    if (size == 0) {
+        nullstring = op;
+        Py_INCREF(op);
+    } else if (size == 1) {
+        characters[*str & UCHAR_MAX] = op;
+        Py_INCREF(op);
+    }
+    return (PyObject *) op;
+}
+
+PyObject *
+PyBytes_FromFormatV(const char *format, va_list vargs)
+{
+    char *s;
+    const char *f;
+    const char *p;
+    Py_ssize_t prec;
+    int longflag;
+    int size_tflag;
+    /* Longest 64-bit formatted numbers:
+       - "18446744073709551615\0" (21 bytes)
+       - "-9223372036854775808\0" (21 bytes)
+       Decimal takes the most space (it isn't enough for octal.)
+
+       Longest 64-bit pointer representation:
+       "0xffffffffffffffff\0" (19 bytes). */
+    char buffer[21];
+    _PyBytesWriter writer;
+
+    _PyBytesWriter_Init(&writer);
+
+    s = _PyBytesWriter_Alloc(&writer, strlen(format));
+    if (s == NULL)
+        return NULL;
+    writer.overallocate = 1;
+
+#define WRITE_BYTES(str) \
+    do { \
+        s = _PyBytesWriter_WriteBytes(&writer, s, (str), strlen(str)); \
+        if (s == NULL) \
+            goto error; \
+    } while (0)
+
+    for (f = format; *f; f++) {
+        if (*f != '%') {
+            *s++ = *f;
+            continue;
+        }
+
+        p = f++;
+
+        /* ignore the width (ex: 10 in "%10s") */
+        while (Py_ISDIGIT(*f))
+            f++;
+
+        /* parse the precision (ex: 10 in "%.10s") */
+        prec = 0;
+        if (*f == '.') {
+            f++;
+            for (; Py_ISDIGIT(*f); f++) {
+                prec = (prec * 10) + (*f - '0');
+            }
+        }
+
+        while (*f && *f != '%' && !Py_ISALPHA(*f))
+            f++;
+
+        /* handle the long flag ('l'), but only for %ld and %lu.
+           others can be added when necessary. */
+        longflag = 0;
+        if (*f == 'l' && (f[1] == 'd' || f[1] == 'u')) {
+            longflag = 1;
+            ++f;
+        }
+
+        /* handle the size_t flag ('z'). */
+        size_tflag = 0;
+        if (*f == 'z' && (f[1] == 'd' || f[1] == 'u')) {
+            size_tflag = 1;
+            ++f;
+        }
+
+        /* subtract bytes preallocated for the format string
+           (ex: 2 for "%s") */
+        writer.min_size -= (f - p + 1);
+
+        switch (*f) {
+        case 'c':
+        {
+            int c = va_arg(vargs, int);
+            if (c < 0 || c > 255) {
+                PyErr_SetString(PyExc_OverflowError,
+                                "PyBytes_FromFormatV(): %c format "
+                                "expects an integer in range [0; 255]");
+                goto error;
+            }
+            writer.min_size++;
+            *s++ = (unsigned char)c;
+            break;
+        }
+
+        case 'd':
+            if (longflag)
+                sprintf(buffer, "%ld", va_arg(vargs, long));
+            else if (size_tflag)
+                sprintf(buffer, "%" PY_FORMAT_SIZE_T "d",
+                    va_arg(vargs, Py_ssize_t));
+            else
+                sprintf(buffer, "%d", va_arg(vargs, int));
+            assert(strlen(buffer) < sizeof(buffer));
+            WRITE_BYTES(buffer);
+            break;
+
+        case 'u':
+            if (longflag)
+                sprintf(buffer, "%lu",
+                    va_arg(vargs, unsigned long));
+            else if (size_tflag)
+                sprintf(buffer, "%" PY_FORMAT_SIZE_T "u",
+                    va_arg(vargs, size_t));
+            else
+                sprintf(buffer, "%u",
+                    va_arg(vargs, unsigned int));
+            assert(strlen(buffer) < sizeof(buffer));
+            WRITE_BYTES(buffer);
+            break;
+
+        case 'i':
+            sprintf(buffer, "%i", va_arg(vargs, int));
+            assert(strlen(buffer) < sizeof(buffer));
+            WRITE_BYTES(buffer);
+            break;
+
+        case 'x':
+            sprintf(buffer, "%x", va_arg(vargs, int));
+            assert(strlen(buffer) < sizeof(buffer));
+            WRITE_BYTES(buffer);
+            break;
+
+        case 's':
+        {
+            Py_ssize_t i;
+
+            p = va_arg(vargs, const char*);
+            i = strlen(p);
+            if (prec > 0 && i > prec)
+                i = prec;
+            s = _PyBytesWriter_WriteBytes(&writer, s, p, i);
+            if (s == NULL)
+                goto error;
+            break;
+        }
+
+        case 'p':
+            sprintf(buffer, "%p", va_arg(vargs, void*));
+            assert(strlen(buffer) < sizeof(buffer));
+            /* %p is ill-defined:  ensure leading 0x. */
+            if (buffer[1] == 'X')
+                buffer[1] = 'x';
+            else if (buffer[1] != 'x') {
+                memmove(buffer+2, buffer, strlen(buffer)+1);
+                buffer[0] = '0';
+                buffer[1] = 'x';
+            }
+            WRITE_BYTES(buffer);
+            break;
+
+        case '%':
+            writer.min_size++;
+            *s++ = '%';
+            break;
+
+        default:
+            if (*f == 0) {
+                /* fix min_size if we reached the end of the format string */
+                writer.min_size++;
+            }
+
+            /* invalid format string: copy unformatted string and exit */
+            WRITE_BYTES(p);
+            return _PyBytesWriter_Finish(&writer, s);
+        }
+    }
+
+#undef WRITE_BYTES
+
+    return _PyBytesWriter_Finish(&writer, s);
+
+ error:
+    _PyBytesWriter_Dealloc(&writer);
+    return NULL;
+}
+
+PyObject *
+PyBytes_FromFormat(const char *format, ...)
+{
+    PyObject* ret;
+    va_list vargs;
+
+#ifdef HAVE_STDARG_PROTOTYPES
+    va_start(vargs, format);
+#else
+    va_start(vargs);
+#endif
+    ret = PyBytes_FromFormatV(format, vargs);
+    va_end(vargs);
+    return ret;
+}
+
+/* Helpers for formatstring */
+
+Py_LOCAL_INLINE(PyObject *)
+getnextarg(PyObject *args, Py_ssize_t arglen, Py_ssize_t *p_argidx)
+{
+    Py_ssize_t argidx = *p_argidx;
+    if (argidx < arglen) {
+        (*p_argidx)++;
+        if (arglen < 0)
+            return args;
+        else
+            return PyTuple_GetItem(args, argidx);
+    }
+    PyErr_SetString(PyExc_TypeError,
+                    "not enough arguments for format string");
+    return NULL;
+}
+
+/* Format codes
+ * F_LJUST      '-'
+ * F_SIGN       '+'
+ * F_BLANK      ' '
+ * F_ALT        '#'
+ * F_ZERO       '0'
+ */
+#define F_LJUST (1<<0)
+#define F_SIGN  (1<<1)
+#define F_BLANK (1<<2)
+#define F_ALT   (1<<3)
+#define F_ZERO  (1<<4)
+
+/* Returns a new reference to a PyBytes object, or NULL on failure. */
+
+static char*
+formatfloat(PyObject *v, int flags, int prec, int type,
+            PyObject **p_result, _PyBytesWriter *writer, char *str)
+{
+    char *p;
+    PyObject *result;
+    double x;
+    size_t len;
+
+    x = PyFloat_AsDouble(v);
+    if (x == -1.0 && PyErr_Occurred()) {
+        PyErr_Format(PyExc_TypeError, "float argument required, "
+                     "not %.200s", Py_TYPE(v)->tp_name);
+        return NULL;
+    }
+
+    if (prec < 0)
+        prec = 6;
+
+    p = PyOS_double_to_string(x, type, prec,
+                              (flags & F_ALT) ? Py_DTSF_ALT : 0, NULL);
+
+    if (p == NULL)
+        return NULL;
+
+    len = strlen(p);
+    if (writer != NULL) {
+        str = _PyBytesWriter_Prepare(writer, str, len);
+        if (str == NULL)
+            return NULL;
+        memcpy(str, p, len);
+        PyMem_Free(p);
+        str += len;
+        return str;
+    }
+
+    result = PyBytes_FromStringAndSize(p, len);
+    PyMem_Free(p);
+    *p_result = result;
+    return str;
+}
+
+static PyObject *
+formatlong(PyObject *v, int flags, int prec, int type)
+{
+    PyObject *result, *iobj;
+    if (type == 'i')
+        type = 'd';
+    if (PyLong_Check(v))
+        return _PyUnicode_FormatLong(v, flags & F_ALT, prec, type);
+    if (PyNumber_Check(v)) {
+        /* make sure number is a type of integer for o, x, and X */
+        if (type == 'o' || type == 'x' || type == 'X')
+            iobj = PyNumber_Index(v);
+        else
+            iobj = PyNumber_Long(v);
+        if (iobj == NULL) {
+            if (!PyErr_ExceptionMatches(PyExc_TypeError))
+                return NULL;
+        }
+        else if (!PyLong_Check(iobj))
+            Py_CLEAR(iobj);
+        if (iobj != NULL) {
+            result = _PyUnicode_FormatLong(iobj, flags & F_ALT, prec, type);
+            Py_DECREF(iobj);
+            return result;
+        }
+    }
+    PyErr_Format(PyExc_TypeError,
+        "%%%c format: %s is required, not %.200s", type,
+        (type == 'o' || type == 'x' || type == 'X') ? "an integer"
+                                                    : "a number",
+        Py_TYPE(v)->tp_name);
+    return NULL;
+}
+
+static int
+byte_converter(PyObject *arg, char *p)
+{
+    if (PyBytes_Check(arg) && PyBytes_GET_SIZE(arg) == 1) {
+        *p = PyBytes_AS_STRING(arg)[0];
+        return 1;
+    }
+    else if (PyByteArray_Check(arg) && PyByteArray_GET_SIZE(arg) == 1) {
+        *p = PyByteArray_AS_STRING(arg)[0];
+        return 1;
+    }
+    else {
+        PyObject *iobj;
+        long ival;
+        int overflow;
+        /* make sure number is a type of integer */
+        if (PyLong_Check(arg)) {
+            ival = PyLong_AsLongAndOverflow(arg, &overflow);
+        }
+        else {
+            iobj = PyNumber_Index(arg);
+            if (iobj == NULL) {
+                if (!PyErr_ExceptionMatches(PyExc_TypeError))
+                    return 0;
+                goto onError;
+            }
+            ival = PyLong_AsLongAndOverflow(iobj, &overflow);
+            Py_DECREF(iobj);
+        }
+        if (!overflow && ival == -1 && PyErr_Occurred())
+            goto onError;
+        if (overflow || !(0 <= ival && ival <= 255)) {
+            PyErr_SetString(PyExc_OverflowError,
+                            "%c arg not in range(256)");
+            return 0;
+        }
+        *p = (char)ival;
+        return 1;
+    }
+  onError:
+    PyErr_SetString(PyExc_TypeError,
+        "%c requires an integer in range(256) or a single byte");
+    return 0;
+}
+
+static PyObject *_PyBytes_FromBuffer(PyObject *x);
+
+static PyObject *
+format_obj(PyObject *v, const char **pbuf, Py_ssize_t *plen)
+{
+    PyObject *func, *result;
+    _Py_IDENTIFIER(__bytes__);
+    /* is it a bytes object? */
+    if (PyBytes_Check(v)) {
+        *pbuf = PyBytes_AS_STRING(v);
+        *plen = PyBytes_GET_SIZE(v);
+        Py_INCREF(v);
+        return v;
+    }
+    if (PyByteArray_Check(v)) {
+        *pbuf = PyByteArray_AS_STRING(v);
+        *plen = PyByteArray_GET_SIZE(v);
+        Py_INCREF(v);
+        return v;
+    }
+    /* does it support __bytes__? */
+    func = _PyObject_LookupSpecial(v, &PyId___bytes__);
+    if (func != NULL) {
+        result = _PyObject_CallNoArg(func);
+        Py_DECREF(func);
+        if (result == NULL)
+            return NULL;
+        if (!PyBytes_Check(result)) {
+            PyErr_Format(PyExc_TypeError,
+                         "__bytes__ returned non-bytes (type %.200s)",
+                         Py_TYPE(result)->tp_name);
+            Py_DECREF(result);
+            return NULL;
+        }
+        *pbuf = PyBytes_AS_STRING(result);
+        *plen = PyBytes_GET_SIZE(result);
+        return result;
+    }
+    /* does it support buffer protocol? */
+    if (PyObject_CheckBuffer(v)) {
+        /* maybe we can avoid making a copy of the buffer object here? */
+        result = _PyBytes_FromBuffer(v);
+        if (result == NULL)
+            return NULL;
+        *pbuf = PyBytes_AS_STRING(result);
+        *plen = PyBytes_GET_SIZE(result);
+        return result;
+    }
+    PyErr_Format(PyExc_TypeError,
+                 "%%b requires a bytes-like object, "
+                 "or an object that implements __bytes__, not '%.100s'",
+                 Py_TYPE(v)->tp_name);
+    return NULL;
+}
+
+/* fmt%(v1,v2,...) is roughly equivalent to sprintf(fmt, v1, v2, ...) */
+
+PyObject *
+_PyBytes_FormatEx(const char *format, Py_ssize_t format_len,
+                  PyObject *args, int use_bytearray)
+{
+    const char *fmt;
+    char *res;
+    Py_ssize_t arglen, argidx;
+    Py_ssize_t fmtcnt;
+    int args_owned = 0;
+    PyObject *dict = NULL;
+    _PyBytesWriter writer;
+
+    if (args == NULL) {
+        PyErr_BadInternalCall();
+        return NULL;
+    }
+    fmt = format;
+    fmtcnt = format_len;
+
+    _PyBytesWriter_Init(&writer);
+    writer.use_bytearray = use_bytearray;
+
+    res = _PyBytesWriter_Alloc(&writer, fmtcnt);
+    if (res == NULL)
+        return NULL;
+    if (!use_bytearray)
+        writer.overallocate = 1;
+
+    if (PyTuple_Check(args)) {
+        arglen = PyTuple_GET_SIZE(args);
+        argidx = 0;
+    }
+    else {
+        arglen = -1;
+        argidx = -2;
+    }
+    if (Py_TYPE(args)->tp_as_mapping && Py_TYPE(args)->tp_as_mapping->mp_subscript &&
+        !PyTuple_Check(args) && !PyBytes_Check(args) && !PyUnicode_Check(args) &&
+        !PyByteArray_Check(args)) {
+            dict = args;
+    }
+
+    while (--fmtcnt >= 0) {
+        if (*fmt != '%') {
+            Py_ssize_t len;
+            char *pos;
+
+            pos = (char *)memchr(fmt + 1, '%', fmtcnt);
+            if (pos != NULL)
+                len = pos - fmt;
+            else
+                len = fmtcnt + 1;
+            assert(len != 0);
+
+            memcpy(res, fmt, len);
+            res += len;
+            fmt += len;
+            fmtcnt -= (len - 1);
+        }
+        else {
+            /* Got a format specifier */
+            int flags = 0;
+            Py_ssize_t width = -1;
+            int prec = -1;
+            int c = '\0';
+            int fill;
+            PyObject *v = NULL;
+            PyObject *temp = NULL;
+            const char *pbuf = NULL;
+            int sign;
+            Py_ssize_t len = 0;
+            char onechar; /* For byte_converter() */
+            Py_ssize_t alloc;
+#ifdef Py_DEBUG
+            char *before;
+#endif
+
+            fmt++;
+            if (*fmt == '%') {
+                *res++ = '%';
+                fmt++;
+                fmtcnt--;
+                continue;
+            }
+            if (*fmt == '(') {
+                const char *keystart;
+                Py_ssize_t keylen;
+                PyObject *key;
+                int pcount = 1;
+
+                if (dict == NULL) {
+                    PyErr_SetString(PyExc_TypeError,
+                             "format requires a mapping");
+                    goto error;
+                }
+                ++fmt;
+                --fmtcnt;
+                keystart = fmt;
+                /* Skip over balanced parentheses */
+                while (pcount > 0 && --fmtcnt >= 0) {
+                    if (*fmt == ')')
+                        --pcount;
+                    else if (*fmt == '(')
+                        ++pcount;
+                    fmt++;
+                }
+                keylen = fmt - keystart - 1;
+                if (fmtcnt < 0 || pcount > 0) {
+                    PyErr_SetString(PyExc_ValueError,
+                               "incomplete format key");
+                    goto error;
+                }
+                key = PyBytes_FromStringAndSize(keystart,
+                                                 keylen);
+                if (key == NULL)
+                    goto error;
+                if (args_owned) {
+                    Py_DECREF(args);
+                    args_owned = 0;
+                }
+                args = PyObject_GetItem(dict, key);
+                Py_DECREF(key);
+                if (args == NULL) {
+                    goto error;
+                }
+                args_owned = 1;
+                arglen = -1;
+                argidx = -2;
+            }
+
+            /* Parse flags. Example: "%+i" => flags=F_SIGN. */
+            while (--fmtcnt >= 0) {
+                switch (c = *fmt++) {
+                case '-': flags |= F_LJUST; continue;
+                case '+': flags |= F_SIGN; continue;
+                case ' ': flags |= F_BLANK; continue;
+                case '#': flags |= F_ALT; continue;
+                case '0': flags |= F_ZERO; continue;
+                }
+                break;
+            }
+
+            /* Parse width. Example: "%10s" => width=10 */
+            if (c == '*') {
+                v = getnextarg(args, arglen, &argidx);
+                if (v == NULL)
+                    goto error;
+                if (!PyLong_Check(v)) {
+                    PyErr_SetString(PyExc_TypeError,
+                                    "* wants int");
+                    goto error;
+                }
+                width = PyLong_AsSsize_t(v);
+                if (width == -1 && PyErr_Occurred())
+                    goto error;
+                if (width < 0) {
+                    flags |= F_LJUST;
+                    width = -width;
+                }
+                if (--fmtcnt >= 0)
+                    c = *fmt++;
+            }
+            else if (c >= 0 && isdigit(c)) {
+                width = c - '0';
+                while (--fmtcnt >= 0) {
+                    c = Py_CHARMASK(*fmt++);
+                    if (!isdigit(c))
+                        break;
+                    if (width > (PY_SSIZE_T_MAX - ((int)c - '0')) / 10) {
+                        PyErr_SetString(
+                            PyExc_ValueError,
+                            "width too big");
+                        goto error;
+                    }
+                    width = width*10 + (c - '0');
+                }
+            }
+
+            /* Parse precision. Example: "%.3f" => prec=3 */
+            if (c == '.') {
+                prec = 0;
+                if (--fmtcnt >= 0)
+                    c = *fmt++;
+                if (c == '*') {
+                    v = getnextarg(args, arglen, &argidx);
+                    if (v == NULL)
+                        goto error;
+                    if (!PyLong_Check(v)) {
+                        PyErr_SetString(
+                            PyExc_TypeError,
+                            "* wants int");
+                        goto error;
+                    }
+                    prec = _PyLong_AsInt(v);
+                    if (prec == -1 && PyErr_Occurred())
+                        goto error;
+                    if (prec < 0)
+                        prec = 0;
+                    if (--fmtcnt >= 0)
+                        c = *fmt++;
+                }
+                else if (c >= 0 && isdigit(c)) {
+                    prec = c - '0';
+                    while (--fmtcnt >= 0) {
+                        c = Py_CHARMASK(*fmt++);
+                        if (!isdigit(c))
+                            break;
+                        if (prec > (INT_MAX - ((int)c - '0')) / 10) {
+                            PyErr_SetString(
+                                PyExc_ValueError,
+                                "prec too big");
+                            goto error;
+                        }
+                        prec = prec*10 + (c - '0');
+                    }
+                }
+            } /* prec */
+            if (fmtcnt >= 0) {
+                if (c == 'h' || c == 'l' || c == 'L') {
+                    if (--fmtcnt >= 0)
+                        c = *fmt++;
+                }
+            }
+            if (fmtcnt < 0) {
+                PyErr_SetString(PyExc_ValueError,
+                                "incomplete format");
+                goto error;
+            }
+            v = getnextarg(args, arglen, &argidx);
+            if (v == NULL)
+                goto error;
+
+            if (fmtcnt < 0) {
+                /* last writer: disable writer overallocation */
+                writer.overallocate = 0;
+            }
+
+            sign = 0;
+            fill = ' ';
+            switch (c) {
+            case 'r':
+                // %r is only for 2/3 code; 3 only code should use %a
+            case 'a':
+                temp = PyObject_ASCII(v);
+                if (temp == NULL)
+                    goto error;
+                assert(PyUnicode_IS_ASCII(temp));
+                pbuf = (const char *)PyUnicode_1BYTE_DATA(temp);
+                len = PyUnicode_GET_LENGTH(temp);
+                if (prec >= 0 && len > prec)
+                    len = prec;
+                break;
+
+            case 's':
+                // %s is only for 2/3 code; 3 only code should use %b
+            case 'b':
+                temp = format_obj(v, &pbuf, &len);
+                if (temp == NULL)
+                    goto error;
+                if (prec >= 0 && len > prec)
+                    len = prec;
+                break;
+
+            case 'i':
+            case 'd':
+            case 'u':
+            case 'o':
+            case 'x':
+            case 'X':
+                if (PyLong_CheckExact(v)
+                    && width == -1 && prec == -1
+                    && !(flags & (F_SIGN | F_BLANK))
+                    && c != 'X')
+                {
+                    /* Fast path */
+                    int alternate = flags & F_ALT;
+                    int base;
+
+                    switch(c)
+                    {
+                        default:
+                            Py_UNREACHABLE();
+                        case 'd':
+                        case 'i':
+                        case 'u':
+                            base = 10;
+                            break;
+                        case 'o':
+                            base = 8;
+                            break;
+                        case 'x':
+                        case 'X':
+                            base = 16;
+                            break;
+                    }
+
+                    /* Fast path */
+                    writer.min_size -= 2; /* size preallocated for "%d" */
+                    res = _PyLong_FormatBytesWriter(&writer, res,
+                                                    v, base, alternate);
+                    if (res == NULL)
+                        goto error;
+                    continue;
+                }
+
+                temp = formatlong(v, flags, prec, c);
+                if (!temp)
+                    goto error;
+                assert(PyUnicode_IS_ASCII(temp));
+                pbuf = (const char *)PyUnicode_1BYTE_DATA(temp);
+                len = PyUnicode_GET_LENGTH(temp);
+                sign = 1;
+                if (flags & F_ZERO)
+                    fill = '0';
+                break;
+
+            case 'e':
+            case 'E':
+            case 'f':
+            case 'F':
+            case 'g':
+            case 'G':
+                if (width == -1 && prec == -1
+                    && !(flags & (F_SIGN | F_BLANK)))
+                {
+                    /* Fast path */
+                    writer.min_size -= 2; /* size preallocated for "%f" */
+                    res = formatfloat(v, flags, prec, c, NULL, &writer, res);
+                    if (res == NULL)
+                        goto error;
+                    continue;
+                }
+
+                if (!formatfloat(v, flags, prec, c, &temp, NULL, res))
+                    goto error;
+                pbuf = PyBytes_AS_STRING(temp);
+                len = PyBytes_GET_SIZE(temp);
+                sign = 1;
+                if (flags & F_ZERO)
+                    fill = '0';
+                break;
+
+            case 'c':
+                pbuf = &onechar;
+                len = byte_converter(v, &onechar);
+                if (!len)
+                    goto error;
+                if (width == -1) {
+                    /* Fast path */
+                    *res++ = onechar;
+                    continue;
+                }
+                break;
+
+            default:
+                PyErr_Format(PyExc_ValueError,
+                  "unsupported format character '%c' (0x%x) "
+                  "at index %zd",
+                  c, c,
+                  (Py_ssize_t)(fmt - 1 - format));
+                goto error;
+            }
+
+            if (sign) {
+                if (*pbuf == '-' || *pbuf == '+') {
+                    sign = *pbuf++;
+                    len--;
+                }
+                else if (flags & F_SIGN)
+                    sign = '+';
+                else if (flags & F_BLANK)
+                    sign = ' ';
+                else
+                    sign = 0;
+            }
+            if (width < len)
+                width = len;
+
+            alloc = width;
+            if (sign != 0 && len == width)
+                alloc++;
+            /* 2: size preallocated for %s */
+            if (alloc > 2) {
+                res = _PyBytesWriter_Prepare(&writer, res, alloc - 2);
+                if (res == NULL)
+                    goto error;
+            }
+#ifdef Py_DEBUG
+            before = res;
+#endif
+
+            /* Write the sign if needed */
+            if (sign) {
+                if (fill != ' ')
+                    *res++ = sign;
+                if (width > len)
+                    width--;
+            }
+
+            /* Write the numeric prefix for "x", "X" and "o" formats
+               if the alternate form is used.
+               For example, write "0x" for the "%#x" format. */
+            if ((flags & F_ALT) && (c == 'o' || c == 'x' || c == 'X')) {
+                assert(pbuf[0] == '0');
+                assert(pbuf[1] == c);
+                if (fill != ' ') {
+                    *res++ = *pbuf++;
+                    *res++ = *pbuf++;
+                }
+                width -= 2;
+                if (width < 0)
+                    width = 0;
+                len -= 2;
+            }
+
+            /* Pad left with the fill character if needed */
+            if (width > len && !(flags & F_LJUST)) {
+                memset(res, fill, width - len);
+                res += (width - len);
+                width = len;
+            }
+
+            /* If padding with spaces: write sign if needed and/or numeric
+               prefix if the alternate form is used */
+            if (fill == ' ') {
+                if (sign)
+                    *res++ = sign;
+                if ((flags & F_ALT) && (c == 'o' || c == 'x' || c == 'X')) {
+                    assert(pbuf[0] == '0');
+                    assert(pbuf[1] == c);
+                    *res++ = *pbuf++;
+                    *res++ = *pbuf++;
+                }
+            }
+
+            /* Copy bytes */
+            memcpy(res, pbuf, len);
+            res += len;
+
+            /* Pad right with the fill character if needed */
+            if (width > len) {
+                memset(res, ' ', width - len);
+                res += (width - len);
+            }
+
+            if (dict && (argidx < arglen)) {
+                PyErr_SetString(PyExc_TypeError,
+                           "not all arguments converted during bytes formatting");
+                Py_XDECREF(temp);
+                goto error;
+            }
+            Py_XDECREF(temp);
+
+#ifdef Py_DEBUG
+            /* check that we computed the exact size for this write */
+            assert((res - before) == alloc);
+#endif
+        } /* '%' */
+
+        /* If overallocation was disabled, ensure that it was the last
+           write. Otherwise, we missed an optimization */
+        assert(writer.overallocate || fmtcnt < 0 || use_bytearray);
+    } /* until end */
+
+    if (argidx < arglen && !dict) {
+        PyErr_SetString(PyExc_TypeError,
+                        "not all arguments converted during bytes formatting");
+        goto error;
+    }
+
+    if (args_owned) {
+        Py_DECREF(args);
+    }
+    return _PyBytesWriter_Finish(&writer, res);
+
+ error:
+    _PyBytesWriter_Dealloc(&writer);
+    if (args_owned) {
+        Py_DECREF(args);
+    }
+    return NULL;
+}
+
+/* =-= */
+
+static void
+bytes_dealloc(PyObject *op)
+{
+    Py_TYPE(op)->tp_free(op);
+}
+
+/* Unescape a backslash-escaped string. If unicode is non-zero,
+   the string is a u-literal. If recode_encoding is non-zero,
+   the string is UTF-8 encoded and should be re-encoded in the
+   specified encoding.  */
+
+static char *
+_PyBytes_DecodeEscapeRecode(const char **s, const char *end,
+                            const char *errors, const char *recode_encoding,
+                            _PyBytesWriter *writer, char *p)
+{
+    PyObject *u, *w;
+    const char* t;
+
+    t = *s;
+    /* Decode non-ASCII bytes as UTF-8. */
+    while (t < end && (*t & 0x80))
+        t++;
+    u = PyUnicode_DecodeUTF8(*s, t - *s, errors);
+    if (u == NULL)
+        return NULL;
+
+    /* Recode them in target encoding. */
+    w = PyUnicode_AsEncodedString(u, recode_encoding, errors);
+    Py_DECREF(u);
+    if  (w == NULL)
+        return NULL;
+    assert(PyBytes_Check(w));
+
+    /* Append bytes to output buffer. */
+    writer->min_size--;   /* subtract 1 preallocated byte */
+    p = _PyBytesWriter_WriteBytes(writer, p,
+                                  PyBytes_AS_STRING(w),
+                                  PyBytes_GET_SIZE(w));
+    Py_DECREF(w);
+    if (p == NULL)
+        return NULL;
+
+    *s = t;
+    return p;
+}
+
+PyObject *_PyBytes_DecodeEscape(const char *s,
+                                Py_ssize_t len,
+                                const char *errors,
+                                Py_ssize_t unicode,
+                                const char *recode_encoding,
+                                const char **first_invalid_escape)
+{
+    int c;
+    char *p;
+    const char *end;
+    _PyBytesWriter writer;
+
+    _PyBytesWriter_Init(&writer);
+
+    p = _PyBytesWriter_Alloc(&writer, len);
+    if (p == NULL)
+        return NULL;
+    writer.overallocate = 1;
+
+    *first_invalid_escape = NULL;
+
+    end = s + len;
+    while (s < end) {
+        if (*s != '\\') {
+          non_esc:
+            if (!(recode_encoding && (*s & 0x80))) {
+                *p++ = *s++;
+            }
+            else {
+                /* non-ASCII character and need to recode */
+                p = _PyBytes_DecodeEscapeRecode(&s, end,
+                                                errors, recode_encoding,
+                                                &writer, p);
+                if (p == NULL)
+                    goto failed;
+            }
+            continue;
+        }
+
+        s++;
+        if (s == end) {
+            PyErr_SetString(PyExc_ValueError,
+                            "Trailing \\ in string");
+            goto failed;
+        }
+
+        switch (*s++) {
+        /* XXX This assumes ASCII! */
+        case '\n': break;
+        case '\\': *p++ = '\\'; break;
+        case '\'': *p++ = '\''; break;
+        case '\"': *p++ = '\"'; break;
+        case 'b': *p++ = '\b'; break;
+        case 'f': *p++ = '\014'; break; /* FF */
+        case 't': *p++ = '\t'; break;
+        case 'n': *p++ = '\n'; break;
+        case 'r': *p++ = '\r'; break;
+        case 'v': *p++ = '\013'; break; /* VT */
+        case 'a': *p++ = '\007'; break; /* BEL, not classic C */
+        case '0': case '1': case '2': case '3':
+        case '4': case '5': case '6': case '7':
+            c = s[-1] - '0';
+            if (s < end && '0' <= *s && *s <= '7') {
+                c = (c<<3) + *s++ - '0';
+                if (s < end && '0' <= *s && *s <= '7')
+                    c = (c<<3) + *s++ - '0';
+            }
+            *p++ = c;
+            break;
+        case 'x':
+            if (s+1 < end) {
+                int digit1, digit2;
+                digit1 = _PyLong_DigitValue[Py_CHARMASK(s[0])];
+                digit2 = _PyLong_DigitValue[Py_CHARMASK(s[1])];
+                if (digit1 < 16 && digit2 < 16) {
+                    *p++ = (unsigned char)((digit1 << 4) + digit2);
+                    s += 2;
+                    break;
+                }
+            }
+            /* invalid hexadecimal digits */
+
+            if (!errors || strcmp(errors, "strict") == 0) {
+                PyErr_Format(PyExc_ValueError,
+                             "invalid \\x escape at position %d",
+                             s - 2 - (end - len));
+                goto failed;
+            }
+            if (strcmp(errors, "replace") == 0) {
+                *p++ = '?';
+            } else if (strcmp(errors, "ignore") == 0)
+                /* do nothing */;
+            else {
+                PyErr_Format(PyExc_ValueError,
+                             "decoding error; unknown "
+                             "error handling code: %.400s",
+                             errors);
+                goto failed;
+            }
+            /* skip \x */
+            if (s < end && Py_ISXDIGIT(s[0]))
+                s++; /* and a hexdigit */
+            break;
+
+        default:
+            if (*first_invalid_escape == NULL) {
+                *first_invalid_escape = s-1; /* Back up one char, since we've
+                                                already incremented s. */
+            }
+            *p++ = '\\';
+            s--;
+            goto non_esc; /* an arbitrary number of unescaped
+                             UTF-8 bytes may follow. */
+        }
+    }
+
+    return _PyBytesWriter_Finish(&writer, p);
+
+  failed:
+    _PyBytesWriter_Dealloc(&writer);
+    return NULL;
+}
+
+PyObject *PyBytes_DecodeEscape(const char *s,
+                                Py_ssize_t len,
+                                const char *errors,
+                                Py_ssize_t unicode,
+                                const char *recode_encoding)
+{
+    const char* first_invalid_escape;
+    PyObject *result = _PyBytes_DecodeEscape(s, len, errors, unicode,
+                                             recode_encoding,
+                                             &first_invalid_escape);
+    if (result == NULL)
+        return NULL;
+    if (first_invalid_escape != NULL) {
+        if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
+                             "invalid escape sequence '\\%c'",
+                             (unsigned char)*first_invalid_escape) < 0) {
+            Py_DECREF(result);
+            return NULL;
+        }
+    }
+    return result;
+
+}
+/* -------------------------------------------------------------------- */
+/* object api */
+
+Py_ssize_t
+PyBytes_Size(PyObject *op)
+{
+    if (!PyBytes_Check(op)) {
+        PyErr_Format(PyExc_TypeError,
+             "expected bytes, %.200s found", Py_TYPE(op)->tp_name);
+        return -1;
+    }
+    return Py_SIZE(op);
+}
+
+char *
+PyBytes_AsString(PyObject *op)
+{
+    if (!PyBytes_Check(op)) {
+        PyErr_Format(PyExc_TypeError,
+             "expected bytes, %.200s found", Py_TYPE(op)->tp_name);
+        return NULL;
+    }
+    return ((PyBytesObject *)op)->ob_sval;
+}
+
+int
+PyBytes_AsStringAndSize(PyObject *obj,
+                         char **s,
+                         Py_ssize_t *len)
+{
+    if (s == NULL) {
+        PyErr_BadInternalCall();
+        return -1;
+    }
+
+    if (!PyBytes_Check(obj)) {
+        PyErr_Format(PyExc_TypeError,
+             "expected bytes, %.200s found", Py_TYPE(obj)->tp_name);
+        return -1;
+    }
+
+    *s = PyBytes_AS_STRING(obj);
+    if (len != NULL)
+        *len = PyBytes_GET_SIZE(obj);
+    else if (strlen(*s) != (size_t)PyBytes_GET_SIZE(obj)) {
+        PyErr_SetString(PyExc_ValueError,
+                        "embedded null byte");
+        return -1;
+    }
+    return 0;
+}
+
+/* -------------------------------------------------------------------- */
+/* Methods */
+
+#include "stringlib/stringdefs.h"
+
+#include "stringlib/fastsearch.h"
+#include "stringlib/count.h"
+#include "stringlib/find.h"
+#include "stringlib/join.h"
+#include "stringlib/partition.h"
+#include "stringlib/split.h"
+#include "stringlib/ctype.h"
+
+#include "stringlib/transmogrify.h"
+
+PyObject *
+PyBytes_Repr(PyObject *obj, int smartquotes)
+{
+    PyBytesObject* op = (PyBytesObject*) obj;
+    Py_ssize_t i, length = Py_SIZE(op);
+    Py_ssize_t newsize, squotes, dquotes;
+    PyObject *v;
+    unsigned char quote, *s, *p;
+
+    /* Compute size of output string */
+    squotes = dquotes = 0;
+    newsize = 3; /* b'' */
+    s = (unsigned char*)op->ob_sval;
+    for (i = 0; i < length; i++) {
+        Py_ssize_t incr = 1;
+        switch(s[i]) {
+        case '\'': squotes++; break;
+        case '"':  dquotes++; break;
+        case '\\': case '\t': case '\n': case '\r':
+            incr = 2; break; /* \C */
+        default:
+            if (s[i] < ' ' || s[i] >= 0x7f)
+                incr = 4; /* \xHH */
+        }
+        if (newsize > PY_SSIZE_T_MAX - incr)
+            goto overflow;
+        newsize += incr;
+    }
+    quote = '\'';
+    if (smartquotes && squotes && !dquotes)
+        quote = '"';
+    if (squotes && quote == '\'') {
+        if (newsize > PY_SSIZE_T_MAX - squotes)
+            goto overflow;
+        newsize += squotes;
+    }
+
+    v = PyUnicode_New(newsize, 127);
+    if (v == NULL) {
+        return NULL;
+    }
+    p = PyUnicode_1BYTE_DATA(v);
+
+    *p++ = 'b', *p++ = quote;
+    for (i = 0; i < length; i++) {
+        unsigned char c = op->ob_sval[i];
+        if (c == quote || c == '\\')
+            *p++ = '\\', *p++ = c;
+        else if (c == '\t')
+            *p++ = '\\', *p++ = 't';
+        else if (c == '\n')
+            *p++ = '\\', *p++ = 'n';
+        else if (c == '\r')
+            *p++ = '\\', *p++ = 'r';
+        else if (c < ' ' || c >= 0x7f) {
+            *p++ = '\\';
+            *p++ = 'x';
+            *p++ = Py_hexdigits[(c & 0xf0) >> 4];
+            *p++ = Py_hexdigits[c & 0xf];
+        }
+        else
+            *p++ = c;
+    }
+    *p++ = quote;
+    assert(_PyUnicode_CheckConsistency(v, 1));
+    return v;
+
+  overflow:
+    PyErr_SetString(PyExc_OverflowError,
+                    "bytes object is too large to make repr");
+    return NULL;
+}
+
+static PyObject *
+bytes_repr(PyObject *op)
+{
+    return PyBytes_Repr(op, 1);
+}
+
+static PyObject *
+bytes_str(PyObject *op)
+{
+    if (Py_BytesWarningFlag) {
+        if (PyErr_WarnEx(PyExc_BytesWarning,
+                         "str() on a bytes instance", 1))
+            return NULL;
+    }
+    return bytes_repr(op);
+}
+
+static Py_ssize_t
+bytes_length(PyBytesObject *a)
+{
+    return Py_SIZE(a);
+}
+
+/* This is also used by PyBytes_Concat() */
+static PyObject *
+bytes_concat(PyObject *a, PyObject *b)
+{
+    Py_buffer va, vb;
+    PyObject *result = NULL;
+
+    va.len = -1;
+    vb.len = -1;
+    if (PyObject_GetBuffer(a, &va, PyBUF_SIMPLE) != 0 ||
+        PyObject_GetBuffer(b, &vb, PyBUF_SIMPLE) != 0) {
+        PyErr_Format(PyExc_TypeError, "can't concat %.100s to %.100s",
+                     Py_TYPE(b)->tp_name, Py_TYPE(a)->tp_name);
+        goto done;
+    }
+
+    /* Optimize end cases */
+    if (va.len == 0 && PyBytes_CheckExact(b)) {
+        result = b;
+        Py_INCREF(result);
+        goto done;
+    }
+    if (vb.len == 0 && PyBytes_CheckExact(a)) {
+        result = a;
+        Py_INCREF(result);
+        goto done;
+    }
+
+    if (va.len > PY_SSIZE_T_MAX - vb.len) {
+        PyErr_NoMemory();
+        goto done;
+    }
+
+    result = PyBytes_FromStringAndSize(NULL, va.len + vb.len);
+    if (result != NULL) {
+        memcpy(PyBytes_AS_STRING(result), va.buf, va.len);
+        memcpy(PyBytes_AS_STRING(result) + va.len, vb.buf, vb.len);
+    }
+
+  done:
+    if (va.len != -1)
+        PyBuffer_Release(&va);
+    if (vb.len != -1)
+        PyBuffer_Release(&vb);
+    return result;
+}
+
+static PyObject *
+bytes_repeat(PyBytesObject *a, Py_ssize_t n)
+{
+    Py_ssize_t i;
+    Py_ssize_t j;
+    Py_ssize_t size;
+    PyBytesObject *op;
+    size_t nbytes;
+    if (n < 0)
+        n = 0;
+    /* watch out for overflows:  the size can overflow int,
+     * and the # of bytes needed can overflow size_t
+     */
+    if (n > 0 && Py_SIZE(a) > PY_SSIZE_T_MAX / n) {
+        PyErr_SetString(PyExc_OverflowError,
+            "repeated bytes are too long");
+        return NULL;
+    }
+    size = Py_SIZE(a) * n;
+    if (size == Py_SIZE(a) && PyBytes_CheckExact(a)) {
+        Py_INCREF(a);
+        return (PyObject *)a;
+    }
+    nbytes = (size_t)size;
+    if (nbytes + PyBytesObject_SIZE <= nbytes) {
+        PyErr_SetString(PyExc_OverflowError,
+            "repeated bytes are too long");
+        return NULL;
+    }
+    op = (PyBytesObject *)PyObject_MALLOC(PyBytesObject_SIZE + nbytes);
+    if (op == NULL)
+        return PyErr_NoMemory();
+    (void)PyObject_INIT_VAR(op, &PyBytes_Type, size);
+    op->ob_shash = -1;
+    op->ob_sval[size] = '\0';
+    if (Py_SIZE(a) == 1 && n > 0) {
+        memset(op->ob_sval, a->ob_sval[0] , n);
+        return (PyObject *) op;
+    }
+    i = 0;
+    if (i < size) {
+        memcpy(op->ob_sval, a->ob_sval, Py_SIZE(a));
+        i = Py_SIZE(a);
+    }
+    while (i < size) {
+        j = (i <= size-i)  ?  i  :  size-i;
+        memcpy(op->ob_sval+i, op->ob_sval, j);
+        i += j;
+    }
+    return (PyObject *) op;
+}
+
+static int
+bytes_contains(PyObject *self, PyObject *arg)
+{
+    return _Py_bytes_contains(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), arg);
+}
+
+static PyObject *
+bytes_item(PyBytesObject *a, Py_ssize_t i)
+{
+    if (i < 0 || i >= Py_SIZE(a)) {
+        PyErr_SetString(PyExc_IndexError, "index out of range");
+        return NULL;
+    }
+    return PyLong_FromLong((unsigned char)a->ob_sval[i]);
+}
+
+static int
+bytes_compare_eq(PyBytesObject *a, PyBytesObject *b)
+{
+    int cmp;
+    Py_ssize_t len;
+
+    len = Py_SIZE(a);
+    if (Py_SIZE(b) != len)
+        return 0;
+
+    if (a->ob_sval[0] != b->ob_sval[0])
+        return 0;
+
+    cmp = memcmp(a->ob_sval, b->ob_sval, len);
+    return (cmp == 0);
+}
+
+static PyObject*
+bytes_richcompare(PyBytesObject *a, PyBytesObject *b, int op)
+{
+    int c;
+    Py_ssize_t len_a, len_b;
+    Py_ssize_t min_len;
+    PyObject *result;
+    int rc;
+
+    /* Make sure both arguments are strings. */
+    if (!(PyBytes_Check(a) && PyBytes_Check(b))) {
+        if (Py_BytesWarningFlag && (op == Py_EQ || op == Py_NE)) {
+            rc = PyObject_IsInstance((PyObject*)a,
+                                     (PyObject*)&PyUnicode_Type);
+            if (!rc)
+                rc = PyObject_IsInstance((PyObject*)b,
+                                         (PyObject*)&PyUnicode_Type);
+            if (rc < 0)
+                return NULL;
+            if (rc) {
+                if (PyErr_WarnEx(PyExc_BytesWarning,
+                                 "Comparison between bytes and string", 1))
+                    return NULL;
+            }
+            else {
+                rc = PyObject_IsInstance((PyObject*)a,
+                                         (PyObject*)&PyLong_Type);
+                if (!rc)
+                    rc = PyObject_IsInstance((PyObject*)b,
+                                             (PyObject*)&PyLong_Type);
+                if (rc < 0)
+                    return NULL;
+                if (rc) {
+                    if (PyErr_WarnEx(PyExc_BytesWarning,
+                                     "Comparison between bytes and int", 1))
+                        return NULL;
+                }
+            }
+        }
+        result = Py_NotImplemented;
+    }
+    else if (a == b) {
+        switch (op) {
+        case Py_EQ:
+        case Py_LE:
+        case Py_GE:
+            /* a string is equal to itself */
+            result = Py_True;
+            break;
+        case Py_NE:
+        case Py_LT:
+        case Py_GT:
+            result = Py_False;
+            break;
+        default:
+            PyErr_BadArgument();
+            return NULL;
+        }
+    }
+    else if (op == Py_EQ || op == Py_NE) {
+        int eq = bytes_compare_eq(a, b);
+        eq ^= (op == Py_NE);
+        result = eq ? Py_True : Py_False;
+    }
+    else {
+        len_a = Py_SIZE(a);
+        len_b = Py_SIZE(b);
+        min_len = Py_MIN(len_a, len_b);
+        if (min_len > 0) {
+            c = Py_CHARMASK(*a->ob_sval) - Py_CHARMASK(*b->ob_sval);
+            if (c == 0)
+                c = memcmp(a->ob_sval, b->ob_sval, min_len);
+        }
+        else
+            c = 0;
+        if (c == 0)
+            c = (len_a < len_b) ? -1 : (len_a > len_b) ? 1 : 0;
+        switch (op) {
+        case Py_LT: c = c <  0; break;
+        case Py_LE: c = c <= 0; break;
+        case Py_GT: c = c >  0; break;
+        case Py_GE: c = c >= 0; break;
+        default:
+            PyErr_BadArgument();
+            return NULL;
+        }
+        result = c ? Py_True : Py_False;
+    }
+
+    Py_INCREF(result);
+    return result;
+}
+
+static Py_hash_t
+bytes_hash(PyBytesObject *a)
+{
+    if (a->ob_shash == -1) {
+        /* Can't fail */
+        a->ob_shash = _Py_HashBytes(a->ob_sval, Py_SIZE(a));
+    }
+    return a->ob_shash;
+}
+
+static PyObject*
+bytes_subscript(PyBytesObject* self, PyObject* item)
+{
+    if (PyIndex_Check(item)) {
+        Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
+        if (i == -1 && PyErr_Occurred())
+            return NULL;
+        if (i < 0)
+            i += PyBytes_GET_SIZE(self);
+        if (i < 0 || i >= PyBytes_GET_SIZE(self)) {
+            PyErr_SetString(PyExc_IndexError,
+                            "index out of range");
+            return NULL;
+        }
+        return PyLong_FromLong((unsigned char)self->ob_sval[i]);
+    }
+    else if (PySlice_Check(item)) {
+        Py_ssize_t start, stop, step, slicelength, cur, i;
+        char* source_buf;
+        char* result_buf;
+        PyObject* result;
+
+        if (PySlice_Unpack(item, &start, &stop, &step) < 0) {
+            return NULL;
+        }
+        slicelength = PySlice_AdjustIndices(PyBytes_GET_SIZE(self), &start,
+                                            &stop, step);
+
+        if (slicelength <= 0) {
+            return PyBytes_FromStringAndSize("", 0);
+        }
+        else if (start == 0 && step == 1 &&
+                 slicelength == PyBytes_GET_SIZE(self) &&
+                 PyBytes_CheckExact(self)) {
+            Py_INCREF(self);
+            return (PyObject *)self;
+        }
+        else if (step == 1) {
+            return PyBytes_FromStringAndSize(
+                PyBytes_AS_STRING(self) + start,
+                slicelength);
+        }
+        else {
+            source_buf = PyBytes_AS_STRING(self);
+            result = PyBytes_FromStringAndSize(NULL, slicelength);
+            if (result == NULL)
+                return NULL;
+
+            result_buf = PyBytes_AS_STRING(result);
+            for (cur = start, i = 0; i < slicelength;
+                 cur += step, i++) {
+                result_buf[i] = source_buf[cur];
+            }
+
+            return result;
+        }
+    }
+    else {
+        PyErr_Format(PyExc_TypeError,
+                     "byte indices must be integers or slices, not %.200s",
+                     Py_TYPE(item)->tp_name);
+        return NULL;
+    }
+}
+
+static int
+bytes_buffer_getbuffer(PyBytesObject *self, Py_buffer *view, int flags)
+{
+    return PyBuffer_FillInfo(view, (PyObject*)self, (void *)self->ob_sval, Py_SIZE(self),
+                             1, flags);
+}
+
+static PySequenceMethods bytes_as_sequence = {
+    (lenfunc)bytes_length, /*sq_length*/
+    (binaryfunc)bytes_concat, /*sq_concat*/
+    (ssizeargfunc)bytes_repeat, /*sq_repeat*/
+    (ssizeargfunc)bytes_item, /*sq_item*/
+    0,                  /*sq_slice*/
+    0,                  /*sq_ass_item*/
+    0,                  /*sq_ass_slice*/
+    (objobjproc)bytes_contains /*sq_contains*/
+};
+
+static PyMappingMethods bytes_as_mapping = {
+    (lenfunc)bytes_length,
+    (binaryfunc)bytes_subscript,
+    0,
+};
+
+static PyBufferProcs bytes_as_buffer = {
+    (getbufferproc)bytes_buffer_getbuffer,
+    NULL,
+};
+
+
+#define LEFTSTRIP 0
+#define RIGHTSTRIP 1
+#define BOTHSTRIP 2
+
+/*[clinic input]
+bytes.split
+
+    sep: object = None
+        The delimiter according which to split the bytes.
+        None (the default value) means split on ASCII whitespace characters
+        (space, tab, return, newline, formfeed, vertical tab).
+    maxsplit: Py_ssize_t = -1
+        Maximum number of splits to do.
+        -1 (the default value) means no limit.
+
+Return a list of the sections in the bytes, using sep as the delimiter.
+[clinic start generated code]*/
+
+static PyObject *
+bytes_split_impl(PyBytesObject *self, PyObject *sep, Py_ssize_t maxsplit)
+/*[clinic end generated code: output=52126b5844c1d8ef input=8b809b39074abbfa]*/
+{
+    Py_ssize_t len = PyBytes_GET_SIZE(self), n;
+    const char *s = PyBytes_AS_STRING(self), *sub;
+    Py_buffer vsub;
+    PyObject *list;
+
+    if (maxsplit < 0)
+        maxsplit = PY_SSIZE_T_MAX;
+    if (sep == Py_None)
+        return stringlib_split_whitespace((PyObject*) self, s, len, maxsplit);
+    if (PyObject_GetBuffer(sep, &vsub, PyBUF_SIMPLE) != 0)
+        return NULL;
+    sub = vsub.buf;
+    n = vsub.len;
+
+    list = stringlib_split((PyObject*) self, s, len, sub, n, maxsplit);
+    PyBuffer_Release(&vsub);
+    return list;
+}
+
+/*[clinic input]
+bytes.partition
+
+    sep: Py_buffer
+    /
+
+Partition the bytes into three parts using the given separator.
+
+This will search for the separator sep in the bytes. If the separator is found,
+returns a 3-tuple containing the part before the separator, the separator
+itself, and the part after it.
+
+If the separator is not found, returns a 3-tuple containing the original bytes
+object and two empty bytes objects.
+[clinic start generated code]*/
+
+static PyObject *
+bytes_partition_impl(PyBytesObject *self, Py_buffer *sep)
+/*[clinic end generated code: output=f532b392a17ff695 input=61cca95519406099]*/
+{
+    return stringlib_partition(
+        (PyObject*) self,
+        PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self),
+        sep->obj, (const char *)sep->buf, sep->len
+        );
+}
+
+/*[clinic input]
+bytes.rpartition
+
+    sep: Py_buffer
+    /
+
+Partition the bytes into three parts using the given separator.
+
+This will search for the separator sep in the bytes, starting at the end. If
+the separator is found, returns a 3-tuple containing the part before the
+separator, the separator itself, and the part after it.
+
+If the separator is not found, returns a 3-tuple containing two empty bytes
+objects and the original bytes object.
+[clinic start generated code]*/
+
+static PyObject *
+bytes_rpartition_impl(PyBytesObject *self, Py_buffer *sep)
+/*[clinic end generated code: output=191b114cbb028e50 input=d78db010c8cfdbe1]*/
+{
+    return stringlib_rpartition(
+        (PyObject*) self,
+        PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self),
+        sep->obj, (const char *)sep->buf, sep->len
+        );
+}
+
+/*[clinic input]
+bytes.rsplit = bytes.split
+
+Return a list of the sections in the bytes, using sep as the delimiter.
+
+Splitting is done starting at the end of the bytes and working to the front.
+[clinic start generated code]*/
+
+static PyObject *
+bytes_rsplit_impl(PyBytesObject *self, PyObject *sep, Py_ssize_t maxsplit)
+/*[clinic end generated code: output=ba698d9ea01e1c8f input=0f86c9f28f7d7b7b]*/
+{
+    Py_ssize_t len = PyBytes_GET_SIZE(self), n;
+    const char *s = PyBytes_AS_STRING(self), *sub;
+    Py_buffer vsub;
+    PyObject *list;
+
+    if (maxsplit < 0)
+        maxsplit = PY_SSIZE_T_MAX;
+    if (sep == Py_None)
+        return stringlib_rsplit_whitespace((PyObject*) self, s, len, maxsplit);
+    if (PyObject_GetBuffer(sep, &vsub, PyBUF_SIMPLE) != 0)
+        return NULL;
+    sub = vsub.buf;
+    n = vsub.len;
+
+    list = stringlib_rsplit((PyObject*) self, s, len, sub, n, maxsplit);
+    PyBuffer_Release(&vsub);
+    return list;
+}
+
+
+/*[clinic input]
+bytes.join
+
+    iterable_of_bytes: object
+    /
+
+Concatenate any number of bytes objects.
+
+The bytes whose method is called is inserted in between each pair.
+
+The result is returned as a new bytes object.
+
+Example: b'.'.join([b'ab', b'pq', b'rs']) -> b'ab.pq.rs'.
+[clinic start generated code]*/
+
+static PyObject *
+bytes_join(PyBytesObject *self, PyObject *iterable_of_bytes)
+/*[clinic end generated code: output=a046f379f626f6f8 input=7fe377b95bd549d2]*/
+{
+    return stringlib_bytes_join((PyObject*)self, iterable_of_bytes);
+}
+
+PyObject *
+_PyBytes_Join(PyObject *sep, PyObject *x)
+{
+    assert(sep != NULL && PyBytes_Check(sep));
+    assert(x != NULL);
+    return bytes_join((PyBytesObject*)sep, x);
+}
+
+static PyObject *
+bytes_find(PyBytesObject *self, PyObject *args)
+{
+    return _Py_bytes_find(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), args);
+}
+
+static PyObject *
+bytes_index(PyBytesObject *self, PyObject *args)
+{
+    return _Py_bytes_index(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), args);
+}
+
+
+static PyObject *
+bytes_rfind(PyBytesObject *self, PyObject *args)
+{
+    return _Py_bytes_rfind(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), args);
+}
+
+
+static PyObject *
+bytes_rindex(PyBytesObject *self, PyObject *args)
+{
+    return _Py_bytes_rindex(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), args);
+}
+
+
+Py_LOCAL_INLINE(PyObject *)
+do_xstrip(PyBytesObject *self, int striptype, PyObject *sepobj)
+{
+    Py_buffer vsep;
+    char *s = PyBytes_AS_STRING(self);
+    Py_ssize_t len = PyBytes_GET_SIZE(self);
+    char *sep;
+    Py_ssize_t seplen;
+    Py_ssize_t i, j;
+
+    if (PyObject_GetBuffer(sepobj, &vsep, PyBUF_SIMPLE) != 0)
+        return NULL;
+    sep = vsep.buf;
+    seplen = vsep.len;
+
+    i = 0;
+    if (striptype != RIGHTSTRIP) {
+        while (i < len && memchr(sep, Py_CHARMASK(s[i]), seplen)) {
+            i++;
+        }
+    }
+
+    j = len;
+    if (striptype != LEFTSTRIP) {
+        do {
+            j--;
+        } while (j >= i && memchr(sep, Py_CHARMASK(s[j]), seplen));
+        j++;
+    }
+
+    PyBuffer_Release(&vsep);
+
+    if (i == 0 && j == len && PyBytes_CheckExact(self)) {
+        Py_INCREF(self);
+        return (PyObject*)self;
+    }
+    else
+        return PyBytes_FromStringAndSize(s+i, j-i);
+}
+
+
+Py_LOCAL_INLINE(PyObject *)
+do_strip(PyBytesObject *self, int striptype)
+{
+    char *s = PyBytes_AS_STRING(self);
+    Py_ssize_t len = PyBytes_GET_SIZE(self), i, j;
+
+    i = 0;
+    if (striptype != RIGHTSTRIP) {
+        while (i < len && Py_ISSPACE(s[i])) {
+            i++;
+        }
+    }
+
+    j = len;
+    if (striptype != LEFTSTRIP) {
+        do {
+            j--;
+        } while (j >= i && Py_ISSPACE(s[j]));
+        j++;
+    }
+
+    if (i == 0 && j == len && PyBytes_CheckExact(self)) {
+        Py_INCREF(self);
+        return (PyObject*)self;
+    }
+    else
+        return PyBytes_FromStringAndSize(s+i, j-i);
+}
+
+
+Py_LOCAL_INLINE(PyObject *)
+do_argstrip(PyBytesObject *self, int striptype, PyObject *bytes)
+{
+    if (bytes != NULL && bytes != Py_None) {
+        return do_xstrip(self, striptype, bytes);
+    }
+    return do_strip(self, striptype);
+}
+
+/*[clinic input]
+bytes.strip
+
+    bytes: object = None
+    /
+
+Strip leading and trailing bytes contained in the argument.
+
+If the argument is omitted or None, strip leading and trailing ASCII whitespace.
+[clinic start generated code]*/
+
+static PyObject *
+bytes_strip_impl(PyBytesObject *self, PyObject *bytes)
+/*[clinic end generated code: output=c7c228d3bd104a1b input=8a354640e4e0b3ef]*/
+{
+    return do_argstrip(self, BOTHSTRIP, bytes);
+}
+
+/*[clinic input]
+bytes.lstrip
+
+    bytes: object = None
+    /
+
+Strip leading bytes contained in the argument.
+
+If the argument is omitted or None, strip leading  ASCII whitespace.
+[clinic start generated code]*/
+
+static PyObject *
+bytes_lstrip_impl(PyBytesObject *self, PyObject *bytes)
+/*[clinic end generated code: output=28602e586f524e82 input=9baff4398c3f6857]*/
+{
+    return do_argstrip(self, LEFTSTRIP, bytes);
+}
+
+/*[clinic input]
+bytes.rstrip
+
+    bytes: object = None
+    /
+
+Strip trailing bytes contained in the argument.
+
+If the argument is omitted or None, strip trailing ASCII whitespace.
+[clinic start generated code]*/
+
+static PyObject *
+bytes_rstrip_impl(PyBytesObject *self, PyObject *bytes)
+/*[clinic end generated code: output=547e3815c95447da input=b78af445c727e32b]*/
+{
+    return do_argstrip(self, RIGHTSTRIP, bytes);
+}
+
+
+static PyObject *
+bytes_count(PyBytesObject *self, PyObject *args)
+{
+    return _Py_bytes_count(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), args);
+}
+
+
+/*[clinic input]
+bytes.translate
+
+    table: object
+        Translation table, which must be a bytes object of length 256.
+    /
+    delete as deletechars: object(c_default="NULL") = b''
+
+Return a copy with each character mapped by the given translation table.
+
+All characters occurring in the optional argument delete are removed.
+The remaining characters are mapped through the given translation table.
+[clinic start generated code]*/
+
+static PyObject *
+bytes_translate_impl(PyBytesObject *self, PyObject *table,
+                     PyObject *deletechars)
+/*[clinic end generated code: output=43be3437f1956211 input=0ecdf159f654233c]*/
+{
+    char *input, *output;
+    Py_buffer table_view = {NULL, NULL};
+    Py_buffer del_table_view = {NULL, NULL};
+    const char *table_chars;
+    Py_ssize_t i, c, changed = 0;
+    PyObject *input_obj = (PyObject*)self;
+    const char *output_start, *del_table_chars=NULL;
+    Py_ssize_t inlen, tablen, dellen = 0;
+    PyObject *result;
+    int trans_table[256];
+
+    if (PyBytes_Check(table)) {
+        table_chars = PyBytes_AS_STRING(table);
+        tablen = PyBytes_GET_SIZE(table);
+    }
+    else if (table == Py_None) {
+        table_chars = NULL;
+        tablen = 256;
+    }
+    else {
+        if (PyObject_GetBuffer(table, &table_view, PyBUF_SIMPLE) != 0)
+            return NULL;
+        table_chars = table_view.buf;
+        tablen = table_view.len;
+    }
+
+    if (tablen != 256) {
+        PyErr_SetString(PyExc_ValueError,
+          "translation table must be 256 characters long");
+        PyBuffer_Release(&table_view);
+        return NULL;
+    }
+
+    if (deletechars != NULL) {
+        if (PyBytes_Check(deletechars)) {
+            del_table_chars = PyBytes_AS_STRING(deletechars);
+            dellen = PyBytes_GET_SIZE(deletechars);
+        }
+        else {
+            if (PyObject_GetBuffer(deletechars, &del_table_view, PyBUF_SIMPLE) != 0) {
+                PyBuffer_Release(&table_view);
+                return NULL;
+            }
+            del_table_chars = del_table_view.buf;
+            dellen = del_table_view.len;
+        }
+    }
+    else {
+        del_table_chars = NULL;
+        dellen = 0;
+    }
+
+    inlen = PyBytes_GET_SIZE(input_obj);
+    result = PyBytes_FromStringAndSize((char *)NULL, inlen);
+    if (result == NULL) {
+        PyBuffer_Release(&del_table_view);
+        PyBuffer_Release(&table_view);
+        return NULL;
+    }
+    output_start = output = PyBytes_AS_STRING(result);
+    input = PyBytes_AS_STRING(input_obj);
+
+    if (dellen == 0 && table_chars != NULL) {
+        /* If no deletions are required, use faster code */
+        for (i = inlen; --i >= 0; ) {
+            c = Py_CHARMASK(*input++);
+            if (Py_CHARMASK((*output++ = table_chars[c])) != c)
+                changed = 1;
+        }
+        if (!changed && PyBytes_CheckExact(input_obj)) {
+            Py_INCREF(input_obj);
+            Py_DECREF(result);
+            result = input_obj;
+        }
+        PyBuffer_Release(&del_table_view);
+        PyBuffer_Release(&table_view);
+        return result;
+    }
+
+    if (table_chars == NULL) {
+        for (i = 0; i < 256; i++)
+            trans_table[i] = Py_CHARMASK(i);
+    } else {
+        for (i = 0; i < 256; i++)
+            trans_table[i] = Py_CHARMASK(table_chars[i]);
+    }
+    PyBuffer_Release(&table_view);
+
+    for (i = 0; i < dellen; i++)
+        trans_table[(int) Py_CHARMASK(del_table_chars[i])] = -1;
+    PyBuffer_Release(&del_table_view);
+
+    for (i = inlen; --i >= 0; ) {
+        c = Py_CHARMASK(*input++);
+        if (trans_table[c] != -1)
+            if (Py_CHARMASK(*output++ = (char)trans_table[c]) == c)
+                continue;
+        changed = 1;
+    }
+    if (!changed && PyBytes_CheckExact(input_obj)) {
+        Py_DECREF(result);
+        Py_INCREF(input_obj);
+        return input_obj;
+    }
+    /* Fix the size of the resulting string */
+    if (inlen > 0)
+        _PyBytes_Resize(&result, output - output_start);
+    return result;
+}
+
+
+/*[clinic input]
+
+ at staticmethod
+bytes.maketrans
+
+    frm: Py_buffer
+    to: Py_buffer
+    /
+
+Return a translation table useable for the bytes or bytearray translate method.
+
+The returned table will be one where each byte in frm is mapped to the byte at
+the same position in to.
+
+The bytes objects frm and to must be of the same length.
+[clinic start generated code]*/
+
+static PyObject *
+bytes_maketrans_impl(Py_buffer *frm, Py_buffer *to)
+/*[clinic end generated code: output=a36f6399d4b77f6f input=de7a8fc5632bb8f1]*/
+{
+    return _Py_bytes_maketrans(frm, to);
+}
+
+
+/*[clinic input]
+bytes.replace
+
+    old: Py_buffer
+    new: Py_buffer
+    count: Py_ssize_t = -1
+        Maximum number of occurrences to replace.
+        -1 (the default value) means replace all occurrences.
+    /
+
+Return a copy with all occurrences of substring old replaced by new.
+
+If the optional argument count is given, only the first count occurrences are
+replaced.
+[clinic start generated code]*/
+
+static PyObject *
+bytes_replace_impl(PyBytesObject *self, Py_buffer *old, Py_buffer *new,
+                   Py_ssize_t count)
+/*[clinic end generated code: output=994fa588b6b9c104 input=b2fbbf0bf04de8e5]*/
+{
+    return stringlib_replace((PyObject *)self,
+                             (const char *)old->buf, old->len,
+                             (const char *)new->buf, new->len, count);
+}
+
+/** End DALKE **/
+
+
+static PyObject *
+bytes_startswith(PyBytesObject *self, PyObject *args)
+{
+    return _Py_bytes_startswith(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), args);
+}
+
+static PyObject *
+bytes_endswith(PyBytesObject *self, PyObject *args)
+{
+    return _Py_bytes_endswith(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), args);
+}
+
+
+/*[clinic input]
+bytes.decode
+
+    encoding: str(c_default="NULL") = 'utf-8'
+        The encoding with which to decode the bytes.
+    errors: str(c_default="NULL") = 'strict'
+        The error handling scheme to use for the handling of decoding errors.
+        The default is 'strict' meaning that decoding errors raise a
+        UnicodeDecodeError. Other possible values are 'ignore' and 'replace'
+        as well as any other name registered with codecs.register_error that
+        can handle UnicodeDecodeErrors.
+
+Decode the bytes using the codec registered for encoding.
+[clinic start generated code]*/
+
+static PyObject *
+bytes_decode_impl(PyBytesObject *self, const char *encoding,
+                  const char *errors)
+/*[clinic end generated code: output=5649a53dde27b314 input=958174769d2a40ca]*/
+{
+    return PyUnicode_FromEncodedObject((PyObject*)self, encoding, errors);
+}
+
+
+/*[clinic input]
+bytes.splitlines
+
+    keepends: bool(accept={int}) = False
+
+Return a list of the lines in the bytes, breaking at line boundaries.
+
+Line breaks are not included in the resulting list unless keepends is given and
+true.
+[clinic start generated code]*/
+
+static PyObject *
+bytes_splitlines_impl(PyBytesObject *self, int keepends)
+/*[clinic end generated code: output=3484149a5d880ffb input=a8b32eb01ff5a5ed]*/
+{
+    return stringlib_splitlines(
+        (PyObject*) self, PyBytes_AS_STRING(self),
+        PyBytes_GET_SIZE(self), keepends
+        );
+}
+
+/*[clinic input]
+ at classmethod
+bytes.fromhex
+
+    string: unicode
+    /
+
+Create a bytes object from a string of hexadecimal numbers.
+
+Spaces between two numbers are accepted.
+Example: bytes.fromhex('B9 01EF') -> b'\\xb9\\x01\\xef'.
+[clinic start generated code]*/
+
+static PyObject *
+bytes_fromhex_impl(PyTypeObject *type, PyObject *string)
+/*[clinic end generated code: output=0973acc63661bb2e input=bf4d1c361670acd3]*/
+{
+    PyObject *result = _PyBytes_FromHex(string, 0);
+    if (type != &PyBytes_Type && result != NULL) {
+        Py_SETREF(result, PyObject_CallFunctionObjArgs((PyObject *)type,
+                                                       result, NULL));
+    }
+    return result;
+}
+
+PyObject*
+_PyBytes_FromHex(PyObject *string, int use_bytearray)
+{
+    char *buf;
+    Py_ssize_t hexlen, invalid_char;
+    unsigned int top, bot;
+    Py_UCS1 *str, *end;
+    _PyBytesWriter writer;
+
+    _PyBytesWriter_Init(&writer);
+    writer.use_bytearray = use_bytearray;
+
+    assert(PyUnicode_Check(string));
+    if (PyUnicode_READY(string))
+        return NULL;
+    hexlen = PyUnicode_GET_LENGTH(string);
+
+    if (!PyUnicode_IS_ASCII(string)) {
+        void *data = PyUnicode_DATA(string);
+        unsigned int kind = PyUnicode_KIND(string);
+        Py_ssize_t i;
+
+        /* search for the first non-ASCII character */
+        for (i = 0; i < hexlen; i++) {
+            if (PyUnicode_READ(kind, data, i) >= 128)
+                break;
+        }
+        invalid_char = i;
+        goto error;
+    }
+
+    assert(PyUnicode_KIND(string) == PyUnicode_1BYTE_KIND);
+    str = PyUnicode_1BYTE_DATA(string);
+
+    /* This overestimates if there are spaces */
+    buf = _PyBytesWriter_Alloc(&writer, hexlen / 2);
+    if (buf == NULL)
+        return NULL;
+
+    end = str + hexlen;
+    while (str < end) {
+        /* skip over spaces in the input */
+        if (Py_ISSPACE(*str)) {
+            do {
+                str++;
+            } while (Py_ISSPACE(*str));
+            if (str >= end)
+                break;
+        }
+
+        top = _PyLong_DigitValue[*str];
+        if (top >= 16) {
+            invalid_char = str - PyUnicode_1BYTE_DATA(string);
+            goto error;
+        }
+        str++;
+
+        bot = _PyLong_DigitValue[*str];
+        if (bot >= 16) {
+            invalid_char = str - PyUnicode_1BYTE_DATA(string);
+            goto error;
+        }
+        str++;
+
+        *buf++ = (unsigned char)((top << 4) + bot);
+    }
+
+    return _PyBytesWriter_Finish(&writer, buf);
+
+  error:
+    PyErr_Format(PyExc_ValueError,
+                 "non-hexadecimal number found in "
+                 "fromhex() arg at position %zd", invalid_char);
+    _PyBytesWriter_Dealloc(&writer);
+    return NULL;
+}
+
+PyDoc_STRVAR(hex__doc__,
+"B.hex() -> string\n\
+\n\
+Create a string of hexadecimal numbers from a bytes object.\n\
+Example: b'\\xb9\\x01\\xef'.hex() -> 'b901ef'.");
+
+static PyObject *
+bytes_hex(PyBytesObject *self)
+{
+    char* argbuf = PyBytes_AS_STRING(self);
+    Py_ssize_t arglen = PyBytes_GET_SIZE(self);
+    return _Py_strhex(argbuf, arglen);
+}
+
+static PyObject *
+bytes_getnewargs(PyBytesObject *v)
+{
+    return Py_BuildValue("(y#)", v->ob_sval, Py_SIZE(v));
+}
+
+
+static PyMethodDef
+bytes_methods[] = {
+    {"__getnewargs__",          (PyCFunction)bytes_getnewargs,  METH_NOARGS},
+    {"capitalize", (PyCFunction)stringlib_capitalize, METH_NOARGS,
+     _Py_capitalize__doc__},
+    {"center", (PyCFunction)stringlib_center, METH_VARARGS,
+     _Py_center__doc__},
+    {"count", (PyCFunction)bytes_count, METH_VARARGS,
+     _Py_count__doc__},
+    BYTES_DECODE_METHODDEF
+    {"endswith", (PyCFunction)bytes_endswith, METH_VARARGS,
+     _Py_endswith__doc__},
+    {"expandtabs", (PyCFunction)stringlib_expandtabs, METH_VARARGS | METH_KEYWORDS,
+     _Py_expandtabs__doc__},
+    {"find", (PyCFunction)bytes_find, METH_VARARGS,
+     _Py_find__doc__},
+    BYTES_FROMHEX_METHODDEF
+    {"hex", (PyCFunction)bytes_hex, METH_NOARGS, hex__doc__},
+    {"index", (PyCFunction)bytes_index, METH_VARARGS, _Py_index__doc__},
+    {"isalnum", (PyCFunction)stringlib_isalnum, METH_NOARGS,
+     _Py_isalnum__doc__},
+    {"isalpha", (PyCFunction)stringlib_isalpha, METH_NOARGS,
+     _Py_isalpha__doc__},
+    {"isdigit", (PyCFunction)stringlib_isdigit, METH_NOARGS,
+     _Py_isdigit__doc__},
+    {"islower", (PyCFunction)stringlib_islower, METH_NOARGS,
+     _Py_islower__doc__},
+    {"isspace", (PyCFunction)stringlib_isspace, METH_NOARGS,
+     _Py_isspace__doc__},
+    {"istitle", (PyCFunction)stringlib_istitle, METH_NOARGS,
+     _Py_istitle__doc__},
+    {"isupper", (PyCFunction)stringlib_isupper, METH_NOARGS,
+     _Py_isupper__doc__},
+    BYTES_JOIN_METHODDEF
+    {"ljust", (PyCFunction)stringlib_ljust, METH_VARARGS, _Py_ljust__doc__},
+    {"lower", (PyCFunction)stringlib_lower, METH_NOARGS, _Py_lower__doc__},
+    BYTES_LSTRIP_METHODDEF
+    BYTES_MAKETRANS_METHODDEF
+    BYTES_PARTITION_METHODDEF
+    BYTES_REPLACE_METHODDEF
+    {"rfind", (PyCFunction)bytes_rfind, METH_VARARGS, _Py_rfind__doc__},
+    {"rindex", (PyCFunction)bytes_rindex, METH_VARARGS, _Py_rindex__doc__},
+    {"rjust", (PyCFunction)stringlib_rjust, METH_VARARGS, _Py_rjust__doc__},
+    BYTES_RPARTITION_METHODDEF
+    BYTES_RSPLIT_METHODDEF
+    BYTES_RSTRIP_METHODDEF
+    BYTES_SPLIT_METHODDEF
+    BYTES_SPLITLINES_METHODDEF
+    {"startswith", (PyCFunction)bytes_startswith, METH_VARARGS,
+     _Py_startswith__doc__},
+    BYTES_STRIP_METHODDEF
+    {"swapcase", (PyCFunction)stringlib_swapcase, METH_NOARGS,
+     _Py_swapcase__doc__},
+    {"title", (PyCFunction)stringlib_title, METH_NOARGS, _Py_title__doc__},
+    BYTES_TRANSLATE_METHODDEF
+    {"upper", (PyCFunction)stringlib_upper, METH_NOARGS, _Py_upper__doc__},
+    {"zfill", (PyCFunction)stringlib_zfill, METH_VARARGS, _Py_zfill__doc__},
+    {NULL,     NULL}                         /* sentinel */
+};
+
+static PyObject *
+bytes_mod(PyObject *self, PyObject *arg)
+{
+    if (!PyBytes_Check(self)) {
+        Py_RETURN_NOTIMPLEMENTED;
+    }
+    return _PyBytes_FormatEx(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self),
+                             arg, 0);
+}
+
+static PyNumberMethods bytes_as_number = {
+    0,              /*nb_add*/
+    0,              /*nb_subtract*/
+    0,              /*nb_multiply*/
+    bytes_mod,      /*nb_remainder*/
+};
+
+static PyObject *
+bytes_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
+
+static PyObject *
+bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    PyObject *x = NULL;
+    const char *encoding = NULL;
+    const char *errors = NULL;
+    PyObject *new = NULL;
+    PyObject *func;
+    Py_ssize_t size;
+    static char *kwlist[] = {"source", "encoding", "errors", 0};
+    _Py_IDENTIFIER(__bytes__);
+
+    if (type != &PyBytes_Type)
+        return bytes_subtype_new(type, args, kwds);
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Oss:bytes", kwlist, &x,
+                                     &encoding, &errors))
+        return NULL;
+    if (x == NULL) {
+        if (encoding != NULL || errors != NULL) {
+            PyErr_SetString(PyExc_TypeError,
+                            "encoding or errors without sequence "
+                            "argument");
+            return NULL;
+        }
+        return PyBytes_FromStringAndSize(NULL, 0);
+    }
+
+    if (encoding != NULL) {
+        /* Encode via the codec registry */
+        if (!PyUnicode_Check(x)) {
+            PyErr_SetString(PyExc_TypeError,
+                            "encoding without a string argument");
+            return NULL;
+        }
+        new = PyUnicode_AsEncodedString(x, encoding, errors);
+        if (new == NULL)
+            return NULL;
+        assert(PyBytes_Check(new));
+        return new;
+    }
+
+    if (errors != NULL) {
+        PyErr_SetString(PyExc_TypeError,
+                        PyUnicode_Check(x) ?
+                        "string argument without an encoding" :
+                        "errors without a string argument");
+        return NULL;
+    }
+
+    /* We'd like to call PyObject_Bytes here, but we need to check for an
+       integer argument before deferring to PyBytes_FromObject, something
+       PyObject_Bytes doesn't do. */
+    func = _PyObject_LookupSpecial(x, &PyId___bytes__);
+    if (func != NULL) {
+        new = _PyObject_CallNoArg(func);
+        Py_DECREF(func);
+        if (new == NULL)
+            return NULL;
+        if (!PyBytes_Check(new)) {
+            PyErr_Format(PyExc_TypeError,
+                         "__bytes__ returned non-bytes (type %.200s)",
+                         Py_TYPE(new)->tp_name);
+            Py_DECREF(new);
+            return NULL;
+        }
+        return new;
+    }
+    else if (PyErr_Occurred())
+        return NULL;
+
+    if (PyUnicode_Check(x)) {
+        PyErr_SetString(PyExc_TypeError,
+                        "string argument without an encoding");
+        return NULL;
+    }
+    /* Is it an integer? */
+    if (PyIndex_Check(x)) {
+        size = PyNumber_AsSsize_t(x, PyExc_OverflowError);
+        if (size == -1 && PyErr_Occurred()) {
+            if (PyErr_ExceptionMatches(PyExc_OverflowError))
+                return NULL;
+            PyErr_Clear();  /* fall through */
+        }
+        else {
+            if (size < 0) {
+                PyErr_SetString(PyExc_ValueError, "negative count");
+                return NULL;
+            }
+            new = _PyBytes_FromSize(size, 1);
+            if (new == NULL)
+                return NULL;
+            return new;
+        }
+    }
+
+    return PyBytes_FromObject(x);
+}
+
+static PyObject*
+_PyBytes_FromBuffer(PyObject *x)
+{
+    PyObject *new;
+    Py_buffer view;
+
+    if (PyObject_GetBuffer(x, &view, PyBUF_FULL_RO) < 0)
+        return NULL;
+
+    new = PyBytes_FromStringAndSize(NULL, view.len);
+    if (!new)
+        goto fail;
+    if (PyBuffer_ToContiguous(((PyBytesObject *)new)->ob_sval,
+                &view, view.len, 'C') < 0)
+        goto fail;
+    PyBuffer_Release(&view);
+    return new;
+
+fail:
+    Py_XDECREF(new);
+    PyBuffer_Release(&view);
+    return NULL;
+}
+
+#define _PyBytes_FROM_LIST_BODY(x, GET_ITEM)                                \
+    do {                                                                    \
+        PyObject *bytes;                                                    \
+        Py_ssize_t i;                                                       \
+        Py_ssize_t value;                                                   \
+        char *str;                                                          \
+        PyObject *item;                                                     \
+                                                                            \
+        bytes = PyBytes_FromStringAndSize(NULL, Py_SIZE(x));                \
+        if (bytes == NULL)                                                  \
+            return NULL;                                                    \
+        str = ((PyBytesObject *)bytes)->ob_sval;                            \
+                                                                            \
+        for (i = 0; i < Py_SIZE(x); i++) {                                  \
+            item = GET_ITEM((x), i);                                        \
+            value = PyNumber_AsSsize_t(item, NULL);                         \
+            if (value == -1 && PyErr_Occurred())                            \
+                goto error;                                                 \
+                                                                            \
+            if (value < 0 || value >= 256) {                                \
+                PyErr_SetString(PyExc_ValueError,                           \
+                                "bytes must be in range(0, 256)");          \
+                goto error;                                                 \
+            }                                                               \
+            *str++ = (char) value;                                          \
+        }                                                                   \
+        return bytes;                                                       \
+                                                                            \
+    error:                                                                  \
+        Py_DECREF(bytes);                                                   \
+        return NULL;                                                        \
+    } while (0)
+
+static PyObject*
+_PyBytes_FromList(PyObject *x)
+{
+    _PyBytes_FROM_LIST_BODY(x, PyList_GET_ITEM);
+}
+
+static PyObject*
+_PyBytes_FromTuple(PyObject *x)
+{
+    _PyBytes_FROM_LIST_BODY(x, PyTuple_GET_ITEM);
+}
+
+static PyObject *
+_PyBytes_FromIterator(PyObject *it, PyObject *x)
+{
+    char *str;
+    Py_ssize_t i, size;
+    _PyBytesWriter writer;
+
+    /* For iterator version, create a string object and resize as needed */
+    size = PyObject_LengthHint(x, 64);
+    if (size == -1 && PyErr_Occurred())
+        return NULL;
+
+    _PyBytesWriter_Init(&writer);
+    str = _PyBytesWriter_Alloc(&writer, size);
+    if (str == NULL)
+        return NULL;
+    writer.overallocate = 1;
+    size = writer.allocated;
+
+    /* Run the iterator to exhaustion */
+    for (i = 0; ; i++) {
+        PyObject *item;
+        Py_ssize_t value;
+
+        /* Get the next item */
+        item = PyIter_Next(it);
+        if (item == NULL) {
+            if (PyErr_Occurred())
+                goto error;
+            break;
+        }
+
+        /* Interpret it as an int (__index__) */
+        value = PyNumber_AsSsize_t(item, NULL);
+        Py_DECREF(item);
+        if (value == -1 && PyErr_Occurred())
+            goto error;
+
+        /* Range check */
+        if (value < 0 || value >= 256) {
+            PyErr_SetString(PyExc_ValueError,
+                            "bytes must be in range(0, 256)");
+            goto error;
+        }
+
+        /* Append the byte */
+        if (i >= size) {
+            str = _PyBytesWriter_Resize(&writer, str, size+1);
+            if (str == NULL)
+                return NULL;
+            size = writer.allocated;
+        }
+        *str++ = (char) value;
+    }
+
+    return _PyBytesWriter_Finish(&writer, str);
+
+  error:
+    _PyBytesWriter_Dealloc(&writer);
+    return NULL;
+}
+
+PyObject *
+PyBytes_FromObject(PyObject *x)
+{
+    PyObject *it, *result;
+
+    if (x == NULL) {
+        PyErr_BadInternalCall();
+        return NULL;
+    }
+
+    if (PyBytes_CheckExact(x)) {
+        Py_INCREF(x);
+        return x;
+    }
+
+    /* Use the modern buffer interface */
+    if (PyObject_CheckBuffer(x))
+        return _PyBytes_FromBuffer(x);
+
+    if (PyList_CheckExact(x))
+        return _PyBytes_FromList(x);
+
+    if (PyTuple_CheckExact(x))
+        return _PyBytes_FromTuple(x);
+
+    if (!PyUnicode_Check(x)) {
+        it = PyObject_GetIter(x);
+        if (it != NULL) {
+            result = _PyBytes_FromIterator(it, x);
+            Py_DECREF(it);
+            return result;
+        }
+    }
+
+    PyErr_Format(PyExc_TypeError,
+                 "cannot convert '%.200s' object to bytes",
+                 x->ob_type->tp_name);
+    return NULL;
+}
+
+static PyObject *
+bytes_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    PyObject *tmp, *pnew;
+    Py_ssize_t n;
+
+    assert(PyType_IsSubtype(type, &PyBytes_Type));
+    tmp = bytes_new(&PyBytes_Type, args, kwds);
+    if (tmp == NULL)
+        return NULL;
+    assert(PyBytes_Check(tmp));
+    n = PyBytes_GET_SIZE(tmp);
+    pnew = type->tp_alloc(type, n);
+    if (pnew != NULL) {
+        memcpy(PyBytes_AS_STRING(pnew),
+                  PyBytes_AS_STRING(tmp), n+1);
+        ((PyBytesObject *)pnew)->ob_shash =
+            ((PyBytesObject *)tmp)->ob_shash;
+    }
+    Py_DECREF(tmp);
+    return pnew;
+}
+
+PyDoc_STRVAR(bytes_doc,
+"bytes(iterable_of_ints) -> bytes\n\
+bytes(string, encoding[, errors]) -> bytes\n\
+bytes(bytes_or_buffer) -> immutable copy of bytes_or_buffer\n\
+bytes(int) -> bytes object of size given by the parameter initialized with null bytes\n\
+bytes() -> empty bytes object\n\
+\n\
+Construct an immutable array of bytes from:\n\
+  - an iterable yielding integers in range(256)\n\
+  - a text string encoded using the specified encoding\n\
+  - any object implementing the buffer API.\n\
+  - an integer");
+
+static PyObject *bytes_iter(PyObject *seq);
+
+PyTypeObject PyBytes_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "bytes",
+    PyBytesObject_SIZE,
+    sizeof(char),
+    bytes_dealloc,                      /* tp_dealloc */
+    0,                                          /* tp_print */
+    0,                                          /* tp_getattr */
+    0,                                          /* tp_setattr */
+    0,                                          /* tp_reserved */
+    (reprfunc)bytes_repr,                       /* tp_repr */
+    &bytes_as_number,                           /* tp_as_number */
+    &bytes_as_sequence,                         /* tp_as_sequence */
+    &bytes_as_mapping,                          /* tp_as_mapping */
+    (hashfunc)bytes_hash,                       /* tp_hash */
+    0,                                          /* tp_call */
+    bytes_str,                                  /* tp_str */
+    PyObject_GenericGetAttr,                    /* tp_getattro */
+    0,                                          /* tp_setattro */
+    &bytes_as_buffer,                           /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
+        Py_TPFLAGS_BYTES_SUBCLASS,              /* tp_flags */
+    bytes_doc,                                  /* tp_doc */
+    0,                                          /* tp_traverse */
+    0,                                          /* tp_clear */
+    (richcmpfunc)bytes_richcompare,             /* tp_richcompare */
+    0,                                          /* tp_weaklistoffset */
+    bytes_iter,                                 /* tp_iter */
+    0,                                          /* tp_iternext */
+    bytes_methods,                              /* tp_methods */
+    0,                                          /* tp_members */
+    0,                                          /* tp_getset */
+    &PyBaseObject_Type,                         /* tp_base */
+    0,                                          /* tp_dict */
+    0,                                          /* tp_descr_get */
+    0,                                          /* tp_descr_set */
+    0,                                          /* tp_dictoffset */
+    0,                                          /* tp_init */
+    0,                                          /* tp_alloc */
+    bytes_new,                                  /* tp_new */
+    PyObject_Del,                               /* tp_free */
+};
+
+void
+PyBytes_Concat(PyObject **pv, PyObject *w)
+{
+    assert(pv != NULL);
+    if (*pv == NULL)
+        return;
+    if (w == NULL) {
+        Py_CLEAR(*pv);
+        return;
+    }
+
+    if (Py_REFCNT(*pv) == 1 && PyBytes_CheckExact(*pv)) {
+        /* Only one reference, so we can resize in place */
+        Py_ssize_t oldsize;
+        Py_buffer wb;
+
+        wb.len = -1;
+        if (PyObject_GetBuffer(w, &wb, PyBUF_SIMPLE) != 0) {
+            PyErr_Format(PyExc_TypeError, "can't concat %.100s to %.100s",
+                         Py_TYPE(w)->tp_name, Py_TYPE(*pv)->tp_name);
+            Py_CLEAR(*pv);
+            return;
+        }
+
+        oldsize = PyBytes_GET_SIZE(*pv);
+        if (oldsize > PY_SSIZE_T_MAX - wb.len) {
+            PyErr_NoMemory();
+            goto error;
+        }
+        if (_PyBytes_Resize(pv, oldsize + wb.len) < 0)
+            goto error;
+
+        memcpy(PyBytes_AS_STRING(*pv) + oldsize, wb.buf, wb.len);
+        PyBuffer_Release(&wb);
+        return;
+
+      error:
+        PyBuffer_Release(&wb);
+        Py_CLEAR(*pv);
+        return;
+    }
+
+    else {
+        /* Multiple references, need to create new object */
+        PyObject *v;
+        v = bytes_concat(*pv, w);
+        Py_SETREF(*pv, v);
+    }
+}
+
+void
+PyBytes_ConcatAndDel(PyObject **pv, PyObject *w)
+{
+    PyBytes_Concat(pv, w);
+    Py_XDECREF(w);
+}
+
+
+/* The following function breaks the notion that bytes are immutable:
+   it changes the size of a bytes object.  We get away with this only if there
+   is only one module referencing the object.  You can also think of it
+   as creating a new bytes object and destroying the old one, only
+   more efficiently.  In any case, don't use this if the bytes object may
+   already be known to some other part of the code...
+   Note that if there's not enough memory to resize the bytes object, the
+   original bytes object at *pv is deallocated, *pv is set to NULL, an "out of
+   memory" exception is set, and -1 is returned.  Else (on success) 0 is
+   returned, and the value in *pv may or may not be the same as on input.
+   As always, an extra byte is allocated for a trailing \0 byte (newsize
+   does *not* include that), and a trailing \0 byte is stored.
+*/
+
+int
+_PyBytes_Resize(PyObject **pv, Py_ssize_t newsize)
+{
+    PyObject *v;
+    PyBytesObject *sv;
+    v = *pv;
+    if (!PyBytes_Check(v) || newsize < 0) {
+        goto error;
+    }
+    if (Py_SIZE(v) == newsize) {
+        /* return early if newsize equals to v->ob_size */
+        return 0;
+    }
+    if (Py_REFCNT(v) != 1) {
+        goto error;
+    }
+    /* XXX UNREF/NEWREF interface should be more symmetrical */
+    _Py_DEC_REFTOTAL;
+    _Py_ForgetReference(v);
+    *pv = (PyObject *)
+        PyObject_REALLOC(v, PyBytesObject_SIZE + newsize);
+    if (*pv == NULL) {
+        PyObject_Del(v);
+        PyErr_NoMemory();
+        return -1;
+    }
+    _Py_NewReference(*pv);
+    sv = (PyBytesObject *) *pv;
+    Py_SIZE(sv) = newsize;
+    sv->ob_sval[newsize] = '\0';
+    sv->ob_shash = -1;          /* invalidate cached hash value */
+    return 0;
+error:
+    *pv = 0;
+    Py_DECREF(v);
+    PyErr_BadInternalCall();
+    return -1;
+}
+
+void
+PyBytes_Fini(void)
+{
+    int i;
+    for (i = 0; i < UCHAR_MAX + 1; i++)
+        Py_CLEAR(characters[i]);
+    Py_CLEAR(nullstring);
+}
+
+/*********************** Bytes Iterator ****************************/
+
+typedef struct {
+    PyObject_HEAD
+    Py_ssize_t it_index;
+    PyBytesObject *it_seq; /* Set to NULL when iterator is exhausted */
+} striterobject;
+
+static void
+striter_dealloc(striterobject *it)
+{
+    _PyObject_GC_UNTRACK(it);
+    Py_XDECREF(it->it_seq);
+    PyObject_GC_Del(it);
+}
+
+static int
+striter_traverse(striterobject *it, visitproc visit, void *arg)
+{
+    Py_VISIT(it->it_seq);
+    return 0;
+}
+
+static PyObject *
+striter_next(striterobject *it)
+{
+    PyBytesObject *seq;
+    PyObject *item;
+
+    assert(it != NULL);
+    seq = it->it_seq;
+    if (seq == NULL)
+        return NULL;
+    assert(PyBytes_Check(seq));
+
+    if (it->it_index < PyBytes_GET_SIZE(seq)) {
+        item = PyLong_FromLong(
+            (unsigned char)seq->ob_sval[it->it_index]);
+        if (item != NULL)
+            ++it->it_index;
+        return item;
+    }
+
+    it->it_seq = NULL;
+    Py_DECREF(seq);
+    return NULL;
+}
+
+static PyObject *
+striter_len(striterobject *it)
+{
+    Py_ssize_t len = 0;
+    if (it->it_seq)
+        len = PyBytes_GET_SIZE(it->it_seq) - it->it_index;
+    return PyLong_FromSsize_t(len);
+}
+
+PyDoc_STRVAR(length_hint_doc,
+             "Private method returning an estimate of len(list(it)).");
+
+static PyObject *
+striter_reduce(striterobject *it)
+{
+    if (it->it_seq != NULL) {
+        return Py_BuildValue("N(O)n", _PyObject_GetBuiltin("iter"),
+                             it->it_seq, it->it_index);
+    } else {
+        return Py_BuildValue("N(())", _PyObject_GetBuiltin("iter"));
+    }
+}
+
+PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
+
+static PyObject *
+striter_setstate(striterobject *it, PyObject *state)
+{
+    Py_ssize_t index = PyLong_AsSsize_t(state);
+    if (index == -1 && PyErr_Occurred())
+        return NULL;
+    if (it->it_seq != NULL) {
+        if (index < 0)
+            index = 0;
+        else if (index > PyBytes_GET_SIZE(it->it_seq))
+            index = PyBytes_GET_SIZE(it->it_seq); /* iterator exhausted */
+        it->it_index = index;
+    }
+    Py_RETURN_NONE;
+}
+
+PyDoc_STRVAR(setstate_doc, "Set state information for unpickling.");
+
+static PyMethodDef striter_methods[] = {
+    {"__length_hint__", (PyCFunction)striter_len, METH_NOARGS,
+     length_hint_doc},
+    {"__reduce__",      (PyCFunction)striter_reduce, METH_NOARGS,
+     reduce_doc},
+    {"__setstate__",    (PyCFunction)striter_setstate, METH_O,
+     setstate_doc},
+    {NULL,              NULL}           /* sentinel */
+};
+
+PyTypeObject PyBytesIter_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "bytes_iterator",                           /* tp_name */
+    sizeof(striterobject),                      /* tp_basicsize */
+    0,                                          /* tp_itemsize */
+    /* methods */
+    (destructor)striter_dealloc,                /* tp_dealloc */
+    0,                                          /* tp_print */
+    0,                                          /* tp_getattr */
+    0,                                          /* tp_setattr */
+    0,                                          /* tp_reserved */
+    0,                                          /* tp_repr */
+    0,                                          /* tp_as_number */
+    0,                                          /* tp_as_sequence */
+    0,                                          /* tp_as_mapping */
+    0,                                          /* tp_hash */
+    0,                                          /* tp_call */
+    0,                                          /* tp_str */
+    PyObject_GenericGetAttr,                    /* tp_getattro */
+    0,                                          /* tp_setattro */
+    0,                                          /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
+    0,                                          /* tp_doc */
+    (traverseproc)striter_traverse,     /* tp_traverse */
+    0,                                          /* tp_clear */
+    0,                                          /* tp_richcompare */
+    0,                                          /* tp_weaklistoffset */
+    PyObject_SelfIter,                          /* tp_iter */
+    (iternextfunc)striter_next,                 /* tp_iternext */
+    striter_methods,                            /* tp_methods */
+    0,
+};
+
+static PyObject *
+bytes_iter(PyObject *seq)
+{
+    striterobject *it;
+
+    if (!PyBytes_Check(seq)) {
+        PyErr_BadInternalCall();
+        return NULL;
+    }
+    it = PyObject_GC_New(striterobject, &PyBytesIter_Type);
+    if (it == NULL)
+        return NULL;
+    it->it_index = 0;
+    Py_INCREF(seq);
+    it->it_seq = (PyBytesObject *)seq;
+    _PyObject_GC_TRACK(it);
+    return (PyObject *)it;
+}
+
+
+/* _PyBytesWriter API */
+
+#ifdef MS_WINDOWS
+   /* On Windows, overallocate by 50% is the best factor */
+#  define OVERALLOCATE_FACTOR 2
+#else
+   /* On Linux, overallocate by 25% is the best factor */
+#  define OVERALLOCATE_FACTOR 4
+#endif
+
+void
+_PyBytesWriter_Init(_PyBytesWriter *writer)
+{
+    /* Set all attributes before small_buffer to 0 */
+    memset(writer, 0, offsetof(_PyBytesWriter, small_buffer));
+#ifdef Py_DEBUG
+    memset(writer->small_buffer, 0xCB, sizeof(writer->small_buffer));
+#endif
+}
+
+void
+_PyBytesWriter_Dealloc(_PyBytesWriter *writer)
+{
+    Py_CLEAR(writer->buffer);
+}
+
+Py_LOCAL_INLINE(char*)
+_PyBytesWriter_AsString(_PyBytesWriter *writer)
+{
+    if (writer->use_small_buffer) {
+        assert(writer->buffer == NULL);
+        return writer->small_buffer;
+    }
+    else if (writer->use_bytearray) {
+        assert(writer->buffer != NULL);
+        return PyByteArray_AS_STRING(writer->buffer);
+    }
+    else {
+        assert(writer->buffer != NULL);
+        return PyBytes_AS_STRING(writer->buffer);
+    }
+}
+
+Py_LOCAL_INLINE(Py_ssize_t)
+_PyBytesWriter_GetSize(_PyBytesWriter *writer, char *str)
+{
+    char *start = _PyBytesWriter_AsString(writer);
+    assert(str != NULL);
+    assert(str >= start);
+    assert(str - start <= writer->allocated);
+    return str - start;
+}
+
+Py_LOCAL_INLINE(void)
+_PyBytesWriter_CheckConsistency(_PyBytesWriter *writer, char *str)
+{
+#ifdef Py_DEBUG
+    char *start, *end;
+
+    if (writer->use_small_buffer) {
+        assert(writer->buffer == NULL);
+    }
+    else {
+        assert(writer->buffer != NULL);
+        if (writer->use_bytearray)
+            assert(PyByteArray_CheckExact(writer->buffer));
+        else
+            assert(PyBytes_CheckExact(writer->buffer));
+        assert(Py_REFCNT(writer->buffer) == 1);
+    }
+
+    if (writer->use_bytearray) {
+        /* bytearray has its own overallocation algorithm,
+           writer overallocation must be disabled */
+        assert(!writer->overallocate);
+    }
+
+    assert(0 <= writer->allocated);
+    assert(0 <= writer->min_size && writer->min_size <= writer->allocated);
+    /* the last byte must always be null */
+    start = _PyBytesWriter_AsString(writer);
+    assert(start[writer->allocated] == 0);
+
+    end = start + writer->allocated;
+    assert(str != NULL);
+    assert(start <= str && str <= end);
+#endif
+}
+
+void*
+_PyBytesWriter_Resize(_PyBytesWriter *writer, void *str, Py_ssize_t size)
+{
+    Py_ssize_t allocated, pos;
+
+    _PyBytesWriter_CheckConsistency(writer, str);
+    assert(writer->allocated < size);
+
+    allocated = size;
+    if (writer->overallocate
+        && allocated <= (PY_SSIZE_T_MAX - allocated / OVERALLOCATE_FACTOR)) {
+        /* overallocate to limit the number of realloc() */
+        allocated += allocated / OVERALLOCATE_FACTOR;
+    }
+
+    pos = _PyBytesWriter_GetSize(writer, str);
+    if (!writer->use_small_buffer) {
+        if (writer->use_bytearray) {
+            if (PyByteArray_Resize(writer->buffer, allocated))
+                goto error;
+            /* writer->allocated can be smaller than writer->buffer->ob_alloc,
+               but we cannot use ob_alloc because bytes may need to be moved
+               to use the whole buffer. bytearray uses an internal optimization
+               to avoid moving or copying bytes when bytes are removed at the
+               beginning (ex: del bytearray[:1]). */
+        }
+        else {
+            if (_PyBytes_Resize(&writer->buffer, allocated))
+                goto error;
+        }
+    }
+    else {
+        /* convert from stack buffer to bytes object buffer */
+        assert(writer->buffer == NULL);
+
+        if (writer->use_bytearray)
+            writer->buffer = PyByteArray_FromStringAndSize(NULL, allocated);
+        else
+            writer->buffer = PyBytes_FromStringAndSize(NULL, allocated);
+        if (writer->buffer == NULL)
+            goto error;
+
+        if (pos != 0) {
+            char *dest;
+            if (writer->use_bytearray)
+                dest = PyByteArray_AS_STRING(writer->buffer);
+            else
+                dest = PyBytes_AS_STRING(writer->buffer);
+            memcpy(dest,
+                      writer->small_buffer,
+                      pos);
+        }
+
+        writer->use_small_buffer = 0;
+#ifdef Py_DEBUG
+        memset(writer->small_buffer, 0xDB, sizeof(writer->small_buffer));
+#endif
+    }
+    writer->allocated = allocated;
+
+    str = _PyBytesWriter_AsString(writer) + pos;
+    _PyBytesWriter_CheckConsistency(writer, str);
+    return str;
+
+error:
+    _PyBytesWriter_Dealloc(writer);
+    return NULL;
+}
+
+void*
+_PyBytesWriter_Prepare(_PyBytesWriter *writer, void *str, Py_ssize_t size)
+{
+    Py_ssize_t new_min_size;
+
+    _PyBytesWriter_CheckConsistency(writer, str);
+    assert(size >= 0);
+
+    if (size == 0) {
+        /* nothing to do */
+        return str;
+    }
+
+    if (writer->min_size > PY_SSIZE_T_MAX - size) {
+        PyErr_NoMemory();
+        _PyBytesWriter_Dealloc(writer);
+        return NULL;
+    }
+    new_min_size = writer->min_size + size;
+
+    if (new_min_size > writer->allocated)
+        str = _PyBytesWriter_Resize(writer, str, new_min_size);
+
+    writer->min_size = new_min_size;
+    return str;
+}
+
+/* Allocate the buffer to write size bytes.
+   Return the pointer to the beginning of buffer data.
+   Raise an exception and return NULL on error. */
+void*
+_PyBytesWriter_Alloc(_PyBytesWriter *writer, Py_ssize_t size)
+{
+    /* ensure that _PyBytesWriter_Alloc() is only called once */
+    assert(writer->min_size == 0 && writer->buffer == NULL);
+    assert(size >= 0);
+
+    writer->use_small_buffer = 1;
+#ifdef Py_DEBUG
+    writer->allocated = sizeof(writer->small_buffer) - 1;
+    /* In debug mode, don't use the full small buffer because it is less
+       efficient than bytes and bytearray objects to detect buffer underflow
+       and buffer overflow. Use 10 bytes of the small buffer to test also
+       code using the smaller buffer in debug mode.
+
+       Don't modify the _PyBytesWriter structure (use a shorter small buffer)
+       in debug mode to also be able to detect stack overflow when running
+       tests in debug mode. The _PyBytesWriter is large (more than 512 bytes),
+       if Py_EnterRecursiveCall() is not used in deep C callback, we may hit a
+       stack overflow. */
+    writer->allocated = Py_MIN(writer->allocated, 10);
+    /* _PyBytesWriter_CheckConsistency() requires the last byte to be 0,
+       to detect buffer overflow */
+    writer->small_buffer[writer->allocated] = 0;
+#else
+    writer->allocated = sizeof(writer->small_buffer);
+#endif
+    return _PyBytesWriter_Prepare(writer, writer->small_buffer, size);
+}
+
+PyObject *
+_PyBytesWriter_Finish(_PyBytesWriter *writer, void *str)
+{
+    Py_ssize_t size;
+    PyObject *result;
+
+    _PyBytesWriter_CheckConsistency(writer, str);
+
+    size = _PyBytesWriter_GetSize(writer, str);
+    if (size == 0 && !writer->use_bytearray) {
+        Py_CLEAR(writer->buffer);
+        /* Get the empty byte string singleton */
+        result = PyBytes_FromStringAndSize(NULL, 0);
+    }
+    else if (writer->use_small_buffer) {
+        if (writer->use_bytearray) {
+            result = PyByteArray_FromStringAndSize(writer->small_buffer, size);
+        }
+        else {
+            result = PyBytes_FromStringAndSize(writer->small_buffer, size);
+        }
+    }
+    else {
+        result = writer->buffer;
+        writer->buffer = NULL;
+
+        if (size != writer->allocated) {
+            if (writer->use_bytearray) {
+                if (PyByteArray_Resize(result, size)) {
+                    Py_DECREF(result);
+                    return NULL;
+                }
+            }
+            else {
+                if (_PyBytes_Resize(&result, size)) {
+                    assert(result == NULL);
+                    return NULL;
+                }
+            }
+        }
+    }
+    return result;
+}
+
+void*
+_PyBytesWriter_WriteBytes(_PyBytesWriter *writer, void *ptr,
+                          const void *bytes, Py_ssize_t size)
+{
+    char *str = (char *)ptr;
+
+    str = _PyBytesWriter_Prepare(writer, str, size);
+    if (str == NULL)
+        return NULL;
+
+    memcpy(str, bytes, size);
+    str += size;
+
+    return str;
+}


From solipsis at pitrou.net  Mon Oct 30 05:07:40 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 30 Oct 2017 09:07:40 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=10
Message-ID: <20171030090738.101956.820C1CBDB7109F4F@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, 0, -2] memory blocks, sum=-2


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

From webhook-mailer at python.org  Mon Oct 30 09:43:09 2017
From: webhook-mailer at python.org (Yury Selivanov)
Date: Mon, 30 Oct 2017 13:43:09 -0000
Subject: [Python-checkins] bpo-31245: Asyncio unix socket datagram (#3164)
Message-ID: <mailman.21.1509370992.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/fe4ea9cf1ee04f5a60e4ed928d8624b95b031e18
commit: fe4ea9cf1ee04f5a60e4ed928d8624b95b031e18
branch: master
author: Quentin Dawans <github at ovv.wtf>
committer: Yury Selivanov <yury at magic.io>
date: 2017-10-30T09:43:02-04:00
summary:

bpo-31245: Asyncio unix socket datagram (#3164)

files:
A Misc/NEWS.d/next/Library/2017-08-22-11-05-35.bpo-31245.AniZuz.rst
M Doc/library/asyncio-eventloop.rst
M Lib/asyncio/base_events.py
M Lib/asyncio/events.py
M Lib/test/test_asyncio/test_base_events.py

diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
index ade37390c63..9bc7a40fc71 100644
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -341,9 +341,10 @@ Creating connections
 
 .. coroutinemethod:: AbstractEventLoop.create_datagram_endpoint(protocol_factory, local_addr=None, remote_addr=None, \*, family=0, proto=0, flags=0, reuse_address=None, reuse_port=None, allow_broadcast=None, sock=None)
 
-   Create datagram connection: socket family :py:data:`~socket.AF_INET` or
-   :py:data:`~socket.AF_INET6` depending on *host* (or *family* if specified),
-   socket type :py:data:`~socket.SOCK_DGRAM`. *protocol_factory* must be a
+   Create datagram connection: socket family :py:data:`~socket.AF_INET`,
+   :py:data:`~socket.AF_INET6` or :py:data:`~socket.AF_UNIX` depending on
+   *host* (or *family* if specified), socket type
+   :py:data:`~socket.SOCK_DGRAM`. *protocol_factory* must be a
    callable returning a :ref:`protocol <asyncio-protocol>` instance.
 
    This method is a :ref:`coroutine <coroutine>` which will try to
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index 33b8f4887c6..2a5a4f98952 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -859,6 +859,12 @@ def create_datagram_endpoint(self, protocol_factory,
                 if family == 0:
                     raise ValueError('unexpected address family')
                 addr_pairs_info = (((family, proto), (None, None)),)
+            elif hasattr(socket, 'AF_UNIX') and family == socket.AF_UNIX:
+                for addr in (local_addr, remote_addr):
+                    if addr is not None and not isistance(addr, str):
+                        raise TypeError('string is expected')
+                addr_pairs_info = (((family, proto),
+                                    (local_addr, remote_addr)), )
             else:
                 # join address by (family, protocol)
                 addr_infos = collections.OrderedDict()
diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py
index 0dbd92cf3a3..c2663c5062d 100644
--- a/Lib/asyncio/events.py
+++ b/Lib/asyncio/events.py
@@ -378,8 +378,8 @@ def create_datagram_endpoint(self, protocol_factory,
 
         protocol_factory must be a callable returning a protocol instance.
 
-        socket family AF_INET or socket.AF_INET6 depending on host (or
-        family if specified), socket type SOCK_DGRAM.
+        socket family AF_INET, socket.AF_INET6 or socket.AF_UNIX depending on
+        host (or family if specified), socket type SOCK_DGRAM.
 
         reuse_address tells the kernel to reuse a local socket in
         TIME_WAIT state, without waiting for its natural timeout to
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index 3f1ec651742..a0ce9fa55e0 100644
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -1528,6 +1528,17 @@ def test_create_datagram_endpoint_sock(self):
         self.loop.run_until_complete(protocol.done)
         self.assertEqual('CLOSED', protocol.state)
 
+    @unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')
+    def test_create_datagram_endpoint_sock_unix(self):
+        fut = self.loop.create_datagram_endpoint(
+            lambda: MyDatagramProto(create_future=True, loop=self.loop),
+            family=socket.AF_UNIX)
+        transport, protocol = self.loop.run_until_complete(fut)
+        assert transport._sock.family == socket.AF_UNIX
+        transport.close()
+        self.loop.run_until_complete(protocol.done)
+        self.assertEqual('CLOSED', protocol.state)
+
     def test_create_datagram_endpoint_sock_sockopts(self):
         class FakeSock:
             type = socket.SOCK_DGRAM
diff --git a/Misc/NEWS.d/next/Library/2017-08-22-11-05-35.bpo-31245.AniZuz.rst b/Misc/NEWS.d/next/Library/2017-08-22-11-05-35.bpo-31245.AniZuz.rst
new file mode 100644
index 00000000000..ce495ea0ba3
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-08-22-11-05-35.bpo-31245.AniZuz.rst
@@ -0,0 +1 @@
+Added support for AF_UNIX socket in asyncio `create_datagram_endpoint`.


From webhook-mailer at python.org  Mon Oct 30 14:39:32 2017
From: webhook-mailer at python.org (Mariatta)
Date: Mon, 30 Oct 2017 18:39:32 -0000
Subject: [Python-checkins] bpo-31304: Update starmap_async documentation.
 (GH-4168)
Message-ID: <mailman.22.1509388775.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/11225753a89c2907bb717e6c050fe907e5e11829
commit: 11225753a89c2907bb717e6c050fe907e5e11829
branch: master
author: Pablo Galindo <Pablogsal at gmail.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-10-30T11:39:28-07:00
summary:

bpo-31304: Update starmap_async documentation. (GH-4168)

Update the kwarg in the documentation of `multiprocessing.pool.Pool.starmap_async`, from `error_back` to `error_callback` to match the source code..

files:
M Doc/library/multiprocessing.rst

diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 8d6d8707a0e..5fff93d1cd9 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -2181,7 +2181,7 @@ with the :class:`Pool` class.
 
       .. versionadded:: 3.3
 
-   .. method:: starmap_async(func, iterable[, chunksize[, callback[, error_back]]])
+   .. method:: starmap_async(func, iterable[, chunksize[, callback[, error_callback]]])
 
       A combination of :meth:`starmap` and :meth:`map_async` that iterates over
       *iterable* of iterables and calls *func* with the iterables unpacked.


From webhook-mailer at python.org  Mon Oct 30 14:47:42 2017
From: webhook-mailer at python.org (Mariatta)
Date: Mon, 30 Oct 2017 18:47:42 -0000
Subject: [Python-checkins] bpo-31304: Update starmap_async documentation.
 (GH-4168) (GH-4177)
Message-ID: <mailman.23.1509389265.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/2702380870b63ebe0161dfa29a2d0a3de02401b4
commit: 2702380870b63ebe0161dfa29a2d0a3de02401b4
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-10-30T11:47:39-07:00
summary:

bpo-31304: Update starmap_async documentation. (GH-4168) (GH-4177)

Update the kwarg in the documentation of `multiprocessing.pool.Pool.starmap_async`, from `error_back` to `error_callback` to match the source code.
(cherry picked from commit 11225753a89c2907bb717e6c050fe907e5e11829)

files:
M Doc/library/multiprocessing.rst

diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 2f770b63223..2a52af1c897 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -2165,7 +2165,7 @@ with the :class:`Pool` class.
 
       .. versionadded:: 3.3
 
-   .. method:: starmap_async(func, iterable[, chunksize[, callback[, error_back]]])
+   .. method:: starmap_async(func, iterable[, chunksize[, callback[, error_callback]]])
 
       A combination of :meth:`starmap` and :meth:`map_async` that iterates over
       *iterable* of iterables and calls *func* with the iterables unpacked.


From lp_benchmark_robot at intel.com  Mon Oct 30 20:13:52 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Mon, 30 Oct 2017 17:13:52 -0700
Subject: [Python-checkins] [3 up,
 62 flat] Results for Python (master branch) 2017-10-30
Message-ID: <f48863f4-ae97-4879-9139-da9694b619bf@orsmsx155.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-30 03:02:59-07:00.
  - commit:		a231428
  - previous commit:	63ae044
  - revision date:	2017-10-29 02:11:54+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.216% |  -0.143%   |  +4.532%   |  +8.024%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.332% |  -3.711%   |  +22.634%  |  +9.446%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 1.413% |  -2.690%   |  +23.611%  |  +8.241%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 0.970% |  -3.037%   |  +22.301%  |  +9.351%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 5.009% |  +0.377%   |  +7.638%   |  +5.872%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.553% |  -0.076%   |  +11.409%  |  +8.355%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 0.614% |  -0.437%   |  +7.812%   |  +10.690%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.525% |  +0.366%   |  +3.822%   |  +4.793%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.138% |  +1.857%   |  +7.044%   |  +18.088%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 5.705% |  -0.617%   |  +8.370%   |  +14.395%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.248% |  -1.555%   |  +3.313%   |  +8.209%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.464% |  -1.899%   |  +3.739%   |  +6.077%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 1.247% |  +0.249%   |  +3.218%   |  +7.119%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 0.971% |  -0.052%   |  +13.339%  |  +7.247%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.745% |  -1.755%   |  +8.388%   |  +9.292%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 0.734% |  -0.906%   |  +5.079%   |  +12.780%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.647% |  -0.308%   |  +9.719%   |  +11.490%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 2.860% |  -0.995%   |  +8.047%   |  +9.721%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.599% |  -0.252%   |  +3.031%   |  +9.001%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 1.936% |  +3.063%   |  -0.290%   |  +12.738%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.387% |  -1.946%   |  +7.939%   |  +11.810%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.886% |  +0.722%   |  +47.366%  |  +11.736%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.845% |  -1.281%   |  +8.717%   |  +13.175%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.331% |  -1.496%   |  +17.265%  |  +11.977%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 2.255% |  -0.762%   |  +9.234%   |  +9.739%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 2.034% |  -1.048%   |  +2.806%   |  +6.302%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.486% |  +1.665%   |  -0.222%   |  +1.781%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 1.883% |  -0.573%   |  +6.565%   |  +8.060%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.310% |  -0.878%   |  +6.884%   |  +6.695%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.353% |  -0.097%   |  -1.076%   |  +23.857%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 0.284% |  -1.489%   |  +1.667%   |  +21.993%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.861% |  +0.189%   |  +4.812%   |  +18.610%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 4.984% |  +0.343%   |  +10.320%  |  +9.706%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.176% |  -0.307%   |  +0.170%   |  +10.128%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.129% |  -0.268%   |  +11.218%  |  +5.080%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.090% |  -0.137%   |  +2.546%   |  +5.009%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.417% |  -0.764%   |  +9.288%   |  +13.862%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 4.748% |  -2.967%   |  -1.631%   |  +9.285%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 0.662% |  +0.018%   |  -1.461%   |  +10.261%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.393% |  +2.327%   |  -2.411%   |  +1.145%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 2.081% |  -0.120%   |  +6.163%   |  +5.534%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.076% |  -0.180%   |  +7.348%   |  +15.412%  |
+-----+------------------------+--------+------------+------------+------------+
| :-) |             scimark_fft| 0.530% |  +1.957%   |  +2.781%   |  -0.236%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.430% |  +0.278%   |  +28.029%  |  +6.394%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 2.612% |  -0.994%   |  +4.215%   |  +6.697%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.724% |  +0.889%   |  +15.490%  |  +7.509%   |
+-----+------------------------+--------+------------+------------+------------+
| :-) | scimark_sparse_mat_mult| 0.687% |  +3.874%   |  +4.147%   |  -8.796%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.532% |  -0.772%   |  +6.939%   |  +2.360%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.192% |  +0.116%   |  +6.586%   |  +6.997%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 3.400% |  -0.574%   |  +5.978%   |  +4.301%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 3.333% |  -1.624%   |  +18.549%  |  +8.825%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.664% |  -0.165%   |  +10.824%  |  +8.065%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 1.594% |  +0.410%   |  +9.474%   |  +5.658%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 3.924% |  +0.664%   |  +10.755%  |  +8.799%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.367% |  -0.060%   |  +10.499%  |  +8.875%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 3.716% |  +1.586%   |  +23.128%  |  +10.166%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.238% |  -0.554%   |  +5.518%   |  +6.833%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 0.821% |  +0.331%   |  +2.366%   |  -0.117%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle|10.152% |  -5.219%   |  +6.130%   |  +20.814%  |
+-----+------------------------+--------+------------+------------+------------+
| :-) |           unpickle_list| 0.372% |  +2.669%   |  +5.070%   |  +12.327%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 4.507% |  -1.637%   |  +6.443%   |  +6.838%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 0.951% |  +0.579%   |  +6.536%   |  +6.843%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.351% |  -0.641%   |  +3.023%   |  +7.550%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 2.732% |  -0.783%   |  -5.769%   |  +11.875%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.131% |  +0.584%   |  +7.728%   |  +7.594%   |
+-----+------------------------+--------+------------+------------+------------+

* Relative Standard Deviation (Standard Deviation/Average)

If this is not displayed properly please visit our results page here:
http://languagesperformance.intel.com/3-up-62-flat-results-for-python-master-branch-2017-10-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  Mon Oct 30 20:46:39 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 31 Oct 2017 00:46:39 -0000
Subject: [Python-checkins] [3.6] bpo-31852: Fix segfault caused by using the
 async soft keyword (GH-4122)
Message-ID: <mailman.24.1509410803.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/690c36f2f1085145d364a89bfed5944dd2470308
commit: 690c36f2f1085145d364a89bfed5944dd2470308
branch: 3.6
author: Pablo Galindo <Pablogsal at gmail.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-10-30T17:46:34-07:00
summary:

[3.6] bpo-31852: Fix segfault caused by using the async soft keyword (GH-4122)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-27-19-18-44.bpo-31852.P_4cVr.rst
M Lib/test/test_tokenize.py
M Parser/tokenizer.c

diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 10e0ad80779..ef02342244c 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -632,6 +632,11 @@ def test_async(self):
     NUMBER     '1'           (1, 8) (1, 9)
     """)
 
+        self.check_tokenize("async\\", """\
+    ERRORTOKEN '\\\\'          (1, 5) (1, 6)
+    NAME       'async'       (1, 0) (1, 5)
+    """)
+
         self.check_tokenize("a = (async = 1)", """\
     NAME       'a'           (1, 0) (1, 1)
     OP         '='           (1, 2) (1, 3)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-27-19-18-44.bpo-31852.P_4cVr.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-27-19-18-44.bpo-31852.P_4cVr.rst
new file mode 100644
index 00000000000..d72f41b1df0
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-27-19-18-44.bpo-31852.P_4cVr.rst	
@@ -0,0 +1,2 @@
+Fix a segmentation fault caused by a combination of the async soft keyword
+and continuation lines.
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index ff65f2a7359..ab72f6145f2 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -1563,6 +1563,9 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end)
                 /* The current token is 'async'.
                    Look ahead one token.*/
 
+                int async_def_prev = tok->async_def;
+                tok->async_def = 2;
+
                 struct tok_state ahead_tok;
                 char *ahead_tok_start = NULL, *ahead_tok_end = NULL;
                 int ahead_tok_kind;
@@ -1581,6 +1584,9 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end)
                     tok->async_def = 1;
                     return ASYNC;
                 }
+                else{
+                    tok->async_def = async_def_prev;
+                }
             }
         }
 
@@ -1844,6 +1850,10 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end)
     /* Line continuation */
     if (c == '\\') {
         c = tok_nextc(tok);
+        if (tok->async_def == 2) {
+            tok->done = E_SYNTAX;
+            return ERRORTOKEN;
+        }
         if (c != '\n') {
             tok->done = E_LINECONT;
             tok->cur = tok->inp;


From webhook-mailer at python.org  Tue Oct 31 00:07:40 2017
From: webhook-mailer at python.org (Alex Gaynor)
Date: Tue, 31 Oct 2017 04:07:40 -0000
Subject: [Python-checkins] Remove tiny bit of deadcode from wsgiref.validate
 (#3996)
Message-ID: <mailman.25.1509422861.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/f0f62cc61ec8c6b7b70470beadbab64eb23e6a5d
commit: f0f62cc61ec8c6b7b70470beadbab64eb23e6a5d
branch: master
author: Alex Gaynor <alex.gaynor at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T00:07:36-04:00
summary:

Remove tiny bit of deadcode from wsgiref.validate (#3996)

files:
M Lib/wsgiref/validate.py

diff --git a/Lib/wsgiref/validate.py b/Lib/wsgiref/validate.py
index 6107dcd7a4d..1c00bde220e 100644
--- a/Lib/wsgiref/validate.py
+++ b/Lib/wsgiref/validate.py
@@ -390,7 +390,6 @@ def check_headers(headers):
     assert_(type(headers) is list,
         "Headers (%r) must be of type list: %r"
         % (headers, type(headers)))
-    header_names = {}
     for item in headers:
         assert_(type(item) is tuple,
             "Individual headers (%r) must be of type tuple: %r"
@@ -403,7 +402,6 @@ def check_headers(headers):
             "The Status header cannot be used; it conflicts with CGI "
             "script, and HTTP status is not given through headers "
             "(value: %r)." % value)
-        header_names[name.lower()] = None
         assert_('\n' not in name and ':' not in name,
             "Header names may not contain ':' or '\\n': %r" % name)
         assert_(header_re.search(name), "Bad header name: %r" % name)


From solipsis at pitrou.net  Tue Oct 31 05:07:57 2017
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 31 Oct 2017 09:07:57 +0000
Subject: [Python-checkins] Daily reference leaks (4243df51fe43): sum=-2
Message-ID: <20171031090756.51555.44BC66460EE63F34@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_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/reflogAkO9jf', '--timeout', '7200']

From webhook-mailer at python.org  Tue Oct 31 06:14:08 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 31 Oct 2017 10:14:08 -0000
Subject: [Python-checkins] bpo-31629: Add support.SaveSignals (#4183)
Message-ID: <mailman.26.1509444852.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/19f68301a1295a9c30d9f28b8f1479cdcccd75aa
commit: 19f68301a1295a9c30d9f28b8f1479cdcccd75aa
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T03:14:01-07:00
summary:

bpo-31629: Add support.SaveSignals (#4183)

test_curses now saves/restores signals. On FreeBSD, the curses module
sets handlers of some signals, but don't restore old handlers when
the module is deinitialized.

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

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 4f60507919f..adc4e864924 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -2755,3 +2755,42 @@ def fd_count():
                 msvcrt.CrtSetReportMode(report_type, old_modes[report_type])
 
     return count
+
+
+class SaveSignals:
+    """
+    Save an restore signal handlers.
+
+    This class is only able to save/restore signal handlers registered
+    by the Python signal module: see bpo-13285 for "external" signal
+    handlers.
+    """
+
+    def __init__(self):
+        import signal
+        self.signal = signal
+        self.signals = list(range(1, signal.NSIG))
+        # SIGKILL and SIGSTOP signals cannot be ignored nor catched
+        for signame in ('SIGKILL', 'SIGSTOP'):
+            try:
+                signum = getattr(signal, signame)
+            except AttributeError:
+                continue
+            self.signals.remove(signum)
+        self.handlers = {}
+
+    def save(self):
+        for signum in self.signals:
+            handler = self.signal.getsignal(signum)
+            if handler is None:
+                # getsignal() returns None if a signal handler was not
+                # registered by the Python signal module,
+                # and the handler is not SIG_DFL nor SIG_IGN.
+                #
+                # Ignore the signal: we cannot restore the handler.
+                continue
+            self.handlers[signum] = handler
+
+    def restore(self):
+        for signum, handler in self.handlers.items():
+            self.signal.signal(signum, handler)
diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index 0d0b160d764..b0a28908da7 100644
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -15,7 +15,7 @@
 import tempfile
 import unittest
 
-from test.support import requires, import_module, verbose
+from test.support import requires, import_module, verbose, SaveSignals
 
 # Optionally test curses module.  This currently requires that the
 # 'curses' resource be given on the regrtest command line using the -u
@@ -63,6 +63,8 @@ def tearDownClass(cls):
             del cls.tmp
 
     def setUp(self):
+        self.save_signals = SaveSignals()
+        self.save_signals.save()
         if verbose:
             # just to make the test output a little more readable
             print()
@@ -72,6 +74,7 @@ def setUp(self):
     def tearDown(self):
         curses.resetty()
         curses.endwin()
+        self.save_signals.restore()
 
     def test_window_funcs(self):
         "Test the methods of windows"


From webhook-mailer at python.org  Tue Oct 31 06:44:59 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 31 Oct 2017 10:44:59 -0000
Subject: [Python-checkins] bpo-31629: Add support.SaveSignals (#4183) (#4188)
Message-ID: <mailman.27.1509446703.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/1d481822a6295e6739da2d5cca0fdbede51fda22
commit: 1d481822a6295e6739da2d5cca0fdbede51fda22
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T03:44:55-07:00
summary:

bpo-31629: Add support.SaveSignals (#4183) (#4188)

test_curses now saves/restores signals. On FreeBSD, the curses module
sets handlers of some signals, but don't restore old handlers when
the module is deinitialized.

(cherry picked from commit 19f68301a1295a9c30d9f28b8f1479cdcccd75aa)

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

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index d14a6620b5d..cc594865ebb 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -1966,3 +1966,42 @@ def _crash_python():
     import _testcapi
     with SuppressCrashReport():
         _testcapi._read_null()
+
+
+class SaveSignals:
+    """
+    Save an restore signal handlers.
+
+    This class is only able to save/restore signal handlers registered
+    by the Python signal module: see bpo-13285 for "external" signal
+    handlers.
+    """
+
+    def __init__(self):
+        import signal
+        self.signal = signal
+        self.signals = list(range(1, signal.NSIG))
+        # SIGKILL and SIGSTOP signals cannot be ignored nor catched
+        for signame in ('SIGKILL', 'SIGSTOP'):
+            try:
+                signum = getattr(signal, signame)
+            except AttributeError:
+                continue
+            self.signals.remove(signum)
+        self.handlers = {}
+
+    def save(self):
+        for signum in self.signals:
+            handler = self.signal.getsignal(signum)
+            if handler is None:
+                # getsignal() returns None if a signal handler was not
+                # registered by the Python signal module,
+                # and the handler is not SIG_DFL nor SIG_IGN.
+                #
+                # Ignore the signal: we cannot restore the handler.
+                continue
+            self.handlers[signum] = handler
+
+    def restore(self):
+        for signum, handler in self.handlers.items():
+            self.signal.signal(signum, handler)
diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index 84b6bfddca5..743e56ec9cf 100644
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -15,7 +15,9 @@
 import tempfile
 import unittest
 
-from test.test_support import requires, import_module, verbose, run_unittest
+from test.support import (requires, import_module, verbose, run_unittest,
+                          SaveSignals)
+
 
 # Optionally test curses module.  This currently requires that the
 # 'curses' resource be given on the regrtest command line using the -u
@@ -62,6 +64,8 @@ def tearDownClass(cls):
             del cls.tmp
 
     def setUp(self):
+        self.save_signals = SaveSignals()
+        self.save_signals.save()
         if verbose:
             # just to make the test output a little more readable
             print('')
@@ -71,6 +75,7 @@ def setUp(self):
     def tearDown(self):
         curses.resetty()
         curses.endwin()
+        self.save_signals.restore()
 
     def test_window_funcs(self):
         "Test the methods of windows"


From webhook-mailer at python.org  Tue Oct 31 06:45:04 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 31 Oct 2017 10:45:04 -0000
Subject: [Python-checkins] bpo-31629: Add support.SaveSignals (#4183) (#4187)
Message-ID: <mailman.28.1509446707.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/41efc402f154e48e95dde2993901648edcb24069
commit: 41efc402f154e48e95dde2993901648edcb24069
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T03:45:01-07:00
summary:

bpo-31629: Add support.SaveSignals (#4183) (#4187)

test_curses now saves/restores signals. On FreeBSD, the curses module
sets handlers of some signals, but don't restore old handlers when
the module is deinitialized.

(cherry picked from commit 19f68301a1295a9c30d9f28b8f1479cdcccd75aa)

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

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index a5b8c46f949..c8feaa870b0 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -2621,3 +2621,42 @@ def disable_faulthandler():
     finally:
         if is_enabled:
             faulthandler.enable(file=fd, all_threads=True)
+
+
+class SaveSignals:
+    """
+    Save an restore signal handlers.
+
+    This class is only able to save/restore signal handlers registered
+    by the Python signal module: see bpo-13285 for "external" signal
+    handlers.
+    """
+
+    def __init__(self):
+        import signal
+        self.signal = signal
+        self.signals = list(range(1, signal.NSIG))
+        # SIGKILL and SIGSTOP signals cannot be ignored nor catched
+        for signame in ('SIGKILL', 'SIGSTOP'):
+            try:
+                signum = getattr(signal, signame)
+            except AttributeError:
+                continue
+            self.signals.remove(signum)
+        self.handlers = {}
+
+    def save(self):
+        for signum in self.signals:
+            handler = self.signal.getsignal(signum)
+            if handler is None:
+                # getsignal() returns None if a signal handler was not
+                # registered by the Python signal module,
+                # and the handler is not SIG_DFL nor SIG_IGN.
+                #
+                # Ignore the signal: we cannot restore the handler.
+                continue
+            self.handlers[signum] = handler
+
+    def restore(self):
+        for signum, handler in self.handlers.items():
+            self.signal.signal(signum, handler)
diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index 0d0b160d764..b0a28908da7 100644
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -15,7 +15,7 @@
 import tempfile
 import unittest
 
-from test.support import requires, import_module, verbose
+from test.support import requires, import_module, verbose, SaveSignals
 
 # Optionally test curses module.  This currently requires that the
 # 'curses' resource be given on the regrtest command line using the -u
@@ -63,6 +63,8 @@ def tearDownClass(cls):
             del cls.tmp
 
     def setUp(self):
+        self.save_signals = SaveSignals()
+        self.save_signals.save()
         if verbose:
             # just to make the test output a little more readable
             print()
@@ -72,6 +74,7 @@ def setUp(self):
     def tearDown(self):
         curses.resetty()
         curses.endwin()
+        self.save_signals.restore()
 
     def test_window_funcs(self):
         "Test the methods of windows"


From webhook-mailer at python.org  Tue Oct 31 07:56:47 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 31 Oct 2017 11:56:47 -0000
Subject: [Python-checkins] bpo-31891: Fix building the curses module on
 NetBSD. (#4165)
Message-ID: <mailman.29.1509451010.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/baac01e629d90f63dfde6b5cc433f4bc65c5feeb
commit: baac01e629d90f63dfde6b5cc433f4bc65c5feeb
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T13:56:44+02:00
summary:

bpo-31891: Fix building the curses module on NetBSD. (#4165)

files:
A Misc/NEWS.d/next/Library/2017-10-29-11-23-24.bpo-31891.9kAPha.rst
M Include/py_curses.h
M Lib/test/test_curses.py
M Modules/_cursesmodule.c
M configure
M configure.ac
M pyconfig.h.in

diff --git a/Include/py_curses.h b/Include/py_curses.h
index 336c95d360d..2e88112259a 100644
--- a/Include/py_curses.h
+++ b/Include/py_curses.h
@@ -7,7 +7,7 @@
 ** On Mac OS X 10.2 [n]curses.h and stdlib.h use different guards
 ** against multiple definition of wchar_t.
 */
-#ifdef	_BSD_WCHAR_T_DEFINED_
+#ifdef _BSD_WCHAR_T_DEFINED_
 #define _WCHAR_T
 #endif
 
@@ -22,7 +22,7 @@
 ** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards
 ** against multiple definition of wchar_t and wint_t.
 */
-#ifdef	_XOPEN_SOURCE_EXTENDED
+#ifdef _XOPEN_SOURCE_EXTENDED
 #ifndef __FreeBSD_version
 #include <osreldate.h>
 #endif
@@ -48,10 +48,6 @@
 #include <ncurses.h>
 #else
 #include <curses.h>
-#ifdef HAVE_TERM_H
-/* for tigetstr, which is not declared in SysV curses */
-#include <term.h>
-#endif
 #endif
 
 #ifdef HAVE_NCURSES_H
@@ -74,12 +70,12 @@ extern "C" {
 /* Type declarations */
 
 typedef struct {
-	PyObject_HEAD
-	WINDOW *win;
-	char *encoding;
+    PyObject_HEAD
+    WINDOW *win;
+    char *encoding;
 } PyCursesWindowObject;
 
-#define PyCursesWindow_Check(v)	 (Py_TYPE(v) == &PyCursesWindow_Type)
+#define PyCursesWindow_Check(v)  (Py_TYPE(v) == &PyCursesWindow_Type)
 
 #define PyCurses_CAPSULE_NAME "_curses._C_API"
 
diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index b0a28908da7..785a31c622b 100644
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -25,9 +25,12 @@
 
 # If either of these don't exist, skip the tests.
 curses = import_module('curses')
-import_module('curses.panel')
 import_module('curses.ascii')
 import_module('curses.textpad')
+try:
+    import curses.panel
+except ImportError:
+    pass
 
 def requires_curses_func(name):
     return unittest.skipUnless(hasattr(curses, name),
@@ -138,7 +141,8 @@ def test_window_funcs(self):
 
         stdscr.idcok(1)
         stdscr.idlok(1)
-        stdscr.immedok(1)
+        if hasattr(stdscr, 'immedok'):
+            stdscr.immedok(1)
         stdscr.insch('c')
         stdscr.insdelln(1)
         stdscr.insnstr('abc', 3)
@@ -172,7 +176,8 @@ def test_window_funcs(self):
         stdscr.setscrreg(10,15)
         win3 = stdscr.subwin(10,10)
         win3 = stdscr.subwin(10,10, 5,5)
-        stdscr.syncok(1)
+        if hasattr(stdscr, 'syncok'):
+            stdscr.syncok(1)
         stdscr.timeout(5)
         stdscr.touchline(5,5)
         stdscr.touchline(5,5,0)
@@ -211,15 +216,19 @@ def test_module_funcs(self):
         "Test module-level functions"
         for func in [curses.baudrate, curses.beep, curses.can_change_color,
                      curses.cbreak, curses.def_prog_mode, curses.doupdate,
-                     curses.filter, curses.flash, curses.flushinp,
+                     curses.flash, curses.flushinp,
                      curses.has_colors, curses.has_ic, curses.has_il,
                      curses.isendwin, curses.killchar, curses.longname,
                      curses.nocbreak, curses.noecho, curses.nonl,
                      curses.noqiflush, curses.noraw,
                      curses.reset_prog_mode, curses.termattrs,
-                     curses.termname, curses.erasechar, curses.getsyx]:
+                     curses.termname, curses.erasechar]:
             with self.subTest(func=func.__qualname__):
                 func()
+        if hasattr(curses, 'filter'):
+            curses.filter()
+        if hasattr(curses, 'getsyx'):
+            curses.getsyx()
 
         # Functions that actually need arguments
         if curses.tigetstr("cnorm"):
@@ -243,15 +252,18 @@ def test_module_funcs(self):
         curses.putp(b'abc')
         curses.qiflush()
         curses.raw() ; curses.raw(1)
-        curses.setsyx(5,5)
+        if hasattr(curses, 'setsyx'):
+            curses.setsyx(5,5)
         curses.tigetflag('hc')
         curses.tigetnum('co')
         curses.tigetstr('cr')
         curses.tparm(b'cr')
-        curses.typeahead(sys.__stdin__.fileno())
+        if hasattr(curses, 'typeahead'):
+            curses.typeahead(sys.__stdin__.fileno())
         curses.unctrl('a')
         curses.ungetch('a')
-        curses.use_env(1)
+        if hasattr(curses, 'use_env'):
+            curses.use_env(1)
 
     # Functions only available on a few platforms
     def test_colors_funcs(self):
@@ -285,6 +297,7 @@ def test_getmouse(self):
         curses.ungetmouse(0, 0, 0, 0, curses.BUTTON1_PRESSED)
         m = curses.getmouse()
 
+    @requires_curses_func('panel')
     def test_userptr_without_set(self):
         w = curses.newwin(10, 10)
         p = curses.panel.new_panel(w)
@@ -293,6 +306,7 @@ def test_userptr_without_set(self):
                                msg='userptr should fail since not set'):
             p.userptr()
 
+    @requires_curses_func('panel')
     def test_userptr_memory_leak(self):
         w = curses.newwin(10, 10)
         p = curses.panel.new_panel(w)
@@ -305,6 +319,7 @@ def test_userptr_memory_leak(self):
         self.assertEqual(sys.getrefcount(obj), nrefs,
                          "set_userptr leaked references")
 
+    @requires_curses_func('panel')
     def test_userptr_segfault(self):
         panel = curses.panel.new_panel(self.stdscr)
         class A:
@@ -313,6 +328,7 @@ def __del__(self):
         panel.set_userptr(A())
         panel.set_userptr(None)
 
+    @requires_curses_func('panel')
     def test_new_curses_panel(self):
         panel = curses.panel.new_panel(self.stdscr)
         self.assertRaises(TypeError, type(panel))
diff --git a/Misc/NEWS.d/next/Library/2017-10-29-11-23-24.bpo-31891.9kAPha.rst b/Misc/NEWS.d/next/Library/2017-10-29-11-23-24.bpo-31891.9kAPha.rst
new file mode 100644
index 00000000000..77b00e56906
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-29-11-23-24.bpo-31891.9kAPha.rst
@@ -0,0 +1 @@
+Fixed building the curses module on NetBSD.
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index a70915143c1..d30bd1ab20f 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -112,13 +112,13 @@ char *PyCursesVersion = "2.2";
 #define CURSES_MODULE
 #include "py_curses.h"
 
-/*  These prototypes are in <term.h>, but including this header
-    #defines many common symbols (such as "lines") which breaks the
-    curses module in other ways.  So the code will just specify
-    explicit prototypes here. */
-extern int setupterm(char *,int,int *);
-#ifdef __sgi
+#if defined(HAVE_TERM_H) || defined(__sgi)
+/* For termname, longname, putp, tigetflag, tigetnum, tigetstr, tparm
+   which are not declared in SysV curses and for setupterm. */
 #include <term.h>
+/* Including <term.h> #defines many common symbols. */
+#undef lines
+#undef columns
 #endif
 
 #ifdef HAVE_LANGINFO_H
@@ -484,7 +484,9 @@ Window_NoArgNoReturnVoidFunction(wclrtobot)
 Window_NoArgNoReturnVoidFunction(wclear)
 
 Window_OneArgNoReturnVoidFunction(idcok, int, "i;True(1) or False(0)")
+#ifdef HAVE_CURSES_IMMEDOK
 Window_OneArgNoReturnVoidFunction(immedok, int, "i;True(1) or False(0)")
+#endif
 Window_OneArgNoReturnVoidFunction(wtimeout, int, "i;delay")
 
 Window_NoArg2TupleReturnFunction(getyx, int, "ii")
@@ -494,21 +496,15 @@ Window_NoArg2TupleReturnFunction(getparyx, int, "ii")
 
 Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
 Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
-#if defined(__NetBSD__)
-Window_OneArgNoReturnVoidFunction(keypad, int, "i;True(1) or False(0)")
-#else
 Window_OneArgNoReturnFunction(keypad, int, "i;True(1) or False(0)")
-#endif
 Window_OneArgNoReturnFunction(leaveok, int, "i;True(1) or False(0)")
-#if defined(__NetBSD__)
-Window_OneArgNoReturnVoidFunction(nodelay, int, "i;True(1) or False(0)")
-#else
 Window_OneArgNoReturnFunction(nodelay, int, "i;True(1) or False(0)")
-#endif
 Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
 Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
 Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
+#ifdef HAVE_CURSES_SYNCOK
 Window_OneArgNoReturnFunction(syncok, int, "i;True(1) or False(0)")
+#endif
 
 Window_TwoArgNoReturnFunction(mvwin, int, "ii;y,x")
 Window_TwoArgNoReturnFunction(mvderwin, int, "ii;y,x")
@@ -1163,12 +1159,7 @@ PyCursesWindow_GetKey(PyCursesWindowObject *self, PyObject *args)
     } else if (rtn<=255) {
         return Py_BuildValue("C", rtn);
     } else {
-        const char *knp;
-#if defined(__NetBSD__)
-        knp = unctrl(rtn);
-#else
-        knp = keyname(rtn);
-#endif
+        const char *knp = keyname(rtn);
         return PyUnicode_FromString((knp == NULL) ? "" : knp);
     }
 }
@@ -2017,7 +2008,9 @@ static PyMethodDef PyCursesWindow_Methods[] = {
     {"hline",           (PyCFunction)PyCursesWindow_Hline, METH_VARARGS},
     {"idcok",           (PyCFunction)PyCursesWindow_idcok, METH_VARARGS},
     {"idlok",           (PyCFunction)PyCursesWindow_idlok, METH_VARARGS},
+#ifdef HAVE_CURSES_IMMEDOK
     {"immedok",         (PyCFunction)PyCursesWindow_immedok, METH_VARARGS},
+#endif
     {"inch",            (PyCFunction)PyCursesWindow_InCh, METH_VARARGS},
     {"insch",           (PyCFunction)PyCursesWindow_InsCh, METH_VARARGS},
     {"insdelln",        (PyCFunction)PyCursesWindow_winsdelln, METH_VARARGS},
@@ -2053,7 +2046,9 @@ static PyMethodDef PyCursesWindow_Methods[] = {
     {"subpad",          (PyCFunction)PyCursesWindow_SubWin, METH_VARARGS},
     {"subwin",          (PyCFunction)PyCursesWindow_SubWin, METH_VARARGS},
     {"syncdown",        (PyCFunction)PyCursesWindow_wsyncdown, METH_NOARGS},
+#ifdef HAVE_CURSES_SYNCOK
     {"syncok",          (PyCFunction)PyCursesWindow_syncok, METH_VARARGS},
+#endif
     {"syncup",          (PyCFunction)PyCursesWindow_wsyncup, METH_NOARGS},
     {"timeout",         (PyCFunction)PyCursesWindow_wtimeout, METH_VARARGS},
     {"touchline",       (PyCFunction)PyCursesWindow_TouchLine, METH_VARARGS},
@@ -2145,6 +2140,7 @@ NoArgTrueFalseFunction(isendwin)
 NoArgNoReturnVoidFunction(flushinp)
 NoArgNoReturnVoidFunction(noqiflush)
 
+#ifdef HAVE_CURSES_FILTER
 static PyObject *
 PyCurses_filter(PyObject *self)
 {
@@ -2153,6 +2149,7 @@ PyCurses_filter(PyObject *self)
     filter();
     Py_RETURN_NONE;
 }
+#endif
 
 static PyObject *
 PyCurses_Color_Content(PyObject *self, PyObject *args)
@@ -2224,6 +2221,7 @@ PyCurses_EraseChar(PyObject *self)
     return PyBytes_FromStringAndSize(&ch, 1);
 }
 
+#ifdef getsyx
 static PyObject *
 PyCurses_getsyx(PyObject *self)
 {
@@ -2236,6 +2234,7 @@ PyCurses_getsyx(PyObject *self)
 
     return Py_BuildValue("(ii)", y, x);
 }
+#endif
 
 #ifdef NCURSES_MOUSE_VERSION
 static PyObject *
@@ -2336,9 +2335,9 @@ PyCurses_HalfDelay(PyObject *self, PyObject *args)
     return PyCursesCheckERR(halfdelay(tenths), "halfdelay");
 }
 
-#ifndef STRICT_SYSV_CURSES
-/* No has_key! */
-static PyObject * PyCurses_has_key(PyObject *self, PyObject *args)
+#ifdef HAVE_CURSES_HAS_KEY
+static PyObject *
+PyCurses_has_key(PyObject *self, PyObject *args)
 {
     int ch;
 
@@ -2351,7 +2350,7 @@ static PyObject * PyCurses_has_key(PyObject *self, PyObject *args)
     }
     Py_RETURN_TRUE;
 }
-#endif /* STRICT_SYSV_CURSES */
+#endif
 
 static PyObject *
 PyCurses_Init_Color(PyObject *self, PyObject *args)
@@ -2589,7 +2588,6 @@ PyCurses_Is_Term_Resized(PyObject *self, PyObject *args)
 }
 #endif /* HAVE_CURSES_IS_TERM_RESIZED */
 
-#if !defined(__NetBSD__)
 static PyObject *
 PyCurses_KeyName(PyObject *self, PyObject *args)
 {
@@ -2608,7 +2606,6 @@ PyCurses_KeyName(PyObject *self, PyObject *args)
 
     return PyBytes_FromString((knp == NULL) ? "" : knp);
 }
-#endif
 
 static PyObject *
 PyCurses_KillChar(PyObject *self)
@@ -2913,6 +2910,7 @@ PyCurses_Resize_Term(PyObject *self, PyObject *args)
 }
 #endif /* HAVE_CURSES_RESIZE_TERM */
 
+#ifdef getsyx
 static PyObject *
 PyCurses_setsyx(PyObject *self, PyObject *args)
 {
@@ -2931,6 +2929,7 @@ PyCurses_setsyx(PyObject *self, PyObject *args)
 
     Py_RETURN_NONE;
 }
+#endif
 
 static PyObject *
 PyCurses_Start_Color(PyObject *self)
@@ -3027,6 +3026,7 @@ PyCurses_tparm(PyObject *self, PyObject *args)
     return PyBytes_FromString(result);
 }
 
+#ifdef HAVE_CURSES_TYPEAHEAD
 static PyObject *
 PyCurses_TypeAhead(PyObject *self, PyObject *args)
 {
@@ -3038,6 +3038,7 @@ PyCurses_TypeAhead(PyObject *self, PyObject *args)
 
     return PyCursesCheckERR(typeahead( fd ), "typeahead");
 }
+#endif
 
 static PyObject *
 PyCurses_UnCtrl(PyObject *self, PyObject *args)
@@ -3137,6 +3138,7 @@ PyCurses_Unget_Wch(PyObject *self, PyObject *args)
 }
 #endif
 
+#ifdef HAVE_CURSES_TYPEAHEAD
 static PyObject *
 PyCurses_Use_Env(PyObject *self, PyObject *args)
 {
@@ -3154,6 +3156,7 @@ PyCurses_Use_Env(PyObject *self, PyObject *args)
     use_env(flag);
     Py_RETURN_NONE;
 }
+#endif
 
 #ifndef STRICT_SYSV_CURSES
 static PyObject *
@@ -3191,19 +3194,23 @@ static PyMethodDef PyCurses_methods[] = {
     {"echo",                (PyCFunction)PyCurses_echo, METH_VARARGS},
     {"endwin",              (PyCFunction)PyCurses_endwin, METH_NOARGS},
     {"erasechar",           (PyCFunction)PyCurses_EraseChar, METH_NOARGS},
+#ifdef HAVE_CURSES_FILTER
     {"filter",              (PyCFunction)PyCurses_filter, METH_NOARGS},
+#endif
     {"flash",               (PyCFunction)PyCurses_flash, METH_NOARGS},
     {"flushinp",            (PyCFunction)PyCurses_flushinp, METH_NOARGS},
 #ifdef NCURSES_MOUSE_VERSION
     {"getmouse",            (PyCFunction)PyCurses_GetMouse, METH_NOARGS},
     {"ungetmouse",          (PyCFunction)PyCurses_UngetMouse, METH_VARARGS},
 #endif
+#ifdef getsyx
     {"getsyx",              (PyCFunction)PyCurses_getsyx, METH_NOARGS},
+#endif
     {"getwin",              (PyCFunction)PyCurses_GetWin, METH_O},
     {"has_colors",          (PyCFunction)PyCurses_has_colors, METH_NOARGS},
     {"has_ic",              (PyCFunction)PyCurses_has_ic, METH_NOARGS},
     {"has_il",              (PyCFunction)PyCurses_has_il, METH_NOARGS},
-#ifndef STRICT_SYSV_CURSES
+#ifdef HAVE_CURSES_HAS_KEY
     {"has_key",             (PyCFunction)PyCurses_has_key, METH_VARARGS},
 #endif
     {"halfdelay",           (PyCFunction)PyCurses_HalfDelay, METH_VARARGS},
@@ -3215,9 +3222,7 @@ static PyMethodDef PyCurses_methods[] = {
 #ifdef HAVE_CURSES_IS_TERM_RESIZED
     {"is_term_resized",     (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS},
 #endif
-#if !defined(__NetBSD__)
     {"keyname",             (PyCFunction)PyCurses_KeyName, METH_VARARGS},
-#endif
     {"killchar",            (PyCFunction)PyCurses_KillChar, METH_NOARGS},
     {"longname",            (PyCFunction)PyCurses_longname, METH_NOARGS},
     {"meta",                (PyCFunction)PyCurses_Meta, METH_VARARGS},
@@ -3249,7 +3254,9 @@ static PyMethodDef PyCurses_methods[] = {
     {"resize_term",         (PyCFunction)PyCurses_Resize_Term, METH_VARARGS},
 #endif
     {"savetty",             (PyCFunction)PyCurses_savetty, METH_NOARGS},
+#ifdef getsyx
     {"setsyx",              (PyCFunction)PyCurses_setsyx, METH_VARARGS},
+#endif
     {"setupterm",           (PyCFunction)PyCurses_setupterm,
      METH_VARARGS|METH_KEYWORDS},
     {"start_color",         (PyCFunction)PyCurses_Start_Color, METH_NOARGS},
@@ -3259,7 +3266,9 @@ static PyMethodDef PyCurses_methods[] = {
     {"tigetnum",            (PyCFunction)PyCurses_tigetnum, METH_VARARGS},
     {"tigetstr",            (PyCFunction)PyCurses_tigetstr, METH_VARARGS},
     {"tparm",               (PyCFunction)PyCurses_tparm, METH_VARARGS},
+#ifdef HAVE_CURSES_TYPEAHEAD
     {"typeahead",           (PyCFunction)PyCurses_TypeAhead, METH_VARARGS},
+#endif
     {"unctrl",              (PyCFunction)PyCurses_UnCtrl, METH_VARARGS},
     {"ungetch",             (PyCFunction)PyCurses_UngetCh, METH_VARARGS},
 #if defined(HAVE_CURSES_RESIZETERM) || defined(HAVE_CURSES_RESIZE_TERM)
@@ -3268,7 +3277,9 @@ static PyMethodDef PyCurses_methods[] = {
 #ifdef HAVE_NCURSESW
     {"unget_wch",           (PyCFunction)PyCurses_Unget_Wch, METH_VARARGS},
 #endif
+#ifdef HAVE_CURSES_USE_ENV
     {"use_env",             (PyCFunction)PyCurses_Use_Env, METH_VARARGS},
+#endif
 #ifndef STRICT_SYSV_CURSES
     {"use_default_colors",  (PyCFunction)PyCurses_Use_Default_Colors, METH_NOARGS},
 #endif
@@ -3346,9 +3357,7 @@ PyInit__curses(void)
     SetDictInt("A_DIM",                 A_DIM);
     SetDictInt("A_BOLD",                A_BOLD);
     SetDictInt("A_ALTCHARSET",          A_ALTCHARSET);
-#if !defined(__NetBSD__)
     SetDictInt("A_INVIS",           A_INVIS);
-#endif
     SetDictInt("A_PROTECT",         A_PROTECT);
     SetDictInt("A_CHARTEXT",        A_CHARTEXT);
     SetDictInt("A_COLOR",           A_COLOR);
@@ -3425,7 +3434,6 @@ PyInit__curses(void)
         int key;
         char *key_n;
         char *key_n2;
-#if !defined(__NetBSD__)
         for (key=KEY_MIN;key < KEY_MAX; key++) {
             key_n = (char *)keyname(key);
             if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
@@ -3453,7 +3461,6 @@ PyInit__curses(void)
             if (key_n2 != key_n)
                 PyMem_Free(key_n2);
         }
-#endif
         SetDictInt("KEY_MIN", KEY_MIN);
         SetDictInt("KEY_MAX", KEY_MAX);
     }
diff --git a/configure b/configure
index aa605d2f694..bb7cc51407a 100755
--- a/configure
+++ b/configure
@@ -15814,6 +15814,186 @@ $as_echo "no" >&6; }
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for immedok" >&5
+$as_echo_n "checking for immedok... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef immedok
+void *x=immedok
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_IMMEDOK 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for syncok" >&5
+$as_echo_n "checking for syncok... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef syncok
+void *x=syncok
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_SYNCOK 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for filter" >&5
+$as_echo_n "checking for filter... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef filter
+void *x=filter
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_FILTER 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for has_key" >&5
+$as_echo_n "checking for has_key... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef has_key
+void *x=has_key
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_HAS_KEY 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for typeahead" >&5
+$as_echo_n "checking for typeahead... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef typeahead
+void *x=typeahead
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_TYPEAHEAD 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for use_env" >&5
+$as_echo_n "checking for use_env... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef use_env
+void *x=use_env
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_USE_ENV 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # last curses configure check
 CPPFLAGS=$ac_save_cppflags
 
diff --git a/configure.ac b/configure.ac
index a5b9967a5e6..8c687d731d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4992,6 +4992,72 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[void *x=resizeterm
    AC_MSG_RESULT(yes)],
   [AC_MSG_RESULT(no)]
 )
+
+AC_MSG_CHECKING(for immedok)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef immedok
+void *x=immedok
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_IMMEDOK, 1, Define if you have the 'immedok' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
+
+AC_MSG_CHECKING(for syncok)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef syncok
+void *x=syncok
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_SYNCOK, 1, Define if you have the 'syncok' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
+
+AC_MSG_CHECKING(for filter)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef filter
+void *x=filter
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_FILTER, 1, Define if you have the 'filter' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
+
+AC_MSG_CHECKING(for has_key)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef has_key
+void *x=has_key
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_HAS_KEY, 1, Define if you have the 'has_key' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
+
+AC_MSG_CHECKING(for typeahead)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef typeahead
+void *x=typeahead
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_TYPEAHEAD, 1, Define if you have the 'typeahead' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
+
+AC_MSG_CHECKING(for use_env)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef use_env
+void *x=use_env
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_USE_ENV, 1, Define if you have the 'use_env' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
 # last curses configure check
 CPPFLAGS=$ac_save_cppflags
 
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 662c42e047c..afd161c15f0 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -146,9 +146,18 @@
 /* Define if you have the 'ctermid_r' function. */
 #undef HAVE_CTERMID_R
 
+/* Define if you have the 'filter' function. */
+#undef HAVE_CURSES_FILTER
+
 /* Define to 1 if you have the <curses.h> header file. */
 #undef HAVE_CURSES_H
 
+/* Define if you have the 'has_key' function. */
+#undef HAVE_CURSES_HAS_KEY
+
+/* Define if you have the 'immedok' function. */
+#undef HAVE_CURSES_IMMEDOK
+
 /* Define if you have the 'is_term_resized' function. */
 #undef HAVE_CURSES_IS_TERM_RESIZED
 
@@ -158,6 +167,15 @@
 /* Define if you have the 'resize_term' function. */
 #undef HAVE_CURSES_RESIZE_TERM
 
+/* Define if you have the 'syncok' function. */
+#undef HAVE_CURSES_SYNCOK
+
+/* Define if you have the 'typeahead' function. */
+#undef HAVE_CURSES_TYPEAHEAD
+
+/* Define if you have the 'use_env' function. */
+#undef HAVE_CURSES_USE_ENV
+
 /* Define to 1 if you have the declaration of `isfinite', and to 0 if you
    don't. */
 #undef HAVE_DECL_ISFINITE


From webhook-mailer at python.org  Tue Oct 31 07:59:58 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 31 Oct 2017 11:59:58 -0000
Subject: [Python-checkins] bpo-31893: Fixed select.kqueue(). (#4166)
Message-ID: <mailman.30.1509451200.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/b9052a0f91d2e83bbc27267247a5920c82b242a3
commit: b9052a0f91d2e83bbc27267247a5920c82b242a3
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T13:59:55+02:00
summary:

bpo-31893: Fixed select.kqueue(). (#4166)

* Fixed the layout of the kqueue_event structure on OpenBSD and NetBSD.
* Fixed the comparison of the kqueue_event objects.

files:
A Misc/NEWS.d/next/Library/2017-10-29-13-51-01.bpo-31893.8LZKEz.rst
M Modules/selectmodule.c

diff --git a/Misc/NEWS.d/next/Library/2017-10-29-13-51-01.bpo-31893.8LZKEz.rst b/Misc/NEWS.d/next/Library/2017-10-29-13-51-01.bpo-31893.8LZKEz.rst
new file mode 100644
index 00000000000..46be7fb3731
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-29-13-51-01.bpo-31893.8LZKEz.rst
@@ -0,0 +1,2 @@
+Fixed the layout of the kqueue_event structure on OpenBSD and NetBSD. Fixed
+the comparison of the kqueue_event objects.
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 0f353fbe841..af265d89ff6 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1779,40 +1779,73 @@ static PyTypeObject kqueue_queue_Type;
 #elif (SIZEOF_UINTPTR_T == SIZEOF_LONG_LONG)
 #   define T_UINTPTRT         T_ULONGLONG
 #   define T_INTPTRT          T_LONGLONG
-#   define PyLong_AsUintptr_t PyLong_AsUnsignedLongLong
 #   define UINTPTRT_FMT_UNIT  "K"
 #   define INTPTRT_FMT_UNIT   "L"
 #elif (SIZEOF_UINTPTR_T == SIZEOF_LONG)
 #   define T_UINTPTRT         T_ULONG
 #   define T_INTPTRT          T_LONG
-#   define PyLong_AsUintptr_t PyLong_AsUnsignedLong
 #   define UINTPTRT_FMT_UNIT  "k"
 #   define INTPTRT_FMT_UNIT   "l"
 #elif (SIZEOF_UINTPTR_T == SIZEOF_INT)
 #   define T_UINTPTRT         T_UINT
 #   define T_INTPTRT          T_INT
-#   define PyLong_AsUintptr_t PyLong_AsUnsignedLong
 #   define UINTPTRT_FMT_UNIT  "I"
 #   define INTPTRT_FMT_UNIT   "i"
 #else
 #   error uintptr_t does not match int, long, or long long!
 #endif
 
+#if SIZEOF_LONG_LONG == 8
+#   define T_INT64          T_LONGLONG
+#   define INT64_FMT_UNIT   "L"
+#elif SIZEOF_LONG == 8
+#   define T_INT64          T_LONG
+#   define INT64_FMT_UNIT   "l"
+#elif SIZEOF_INT == 8
+#   define T_INT64          T_INT
+#   define INT64_FMT_UNIT   "i"
+#else
+#   define INT64_FMT_UNIT   "_"
+#endif
+
+#if SIZEOF_LONG_LONG == 4
+#   define T_UINT32         T_ULONGLONG
+#   define UINT32_FMT_UNIT  "K"
+#elif SIZEOF_LONG == 4
+#   define T_UINT32         T_ULONG
+#   define UINT32_FMT_UNIT  "k"
+#elif SIZEOF_INT == 4
+#   define T_UINT32         T_UINT
+#   define UINT32_FMT_UNIT  "I"
+#else
+#   define UINT32_FMT_UNIT  "_"
+#endif
+
 /*
  * kevent is not standard and its members vary across BSDs.
  */
-#if !defined(__OpenBSD__)
-#   define IDENT_TYPE  T_UINTPTRT
-#   define IDENT_CAST  intptr_t
-#   define DATA_TYPE   T_INTPTRT
-#   define DATA_FMT_UNIT INTPTRT_FMT_UNIT
-#   define IDENT_AsType PyLong_AsUintptr_t
+#ifdef __NetBSD__
+#   define FILTER_TYPE      T_UINT32
+#   define FILTER_FMT_UNIT  UINT32_FMT_UNIT
+#   define FLAGS_TYPE       T_UINT32
+#   define FLAGS_FMT_UNIT   UINT32_FMT_UNIT
+#   define FFLAGS_TYPE      T_UINT32
+#   define FFLAGS_FMT_UNIT  UINT32_FMT_UNIT
 #else
-#   define IDENT_TYPE  T_UINT
-#   define IDENT_CAST  int
-#   define DATA_TYPE   T_INT
-#   define DATA_FMT_UNIT "i"
-#   define IDENT_AsType PyLong_AsUnsignedLong
+#   define FILTER_TYPE      T_SHORT
+#   define FILTER_FMT_UNIT  "h"
+#   define FLAGS_TYPE       T_USHORT
+#   define FLAGS_FMT_UNIT   "H"
+#   define FFLAGS_TYPE      T_UINT
+#   define FFLAGS_FMT_UNIT  "I"
+#endif
+
+#ifdef __FreeBSD__
+#   define DATA_TYPE        T_INTPTRT
+#   define DATA_FMT_UNIT    INTPTR_FMT_UNIT
+#else
+#   define DATA_TYPE        T_INT64
+#   define DATA_FMT_UNIT    INT64_FMT_UNIT
 #endif
 
 /* Unfortunately, we can't store python objects in udata, because
@@ -1822,9 +1855,9 @@ static PyTypeObject kqueue_queue_Type;
 
 #define KQ_OFF(x) offsetof(kqueue_event_Object, x)
 static struct PyMemberDef kqueue_event_members[] = {
-    {"ident",           IDENT_TYPE,     KQ_OFF(e.ident)},
-    {"filter",          T_SHORT,        KQ_OFF(e.filter)},
-    {"flags",           T_USHORT,       KQ_OFF(e.flags)},
+    {"ident",           T_UINTPTRT,     KQ_OFF(e.ident)},
+    {"filter",          FILTER_TYPE,    KQ_OFF(e.filter)},
+    {"flags",           FLAGS_TYPE,     KQ_OFF(e.flags)},
     {"fflags",          T_UINT,         KQ_OFF(e.fflags)},
     {"data",            DATA_TYPE,      KQ_OFF(e.data)},
     {"udata",           T_UINTPTRT,     KQ_OFF(e.udata)},
@@ -1840,9 +1873,9 @@ kqueue_event_repr(kqueue_event_Object *s)
     PyOS_snprintf(
         buf, sizeof(buf),
         "<select.kevent ident=%zu filter=%d flags=0x%x fflags=0x%x "
-        "data=0x%zd udata=%p>",
-        (size_t)(s->e.ident), s->e.filter, s->e.flags,
-        s->e.fflags, (Py_ssize_t)(s->e.data), s->e.udata);
+        "data=0x%llx udata=%p>",
+        (size_t)(s->e.ident), (int)s->e.filter, (unsigned int)s->e.flags,
+        (unsigned int)s->e.fflags, (long long)(s->e.data), (void *)s->e.udata);
     return PyUnicode_FromString(buf);
 }
 
@@ -1852,7 +1885,9 @@ kqueue_event_init(kqueue_event_Object *self, PyObject *args, PyObject *kwds)
     PyObject *pfd;
     static char *kwlist[] = {"ident", "filter", "flags", "fflags",
                              "data", "udata", NULL};
-    static const char fmt[] = "O|hHI" DATA_FMT_UNIT UINTPTRT_FMT_UNIT ":kevent";
+    static const char fmt[] = "O|"
+                FILTER_FMT_UNIT FLAGS_FMT_UNIT FFLAGS_FMT_UNIT DATA_FMT_UNIT
+                UINTPTRT_FMT_UNIT ":kevent";
 
     EV_SET(&(self->e), 0, EVFILT_READ, EV_ADD, 0, 0, 0); /* defaults */
 
@@ -1862,12 +1897,8 @@ kqueue_event_init(kqueue_event_Object *self, PyObject *args, PyObject *kwds)
         return -1;
     }
 
-    if (PyLong_Check(pfd)
-#if IDENT_TYPE == T_UINT
-        && PyLong_AsUnsignedLong(pfd) <= UINT_MAX
-#endif
-    ) {
-        self->e.ident = IDENT_AsType(pfd);
+    if (PyLong_Check(pfd)) {
+        self->e.ident = PyLong_AsSize_t(pfd);
     }
     else {
         self->e.ident = PyObject_AsFileDescriptor(pfd);
@@ -1882,28 +1913,21 @@ static PyObject *
 kqueue_event_richcompare(kqueue_event_Object *s, kqueue_event_Object *o,
                          int op)
 {
-    intptr_t result = 0;
+    int result;
 
     if (!kqueue_event_Check(o)) {
-        if (op == Py_EQ || op == Py_NE) {
-            PyObject *res = op == Py_EQ ? Py_False : Py_True;
-            Py_INCREF(res);
-            return res;
-        }
-        PyErr_Format(PyExc_TypeError,
-            "can't compare %.200s to %.200s",
-            Py_TYPE(s)->tp_name, Py_TYPE(o)->tp_name);
-        return NULL;
-    }
-    if (((result = (IDENT_CAST)(s->e.ident - o->e.ident)) == 0) &&
-        ((result = s->e.filter - o->e.filter) == 0) &&
-        ((result = s->e.flags - o->e.flags) == 0) &&
-        ((result = (int)(s->e.fflags - o->e.fflags)) == 0) &&
-        ((result = s->e.data - o->e.data) == 0) &&
-        ((result = s->e.udata - o->e.udata) == 0)
-       ) {
-        result = 0;
-    }
+        Py_RETURN_NOTIMPLEMENTED;
+    }
+
+#define CMP(a, b) ((a) != (b)) ? ((a) < (b) ? -1 : 1)
+    result = CMP(s->e.ident, o->e.ident)
+           : CMP(s->e.filter, o->e.filter)
+           : CMP(s->e.flags, o->e.flags)
+           : CMP(s->e.fflags, o->e.fflags)
+           : CMP(s->e.data, o->e.data)
+           : CMP((intptr_t)s->e.udata, (intptr_t)o->e.udata)
+           : 0;
+#undef CMP
 
     switch (op) {
     case Py_EQ:


From webhook-mailer at python.org  Tue Oct 31 08:05:05 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 31 Oct 2017 12:05:05 -0000
Subject: [Python-checkins] bpo-31626: Fixed a bug in debug memory allocator.
 (#3844)
Message-ID: <mailman.31.1509451510.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/b484d5606ca76f9bbd0f5de7a6ef753400213e94
commit: b484d5606ca76f9bbd0f5de7a6ef753400213e94
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T14:05:03+02:00
summary:

bpo-31626: Fixed a bug in debug memory allocator. (#3844)

Removed a code that incorrectly detected in-place resizing in realloc()
 and wrote to freed memory.

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-01-15-48-03.bpo-31626.reLPxY.rst
M Objects/obmalloc.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-01-15-48-03.bpo-31626.reLPxY.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-01-15-48-03.bpo-31626.reLPxY.rst
new file mode 100644
index 00000000000..51026a31914
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-01-15-48-03.bpo-31626.reLPxY.rst	
@@ -0,0 +1,2 @@
+Fixed a bug in debug memory allocator.  There was a write to freed memory
+after shrinking a memory block.
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index f2651d7574b..1485172102d 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1460,7 +1460,7 @@ static void *
 _PyMem_DebugRawRealloc(void *ctx, void *p, size_t nbytes)
 {
     debug_alloc_api_t *api = (debug_alloc_api_t *)ctx;
-    uint8_t *q = (uint8_t *)p, *oldq;
+    uint8_t *q = (uint8_t *)p;
     uint8_t *tail;
     size_t total;       /* nbytes + 4*SST */
     size_t original_nbytes;
@@ -1477,20 +1477,11 @@ _PyMem_DebugRawRealloc(void *ctx, void *p, size_t nbytes)
         /* overflow:  can't represent total as a Py_ssize_t */
         return NULL;
 
-    /* Resize and add decorations. We may get a new pointer here, in which
-     * case we didn't get the chance to mark the old memory with DEADBYTE,
-     * but we live with that.
-     */
-    oldq = q;
+    /* Resize and add decorations. */
     q = (uint8_t *)api->alloc.realloc(api->alloc.ctx, q - 2*SST, total);
     if (q == NULL)
         return NULL;
 
-    if (q == oldq && nbytes < original_nbytes) {
-        /* shrinking:  mark old extra memory dead */
-        memset(q + nbytes, DEADBYTE, original_nbytes - nbytes);
-    }
-
     write_size_t(q, nbytes);
     assert(q[SST] == (uint8_t)api->api_id);
     for (i = 1; i < SST; ++i)


From webhook-mailer at python.org  Tue Oct 31 08:05:56 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 31 Oct 2017 12:05:56 -0000
Subject: [Python-checkins] bpo-31897: Convert unexpected errors when read
 bogus binary plists into InvalidFileException. (#4171)
Message-ID: <mailman.32.1509451558.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/db91e0fe2417f075693a194a492b1699829871e7
commit: db91e0fe2417f075693a194a492b1699829871e7
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T14:05:53+02:00
summary:

bpo-31897: Convert unexpected errors when read bogus binary plists into InvalidFileException. (#4171)

files:
A Misc/NEWS.d/next/Library/2017-10-30-11-04-56.bpo-31897.yjwdEb.rst
M Lib/plistlib.py
M Lib/test/test_plistlib.py

diff --git a/Lib/plistlib.py b/Lib/plistlib.py
index 8262fb049e5..2113a2dc57b 100644
--- a/Lib/plistlib.py
+++ b/Lib/plistlib.py
@@ -557,7 +557,8 @@ def parse(self, fp):
             self._object_offsets = self._read_ints(num_objects, offset_size)
             return self._read_object(self._object_offsets[top_object])
 
-        except (OSError, IndexError, struct.error):
+        except (OSError, IndexError, struct.error, OverflowError,
+                UnicodeDecodeError):
             raise InvalidFileException()
 
     def _get_size(self, tokenL):
@@ -575,6 +576,8 @@ def _read_ints(self, n, size):
         if size in _BINARY_FORMAT:
             return struct.unpack('>' + _BINARY_FORMAT[size] * n, data)
         else:
+            if not size or len(data) != size * n:
+                raise InvalidFileException()
             return tuple(int.from_bytes(data[i: i + size], 'big')
                          for i in range(0, size * n, size))
 
diff --git a/Lib/test/test_plistlib.py b/Lib/test/test_plistlib.py
index 58b885f0228..7dd179a2c71 100644
--- a/Lib/test/test_plistlib.py
+++ b/Lib/test/test_plistlib.py
@@ -353,11 +353,13 @@ def test_controlcharacters(self):
             testString = "string containing %s" % c
             if i >= 32 or c in "\r\n\t":
                 # \r, \n and \t are the only legal control chars in XML
-                plistlib.dumps(testString, fmt=plistlib.FMT_XML)
+                data = plistlib.dumps(testString, fmt=plistlib.FMT_XML)
+                if c != "\r":
+                    self.assertEqual(plistlib.loads(data), testString)
             else:
-                self.assertRaises(ValueError,
-                                  plistlib.dumps,
-                                  testString)
+                with self.assertRaises(ValueError):
+                    plistlib.dumps(testString, fmt=plistlib.FMT_XML)
+            plistlib.dumps(testString, fmt=plistlib.FMT_BINARY)
 
     def test_non_bmp_characters(self):
         pl = {'python': '\U0001f40d'}
@@ -366,6 +368,14 @@ def test_non_bmp_characters(self):
                 data = plistlib.dumps(pl, fmt=fmt)
                 self.assertEqual(plistlib.loads(data), pl)
 
+    def test_lone_surrogates(self):
+        for fmt in ALL_FORMATS:
+            with self.subTest(fmt=fmt):
+                with self.assertRaises(UnicodeEncodeError):
+                    plistlib.dumps('\ud8ff', fmt=fmt)
+                with self.assertRaises(UnicodeEncodeError):
+                    plistlib.dumps('\udcff', fmt=fmt)
+
     def test_nondictroot(self):
         for fmt in ALL_FORMATS:
             with self.subTest(fmt=fmt):
@@ -442,6 +452,56 @@ def test_large_timestamp(self):
                 data = plistlib.dumps(d, fmt=plistlib.FMT_BINARY)
                 self.assertEqual(plistlib.loads(data), d)
 
+    def test_invalid_binary(self):
+        for data in [
+                # too short data
+                b'',
+                # too large offset_table_offset and nonstandard offset_size
+                b'\x00\x08'
+                b'\x00\x00\x00\x00\x00\x00\x03\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x2a',
+                # integer overflow in offset_table_offset
+                b'\x00\x08'
+                b'\x00\x00\x00\x00\x00\x00\x01\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+                b'\xff\xff\xff\xff\xff\xff\xff\xff',
+                # offset_size = 0
+                b'\x00\x08'
+                b'\x00\x00\x00\x00\x00\x00\x00\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x09',
+                # ref_size = 0
+                b'\xa1\x01\x00\x08\x0a'
+                b'\x00\x00\x00\x00\x00\x00\x01\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x02'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x0b',
+                # integer overflow in offset
+                b'\x00\xff\xff\xff\xff\xff\xff\xff\xff'
+                b'\x00\x00\x00\x00\x00\x00\x08\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x09',
+                # invalid ASCII
+                b'\x51\xff\x08'
+                b'\x00\x00\x00\x00\x00\x00\x01\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x0a',
+                # invalid UTF-16
+                b'\x61\xd8\x00\x08'
+                b'\x00\x00\x00\x00\x00\x00\x01\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x0b',
+                ]:
+            with self.assertRaises(plistlib.InvalidFileException):
+                plistlib.loads(b'bplist00' + data, fmt=plistlib.FMT_BINARY)
+
 
 class TestPlistlibDeprecated(unittest.TestCase):
     def test_io_deprecated(self):
diff --git a/Misc/NEWS.d/next/Library/2017-10-30-11-04-56.bpo-31897.yjwdEb.rst b/Misc/NEWS.d/next/Library/2017-10-30-11-04-56.bpo-31897.yjwdEb.rst
new file mode 100644
index 00000000000..229472cb489
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-30-11-04-56.bpo-31897.yjwdEb.rst
@@ -0,0 +1,2 @@
+plistlib now catches more errors when read binary plists and raises
+InvalidFileException instead of unexpected exceptions.


From webhook-mailer at python.org  Tue Oct 31 08:33:12 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 31 Oct 2017 12:33:12 -0000
Subject: [Python-checkins] bpo-31891: Fix building the curses module on
 NetBSD. (GH-4165) (#4189)
Message-ID: <mailman.33.1509453192.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/5db32085e7e4d6be9a34d0a64ecf477eca224f15
commit: 5db32085e7e4d6be9a34d0a64ecf477eca224f15
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-31T14:33:09+02:00
summary:

bpo-31891: Fix building the curses module on NetBSD. (GH-4165) (#4189)

(cherry picked from commit baac01e629d90f63dfde6b5cc433f4bc65c5feeb)

files:
A Misc/NEWS.d/next/Library/2017-10-29-11-23-24.bpo-31891.9kAPha.rst
M Include/py_curses.h
M Lib/test/test_curses.py
M Modules/_cursesmodule.c
M configure
M configure.ac
M pyconfig.h.in

diff --git a/Include/py_curses.h b/Include/py_curses.h
index 3c21697073a..251364629a9 100644
--- a/Include/py_curses.h
+++ b/Include/py_curses.h
@@ -7,7 +7,7 @@
 ** On Mac OS X 10.2 [n]curses.h and stdlib.h use different guards
 ** against multiple definition of wchar_t.
 */
-#ifdef	_BSD_WCHAR_T_DEFINED_
+#ifdef _BSD_WCHAR_T_DEFINED_
 #define _WCHAR_T
 #endif
 
@@ -22,7 +22,7 @@
 ** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards
 ** against multiple definition of wchar_t and wint_t.
 */
-#ifdef	_XOPEN_SOURCE_EXTENDED
+#ifdef _XOPEN_SOURCE_EXTENDED
 #ifndef __FreeBSD_version
 #include <osreldate.h>
 #endif
@@ -48,10 +48,6 @@
 #include <ncurses.h>
 #else
 #include <curses.h>
-#ifdef HAVE_TERM_H
-/* for tigetstr, which is not declared in SysV curses */
-#include <term.h>
-#endif
 #endif
 
 #ifdef HAVE_NCURSES_H
@@ -74,12 +70,12 @@ extern "C" {
 /* Type declarations */
 
 typedef struct {
-	PyObject_HEAD
-	WINDOW *win;
-	char *encoding;
+    PyObject_HEAD
+    WINDOW *win;
+    char *encoding;
 } PyCursesWindowObject;
 
-#define PyCursesWindow_Check(v)	 (Py_TYPE(v) == &PyCursesWindow_Type)
+#define PyCursesWindow_Check(v)  (Py_TYPE(v) == &PyCursesWindow_Type)
 
 #define PyCurses_CAPSULE_NAME "_curses._C_API"
 
diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index b0a28908da7..785a31c622b 100644
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -25,9 +25,12 @@
 
 # If either of these don't exist, skip the tests.
 curses = import_module('curses')
-import_module('curses.panel')
 import_module('curses.ascii')
 import_module('curses.textpad')
+try:
+    import curses.panel
+except ImportError:
+    pass
 
 def requires_curses_func(name):
     return unittest.skipUnless(hasattr(curses, name),
@@ -138,7 +141,8 @@ def test_window_funcs(self):
 
         stdscr.idcok(1)
         stdscr.idlok(1)
-        stdscr.immedok(1)
+        if hasattr(stdscr, 'immedok'):
+            stdscr.immedok(1)
         stdscr.insch('c')
         stdscr.insdelln(1)
         stdscr.insnstr('abc', 3)
@@ -172,7 +176,8 @@ def test_window_funcs(self):
         stdscr.setscrreg(10,15)
         win3 = stdscr.subwin(10,10)
         win3 = stdscr.subwin(10,10, 5,5)
-        stdscr.syncok(1)
+        if hasattr(stdscr, 'syncok'):
+            stdscr.syncok(1)
         stdscr.timeout(5)
         stdscr.touchline(5,5)
         stdscr.touchline(5,5,0)
@@ -211,15 +216,19 @@ def test_module_funcs(self):
         "Test module-level functions"
         for func in [curses.baudrate, curses.beep, curses.can_change_color,
                      curses.cbreak, curses.def_prog_mode, curses.doupdate,
-                     curses.filter, curses.flash, curses.flushinp,
+                     curses.flash, curses.flushinp,
                      curses.has_colors, curses.has_ic, curses.has_il,
                      curses.isendwin, curses.killchar, curses.longname,
                      curses.nocbreak, curses.noecho, curses.nonl,
                      curses.noqiflush, curses.noraw,
                      curses.reset_prog_mode, curses.termattrs,
-                     curses.termname, curses.erasechar, curses.getsyx]:
+                     curses.termname, curses.erasechar]:
             with self.subTest(func=func.__qualname__):
                 func()
+        if hasattr(curses, 'filter'):
+            curses.filter()
+        if hasattr(curses, 'getsyx'):
+            curses.getsyx()
 
         # Functions that actually need arguments
         if curses.tigetstr("cnorm"):
@@ -243,15 +252,18 @@ def test_module_funcs(self):
         curses.putp(b'abc')
         curses.qiflush()
         curses.raw() ; curses.raw(1)
-        curses.setsyx(5,5)
+        if hasattr(curses, 'setsyx'):
+            curses.setsyx(5,5)
         curses.tigetflag('hc')
         curses.tigetnum('co')
         curses.tigetstr('cr')
         curses.tparm(b'cr')
-        curses.typeahead(sys.__stdin__.fileno())
+        if hasattr(curses, 'typeahead'):
+            curses.typeahead(sys.__stdin__.fileno())
         curses.unctrl('a')
         curses.ungetch('a')
-        curses.use_env(1)
+        if hasattr(curses, 'use_env'):
+            curses.use_env(1)
 
     # Functions only available on a few platforms
     def test_colors_funcs(self):
@@ -285,6 +297,7 @@ def test_getmouse(self):
         curses.ungetmouse(0, 0, 0, 0, curses.BUTTON1_PRESSED)
         m = curses.getmouse()
 
+    @requires_curses_func('panel')
     def test_userptr_without_set(self):
         w = curses.newwin(10, 10)
         p = curses.panel.new_panel(w)
@@ -293,6 +306,7 @@ def test_userptr_without_set(self):
                                msg='userptr should fail since not set'):
             p.userptr()
 
+    @requires_curses_func('panel')
     def test_userptr_memory_leak(self):
         w = curses.newwin(10, 10)
         p = curses.panel.new_panel(w)
@@ -305,6 +319,7 @@ def test_userptr_memory_leak(self):
         self.assertEqual(sys.getrefcount(obj), nrefs,
                          "set_userptr leaked references")
 
+    @requires_curses_func('panel')
     def test_userptr_segfault(self):
         panel = curses.panel.new_panel(self.stdscr)
         class A:
@@ -313,6 +328,7 @@ def __del__(self):
         panel.set_userptr(A())
         panel.set_userptr(None)
 
+    @requires_curses_func('panel')
     def test_new_curses_panel(self):
         panel = curses.panel.new_panel(self.stdscr)
         self.assertRaises(TypeError, type(panel))
diff --git a/Misc/NEWS.d/next/Library/2017-10-29-11-23-24.bpo-31891.9kAPha.rst b/Misc/NEWS.d/next/Library/2017-10-29-11-23-24.bpo-31891.9kAPha.rst
new file mode 100644
index 00000000000..77b00e56906
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-29-11-23-24.bpo-31891.9kAPha.rst
@@ -0,0 +1 @@
+Fixed building the curses module on NetBSD.
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 7a7095118a0..ec6316bf955 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -112,13 +112,13 @@ char *PyCursesVersion = "2.2";
 #define CURSES_MODULE
 #include "py_curses.h"
 
-/*  These prototypes are in <term.h>, but including this header
-    #defines many common symbols (such as "lines") which breaks the
-    curses module in other ways.  So the code will just specify
-    explicit prototypes here. */
-extern int setupterm(char *,int,int *);
-#ifdef __sgi
+#if defined(HAVE_TERM_H) || defined(__sgi)
+/* For termname, longname, putp, tigetflag, tigetnum, tigetstr, tparm
+   which are not declared in SysV curses and for setupterm. */
 #include <term.h>
+/* Including <term.h> #defines many common symbols. */
+#undef lines
+#undef columns
 #endif
 
 #ifdef HAVE_LANGINFO_H
@@ -484,7 +484,9 @@ Window_NoArgNoReturnVoidFunction(wclrtobot)
 Window_NoArgNoReturnVoidFunction(wclear)
 
 Window_OneArgNoReturnVoidFunction(idcok, int, "i;True(1) or False(0)")
+#ifdef HAVE_CURSES_IMMEDOK
 Window_OneArgNoReturnVoidFunction(immedok, int, "i;True(1) or False(0)")
+#endif
 Window_OneArgNoReturnVoidFunction(wtimeout, int, "i;delay")
 
 Window_NoArg2TupleReturnFunction(getyx, int, "ii")
@@ -494,21 +496,15 @@ Window_NoArg2TupleReturnFunction(getparyx, int, "ii")
 
 Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
 Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
-#if defined(__NetBSD__)
-Window_OneArgNoReturnVoidFunction(keypad, int, "i;True(1) or False(0)")
-#else
 Window_OneArgNoReturnFunction(keypad, int, "i;True(1) or False(0)")
-#endif
 Window_OneArgNoReturnFunction(leaveok, int, "i;True(1) or False(0)")
-#if defined(__NetBSD__)
-Window_OneArgNoReturnVoidFunction(nodelay, int, "i;True(1) or False(0)")
-#else
 Window_OneArgNoReturnFunction(nodelay, int, "i;True(1) or False(0)")
-#endif
 Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
 Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
 Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
+#ifdef HAVE_CURSES_SYNCOK
 Window_OneArgNoReturnFunction(syncok, int, "i;True(1) or False(0)")
+#endif
 
 Window_TwoArgNoReturnFunction(mvwin, int, "ii;y,x")
 Window_TwoArgNoReturnFunction(mvderwin, int, "ii;y,x")
@@ -1165,12 +1161,7 @@ PyCursesWindow_GetKey(PyCursesWindowObject *self, PyObject *args)
     } else if (rtn<=255) {
         return Py_BuildValue("C", rtn);
     } else {
-        const char *knp;
-#if defined(__NetBSD__)
-        knp = unctrl(rtn);
-#else
-        knp = keyname(rtn);
-#endif
+        const char *knp = keyname(rtn);
         return PyUnicode_FromString((knp == NULL) ? "" : knp);
     }
 }
@@ -2033,7 +2024,9 @@ static PyMethodDef PyCursesWindow_Methods[] = {
     {"hline",           (PyCFunction)PyCursesWindow_Hline, METH_VARARGS},
     {"idcok",           (PyCFunction)PyCursesWindow_idcok, METH_VARARGS},
     {"idlok",           (PyCFunction)PyCursesWindow_idlok, METH_VARARGS},
+#ifdef HAVE_CURSES_IMMEDOK
     {"immedok",         (PyCFunction)PyCursesWindow_immedok, METH_VARARGS},
+#endif
     {"inch",            (PyCFunction)PyCursesWindow_InCh, METH_VARARGS},
     {"insch",           (PyCFunction)PyCursesWindow_InsCh, METH_VARARGS},
     {"insdelln",        (PyCFunction)PyCursesWindow_winsdelln, METH_VARARGS},
@@ -2069,7 +2062,9 @@ static PyMethodDef PyCursesWindow_Methods[] = {
     {"subpad",          (PyCFunction)PyCursesWindow_SubWin, METH_VARARGS},
     {"subwin",          (PyCFunction)PyCursesWindow_SubWin, METH_VARARGS},
     {"syncdown",        (PyCFunction)PyCursesWindow_wsyncdown, METH_NOARGS},
+#ifdef HAVE_CURSES_SYNCOK
     {"syncok",          (PyCFunction)PyCursesWindow_syncok, METH_VARARGS},
+#endif
     {"syncup",          (PyCFunction)PyCursesWindow_wsyncup, METH_NOARGS},
     {"timeout",         (PyCFunction)PyCursesWindow_wtimeout, METH_VARARGS},
     {"touchline",       (PyCFunction)PyCursesWindow_TouchLine, METH_VARARGS},
@@ -2161,6 +2156,7 @@ NoArgTrueFalseFunction(isendwin)
 NoArgNoReturnVoidFunction(flushinp)
 NoArgNoReturnVoidFunction(noqiflush)
 
+#ifdef HAVE_CURSES_FILTER
 static PyObject *
 PyCurses_filter(PyObject *self)
 {
@@ -2170,6 +2166,7 @@ PyCurses_filter(PyObject *self)
     Py_INCREF(Py_None);
     return Py_None;
 }
+#endif
 
 static PyObject *
 PyCurses_Color_Content(PyObject *self, PyObject *args)
@@ -2241,6 +2238,7 @@ PyCurses_EraseChar(PyObject *self)
     return PyBytes_FromStringAndSize(&ch, 1);
 }
 
+#ifdef getsyx
 static PyObject *
 PyCurses_getsyx(PyObject *self)
 {
@@ -2253,6 +2251,7 @@ PyCurses_getsyx(PyObject *self)
 
     return Py_BuildValue("(ii)", y, x);
 }
+#endif
 
 #ifdef NCURSES_MOUSE_VERSION
 static PyObject *
@@ -2363,9 +2362,9 @@ PyCurses_HalfDelay(PyObject *self, PyObject *args)
     return PyCursesCheckERR(halfdelay(tenths), "halfdelay");
 }
 
-#ifndef STRICT_SYSV_CURSES
-/* No has_key! */
-static PyObject * PyCurses_has_key(PyObject *self, PyObject *args)
+#ifdef HAVE_CURSES_HAS_KEY
+static PyObject *
+PyCurses_has_key(PyObject *self, PyObject *args)
 {
     int ch;
 
@@ -2380,7 +2379,7 @@ static PyObject * PyCurses_has_key(PyObject *self, PyObject *args)
     Py_INCREF(Py_True);
     return Py_True;
 }
-#endif /* STRICT_SYSV_CURSES */
+#endif
 
 static PyObject *
 PyCurses_Init_Color(PyObject *self, PyObject *args)
@@ -2621,7 +2620,6 @@ PyCurses_Is_Term_Resized(PyObject *self, PyObject *args)
 }
 #endif /* HAVE_CURSES_IS_TERM_RESIZED */
 
-#if !defined(__NetBSD__)
 static PyObject *
 PyCurses_KeyName(PyObject *self, PyObject *args)
 {
@@ -2640,7 +2638,6 @@ PyCurses_KeyName(PyObject *self, PyObject *args)
 
     return PyBytes_FromString((knp == NULL) ? "" : knp);
 }
-#endif
 
 static PyObject *
 PyCurses_KillChar(PyObject *self)
@@ -2947,6 +2944,7 @@ PyCurses_Resize_Term(PyObject *self, PyObject *args)
 }
 #endif /* HAVE_CURSES_RESIZE_TERM */
 
+#ifdef getsyx
 static PyObject *
 PyCurses_setsyx(PyObject *self, PyObject *args)
 {
@@ -2966,6 +2964,7 @@ PyCurses_setsyx(PyObject *self, PyObject *args)
     Py_INCREF(Py_None);
     return Py_None;
 }
+#endif
 
 static PyObject *
 PyCurses_Start_Color(PyObject *self)
@@ -3064,6 +3063,7 @@ PyCurses_tparm(PyObject *self, PyObject *args)
     return PyBytes_FromString(result);
 }
 
+#ifdef HAVE_CURSES_TYPEAHEAD
 static PyObject *
 PyCurses_TypeAhead(PyObject *self, PyObject *args)
 {
@@ -3075,6 +3075,7 @@ PyCurses_TypeAhead(PyObject *self, PyObject *args)
 
     return PyCursesCheckERR(typeahead( fd ), "typeahead");
 }
+#endif
 
 static PyObject *
 PyCurses_UnCtrl(PyObject *self, PyObject *args)
@@ -3174,6 +3175,7 @@ PyCurses_Unget_Wch(PyObject *self, PyObject *args)
 }
 #endif
 
+#ifdef HAVE_CURSES_TYPEAHEAD
 static PyObject *
 PyCurses_Use_Env(PyObject *self, PyObject *args)
 {
@@ -3192,6 +3194,7 @@ PyCurses_Use_Env(PyObject *self, PyObject *args)
     Py_INCREF(Py_None);
     return Py_None;
 }
+#endif
 
 #ifndef STRICT_SYSV_CURSES
 static PyObject *
@@ -3230,19 +3233,23 @@ static PyMethodDef PyCurses_methods[] = {
     {"echo",                (PyCFunction)PyCurses_echo, METH_VARARGS},
     {"endwin",              (PyCFunction)PyCurses_endwin, METH_NOARGS},
     {"erasechar",           (PyCFunction)PyCurses_EraseChar, METH_NOARGS},
+#ifdef HAVE_CURSES_FILTER
     {"filter",              (PyCFunction)PyCurses_filter, METH_NOARGS},
+#endif
     {"flash",               (PyCFunction)PyCurses_flash, METH_NOARGS},
     {"flushinp",            (PyCFunction)PyCurses_flushinp, METH_NOARGS},
 #ifdef NCURSES_MOUSE_VERSION
     {"getmouse",            (PyCFunction)PyCurses_GetMouse, METH_NOARGS},
     {"ungetmouse",          (PyCFunction)PyCurses_UngetMouse, METH_VARARGS},
 #endif
+#ifdef getsyx
     {"getsyx",              (PyCFunction)PyCurses_getsyx, METH_NOARGS},
+#endif
     {"getwin",              (PyCFunction)PyCurses_GetWin, METH_O},
     {"has_colors",          (PyCFunction)PyCurses_has_colors, METH_NOARGS},
     {"has_ic",              (PyCFunction)PyCurses_has_ic, METH_NOARGS},
     {"has_il",              (PyCFunction)PyCurses_has_il, METH_NOARGS},
-#ifndef STRICT_SYSV_CURSES
+#ifdef HAVE_CURSES_HAS_KEY
     {"has_key",             (PyCFunction)PyCurses_has_key, METH_VARARGS},
 #endif
     {"halfdelay",           (PyCFunction)PyCurses_HalfDelay, METH_VARARGS},
@@ -3254,9 +3261,7 @@ static PyMethodDef PyCurses_methods[] = {
 #ifdef HAVE_CURSES_IS_TERM_RESIZED
     {"is_term_resized",     (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS},
 #endif
-#if !defined(__NetBSD__)
     {"keyname",             (PyCFunction)PyCurses_KeyName, METH_VARARGS},
-#endif
     {"killchar",            (PyCFunction)PyCurses_KillChar, METH_NOARGS},
     {"longname",            (PyCFunction)PyCurses_longname, METH_NOARGS},
     {"meta",                (PyCFunction)PyCurses_Meta, METH_VARARGS},
@@ -3288,7 +3293,9 @@ static PyMethodDef PyCurses_methods[] = {
     {"resize_term",         (PyCFunction)PyCurses_Resize_Term, METH_VARARGS},
 #endif
     {"savetty",             (PyCFunction)PyCurses_savetty, METH_NOARGS},
+#ifdef getsyx
     {"setsyx",              (PyCFunction)PyCurses_setsyx, METH_VARARGS},
+#endif
     {"setupterm",           (PyCFunction)PyCurses_setupterm,
      METH_VARARGS|METH_KEYWORDS},
     {"start_color",         (PyCFunction)PyCurses_Start_Color, METH_NOARGS},
@@ -3298,7 +3305,9 @@ static PyMethodDef PyCurses_methods[] = {
     {"tigetnum",            (PyCFunction)PyCurses_tigetnum, METH_VARARGS},
     {"tigetstr",            (PyCFunction)PyCurses_tigetstr, METH_VARARGS},
     {"tparm",               (PyCFunction)PyCurses_tparm, METH_VARARGS},
+#ifdef HAVE_CURSES_TYPEAHEAD
     {"typeahead",           (PyCFunction)PyCurses_TypeAhead, METH_VARARGS},
+#endif
     {"unctrl",              (PyCFunction)PyCurses_UnCtrl, METH_VARARGS},
     {"ungetch",             (PyCFunction)PyCurses_UngetCh, METH_VARARGS},
 #if defined(HAVE_CURSES_RESIZETERM) || defined(HAVE_CURSES_RESIZE_TERM)
@@ -3307,7 +3316,9 @@ static PyMethodDef PyCurses_methods[] = {
 #ifdef HAVE_NCURSESW
     {"unget_wch",           (PyCFunction)PyCurses_Unget_Wch, METH_VARARGS},
 #endif
+#ifdef HAVE_CURSES_USE_ENV
     {"use_env",             (PyCFunction)PyCurses_Use_Env, METH_VARARGS},
+#endif
 #ifndef STRICT_SYSV_CURSES
     {"use_default_colors",  (PyCFunction)PyCurses_Use_Default_Colors, METH_NOARGS},
 #endif
@@ -3385,9 +3396,7 @@ PyInit__curses(void)
     SetDictInt("A_DIM",                 A_DIM);
     SetDictInt("A_BOLD",                A_BOLD);
     SetDictInt("A_ALTCHARSET",          A_ALTCHARSET);
-#if !defined(__NetBSD__)
     SetDictInt("A_INVIS",           A_INVIS);
-#endif
     SetDictInt("A_PROTECT",         A_PROTECT);
     SetDictInt("A_CHARTEXT",        A_CHARTEXT);
     SetDictInt("A_COLOR",           A_COLOR);
@@ -3459,7 +3468,6 @@ PyInit__curses(void)
         int key;
         char *key_n;
         char *key_n2;
-#if !defined(__NetBSD__)
         for (key=KEY_MIN;key < KEY_MAX; key++) {
             key_n = (char *)keyname(key);
             if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
@@ -3487,7 +3495,6 @@ PyInit__curses(void)
             if (key_n2 != key_n)
                 PyMem_Free(key_n2);
         }
-#endif
         SetDictInt("KEY_MIN", KEY_MIN);
         SetDictInt("KEY_MAX", KEY_MAX);
     }
diff --git a/configure b/configure
index 0b950502d2b..37f68ed71b8 100755
--- a/configure
+++ b/configure
@@ -16012,6 +16012,186 @@ $as_echo "no" >&6; }
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for immedok" >&5
+$as_echo_n "checking for immedok... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef immedok
+void *x=immedok
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_IMMEDOK 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for syncok" >&5
+$as_echo_n "checking for syncok... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef syncok
+void *x=syncok
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_SYNCOK 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for filter" >&5
+$as_echo_n "checking for filter... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef filter
+void *x=filter
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_FILTER 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for has_key" >&5
+$as_echo_n "checking for has_key... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef has_key
+void *x=has_key
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_HAS_KEY 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for typeahead" >&5
+$as_echo_n "checking for typeahead... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef typeahead
+void *x=typeahead
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_TYPEAHEAD 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for use_env" >&5
+$as_echo_n "checking for use_env... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef use_env
+void *x=use_env
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_USE_ENV 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # last curses configure check
 CPPFLAGS=$ac_save_cppflags
 
diff --git a/configure.ac b/configure.ac
index 056c5db4a68..8f33096332c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5030,6 +5030,72 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[void *x=resizeterm
    AC_MSG_RESULT(yes)],
   [AC_MSG_RESULT(no)]
 )
+
+AC_MSG_CHECKING(for immedok)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef immedok
+void *x=immedok
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_IMMEDOK, 1, Define if you have the 'immedok' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
+
+AC_MSG_CHECKING(for syncok)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef syncok
+void *x=syncok
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_SYNCOK, 1, Define if you have the 'syncok' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
+
+AC_MSG_CHECKING(for filter)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef filter
+void *x=filter
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_FILTER, 1, Define if you have the 'filter' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
+
+AC_MSG_CHECKING(for has_key)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef has_key
+void *x=has_key
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_HAS_KEY, 1, Define if you have the 'has_key' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
+
+AC_MSG_CHECKING(for typeahead)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef typeahead
+void *x=typeahead
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_TYPEAHEAD, 1, Define if you have the 'typeahead' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
+
+AC_MSG_CHECKING(for use_env)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef use_env
+void *x=use_env
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_USE_ENV, 1, Define if you have the 'use_env' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
 # last curses configure check
 CPPFLAGS=$ac_save_cppflags
 
diff --git a/pyconfig.h.in b/pyconfig.h.in
index cdcb5704a85..e93bfe56c6c 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -146,9 +146,18 @@
 /* Define if you have the 'ctermid_r' function. */
 #undef HAVE_CTERMID_R
 
+/* Define if you have the 'filter' function. */
+#undef HAVE_CURSES_FILTER
+
 /* Define to 1 if you have the <curses.h> header file. */
 #undef HAVE_CURSES_H
 
+/* Define if you have the 'has_key' function. */
+#undef HAVE_CURSES_HAS_KEY
+
+/* Define if you have the 'immedok' function. */
+#undef HAVE_CURSES_IMMEDOK
+
 /* Define if you have the 'is_term_resized' function. */
 #undef HAVE_CURSES_IS_TERM_RESIZED
 
@@ -158,6 +167,15 @@
 /* Define if you have the 'resize_term' function. */
 #undef HAVE_CURSES_RESIZE_TERM
 
+/* Define if you have the 'syncok' function. */
+#undef HAVE_CURSES_SYNCOK
+
+/* Define if you have the 'typeahead' function. */
+#undef HAVE_CURSES_TYPEAHEAD
+
+/* Define if you have the 'use_env' function. */
+#undef HAVE_CURSES_USE_ENV
+
 /* Define to 1 if you have the declaration of `isfinite', and to 0 if you
    don't. */
 #undef HAVE_DECL_ISFINITE


From webhook-mailer at python.org  Tue Oct 31 08:46:17 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 31 Oct 2017 12:46:17 -0000
Subject: [Python-checkins] bpo-31893: Fixed select.kqueue(). (GH-4166)
 (#4190)
Message-ID: <mailman.34.1509453980.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/f9a639b97c760f40d022223c7655053c89752850
commit: f9a639b97c760f40d022223c7655053c89752850
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-31T14:46:15+02:00
summary:

bpo-31893: Fixed select.kqueue(). (GH-4166) (#4190)

* Fixed the layout of the kqueue_event structure on OpenBSD and NetBSD.
* Fixed the comparison of the kqueue_event objects.
(cherry picked from commit b9052a0f91d2e83bbc27267247a5920c82b242a3)

files:
A Misc/NEWS.d/next/Library/2017-10-29-13-51-01.bpo-31893.8LZKEz.rst
M Modules/selectmodule.c

diff --git a/Misc/NEWS.d/next/Library/2017-10-29-13-51-01.bpo-31893.8LZKEz.rst b/Misc/NEWS.d/next/Library/2017-10-29-13-51-01.bpo-31893.8LZKEz.rst
new file mode 100644
index 00000000000..46be7fb3731
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-29-13-51-01.bpo-31893.8LZKEz.rst
@@ -0,0 +1,2 @@
+Fixed the layout of the kqueue_event structure on OpenBSD and NetBSD. Fixed
+the comparison of the kqueue_event objects.
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 1de8bf7e4d5..3b9c4d65c1d 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1780,40 +1780,73 @@ static PyTypeObject kqueue_queue_Type;
 #elif (SIZEOF_UINTPTR_T == SIZEOF_LONG_LONG)
 #   define T_UINTPTRT         T_ULONGLONG
 #   define T_INTPTRT          T_LONGLONG
-#   define PyLong_AsUintptr_t PyLong_AsUnsignedLongLong
 #   define UINTPTRT_FMT_UNIT  "K"
 #   define INTPTRT_FMT_UNIT   "L"
 #elif (SIZEOF_UINTPTR_T == SIZEOF_LONG)
 #   define T_UINTPTRT         T_ULONG
 #   define T_INTPTRT          T_LONG
-#   define PyLong_AsUintptr_t PyLong_AsUnsignedLong
 #   define UINTPTRT_FMT_UNIT  "k"
 #   define INTPTRT_FMT_UNIT   "l"
 #elif (SIZEOF_UINTPTR_T == SIZEOF_INT)
 #   define T_UINTPTRT         T_UINT
 #   define T_INTPTRT          T_INT
-#   define PyLong_AsUintptr_t PyLong_AsUnsignedLong
 #   define UINTPTRT_FMT_UNIT  "I"
 #   define INTPTRT_FMT_UNIT   "i"
 #else
 #   error uintptr_t does not match int, long, or long long!
 #endif
 
+#if SIZEOF_LONG_LONG == 8
+#   define T_INT64          T_LONGLONG
+#   define INT64_FMT_UNIT   "L"
+#elif SIZEOF_LONG == 8
+#   define T_INT64          T_LONG
+#   define INT64_FMT_UNIT   "l"
+#elif SIZEOF_INT == 8
+#   define T_INT64          T_INT
+#   define INT64_FMT_UNIT   "i"
+#else
+#   define INT64_FMT_UNIT   "_"
+#endif
+
+#if SIZEOF_LONG_LONG == 4
+#   define T_UINT32         T_ULONGLONG
+#   define UINT32_FMT_UNIT  "K"
+#elif SIZEOF_LONG == 4
+#   define T_UINT32         T_ULONG
+#   define UINT32_FMT_UNIT  "k"
+#elif SIZEOF_INT == 4
+#   define T_UINT32         T_UINT
+#   define UINT32_FMT_UNIT  "I"
+#else
+#   define UINT32_FMT_UNIT  "_"
+#endif
+
 /*
  * kevent is not standard and its members vary across BSDs.
  */
-#if !defined(__OpenBSD__)
-#   define IDENT_TYPE  T_UINTPTRT
-#   define IDENT_CAST  intptr_t
-#   define DATA_TYPE   T_INTPTRT
-#   define DATA_FMT_UNIT INTPTRT_FMT_UNIT
-#   define IDENT_AsType PyLong_AsUintptr_t
+#ifdef __NetBSD__
+#   define FILTER_TYPE      T_UINT32
+#   define FILTER_FMT_UNIT  UINT32_FMT_UNIT
+#   define FLAGS_TYPE       T_UINT32
+#   define FLAGS_FMT_UNIT   UINT32_FMT_UNIT
+#   define FFLAGS_TYPE      T_UINT32
+#   define FFLAGS_FMT_UNIT  UINT32_FMT_UNIT
 #else
-#   define IDENT_TYPE  T_UINT
-#   define IDENT_CAST  int
-#   define DATA_TYPE   T_INT
-#   define DATA_FMT_UNIT "i"
-#   define IDENT_AsType PyLong_AsUnsignedLong
+#   define FILTER_TYPE      T_SHORT
+#   define FILTER_FMT_UNIT  "h"
+#   define FLAGS_TYPE       T_USHORT
+#   define FLAGS_FMT_UNIT   "H"
+#   define FFLAGS_TYPE      T_UINT
+#   define FFLAGS_FMT_UNIT  "I"
+#endif
+
+#ifdef __FreeBSD__
+#   define DATA_TYPE        T_INTPTRT
+#   define DATA_FMT_UNIT    INTPTR_FMT_UNIT
+#else
+#   define DATA_TYPE        T_INT64
+#   define DATA_FMT_UNIT    INT64_FMT_UNIT
 #endif
 
 /* Unfortunately, we can't store python objects in udata, because
@@ -1823,9 +1856,9 @@ static PyTypeObject kqueue_queue_Type;
 
 #define KQ_OFF(x) offsetof(kqueue_event_Object, x)
 static struct PyMemberDef kqueue_event_members[] = {
-    {"ident",           IDENT_TYPE,     KQ_OFF(e.ident)},
-    {"filter",          T_SHORT,        KQ_OFF(e.filter)},
-    {"flags",           T_USHORT,       KQ_OFF(e.flags)},
+    {"ident",           T_UINTPTRT,     KQ_OFF(e.ident)},
+    {"filter",          FILTER_TYPE,    KQ_OFF(e.filter)},
+    {"flags",           FLAGS_TYPE,     KQ_OFF(e.flags)},
     {"fflags",          T_UINT,         KQ_OFF(e.fflags)},
     {"data",            DATA_TYPE,      KQ_OFF(e.data)},
     {"udata",           T_UINTPTRT,     KQ_OFF(e.udata)},
@@ -1841,9 +1874,9 @@ kqueue_event_repr(kqueue_event_Object *s)
     PyOS_snprintf(
         buf, sizeof(buf),
         "<select.kevent ident=%zu filter=%d flags=0x%x fflags=0x%x "
-        "data=0x%zd udata=%p>",
-        (size_t)(s->e.ident), s->e.filter, s->e.flags,
-        s->e.fflags, (Py_ssize_t)(s->e.data), s->e.udata);
+        "data=0x%llx udata=%p>",
+        (size_t)(s->e.ident), (int)s->e.filter, (unsigned int)s->e.flags,
+        (unsigned int)s->e.fflags, (long long)(s->e.data), (void *)s->e.udata);
     return PyUnicode_FromString(buf);
 }
 
@@ -1853,7 +1886,9 @@ kqueue_event_init(kqueue_event_Object *self, PyObject *args, PyObject *kwds)
     PyObject *pfd;
     static char *kwlist[] = {"ident", "filter", "flags", "fflags",
                              "data", "udata", NULL};
-    static const char fmt[] = "O|hHI" DATA_FMT_UNIT UINTPTRT_FMT_UNIT ":kevent";
+    static const char fmt[] = "O|"
+                FILTER_FMT_UNIT FLAGS_FMT_UNIT FFLAGS_FMT_UNIT DATA_FMT_UNIT
+                UINTPTRT_FMT_UNIT ":kevent";
 
     EV_SET(&(self->e), 0, EVFILT_READ, EV_ADD, 0, 0, 0); /* defaults */
 
@@ -1863,12 +1898,8 @@ kqueue_event_init(kqueue_event_Object *self, PyObject *args, PyObject *kwds)
         return -1;
     }
 
-    if (PyLong_Check(pfd)
-#if IDENT_TYPE == T_UINT
-        && PyLong_AsUnsignedLong(pfd) <= UINT_MAX
-#endif
-    ) {
-        self->e.ident = IDENT_AsType(pfd);
+    if (PyLong_Check(pfd)) {
+        self->e.ident = PyLong_AsSize_t(pfd);
     }
     else {
         self->e.ident = PyObject_AsFileDescriptor(pfd);
@@ -1883,28 +1914,21 @@ static PyObject *
 kqueue_event_richcompare(kqueue_event_Object *s, kqueue_event_Object *o,
                          int op)
 {
-    intptr_t result = 0;
+    int result;
 
     if (!kqueue_event_Check(o)) {
-        if (op == Py_EQ || op == Py_NE) {
-            PyObject *res = op == Py_EQ ? Py_False : Py_True;
-            Py_INCREF(res);
-            return res;
-        }
-        PyErr_Format(PyExc_TypeError,
-            "can't compare %.200s to %.200s",
-            Py_TYPE(s)->tp_name, Py_TYPE(o)->tp_name);
-        return NULL;
-    }
-    if (((result = (IDENT_CAST)(s->e.ident - o->e.ident)) == 0) &&
-        ((result = s->e.filter - o->e.filter) == 0) &&
-        ((result = s->e.flags - o->e.flags) == 0) &&
-        ((result = (int)(s->e.fflags - o->e.fflags)) == 0) &&
-        ((result = s->e.data - o->e.data) == 0) &&
-        ((result = s->e.udata - o->e.udata) == 0)
-       ) {
-        result = 0;
-    }
+        Py_RETURN_NOTIMPLEMENTED;
+    }
+
+#define CMP(a, b) ((a) != (b)) ? ((a) < (b) ? -1 : 1)
+    result = CMP(s->e.ident, o->e.ident)
+           : CMP(s->e.filter, o->e.filter)
+           : CMP(s->e.flags, o->e.flags)
+           : CMP(s->e.fflags, o->e.fflags)
+           : CMP(s->e.data, o->e.data)
+           : CMP((intptr_t)s->e.udata, (intptr_t)o->e.udata)
+           : 0;
+#undef CMP
 
     switch (op) {
     case Py_EQ:


From webhook-mailer at python.org  Tue Oct 31 09:58:38 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 31 Oct 2017 13:58:38 -0000
Subject: [Python-checkins] bpo-31626: Fixed a bug in debug memory allocator.
 (GH-3844) (#4191)
Message-ID: <mailman.35.1509458327.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/ece5659565e083baaee4d185ce181a98aaee7f96
commit: ece5659565e083baaee4d185ce181a98aaee7f96
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-31T15:58:33+02:00
summary:

bpo-31626: Fixed a bug in debug memory allocator. (GH-3844) (#4191)

Removed a code that incorrectly detected in-place resizing in realloc()
 and wrote to freed memory.
(cherry picked from commit b484d5606ca76f9bbd0f5de7a6ef753400213e94)

files:
A Misc/NEWS.d/next/Core and Builtins/2017-10-01-15-48-03.bpo-31626.reLPxY.rst
M Objects/obmalloc.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-01-15-48-03.bpo-31626.reLPxY.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-01-15-48-03.bpo-31626.reLPxY.rst
new file mode 100644
index 00000000000..51026a31914
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-01-15-48-03.bpo-31626.reLPxY.rst	
@@ -0,0 +1,2 @@
+Fixed a bug in debug memory allocator.  There was a write to freed memory
+after shrinking a memory block.
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 32e7ecbe1e0..38f267e347f 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1914,7 +1914,7 @@ static void *
 _PyMem_DebugRawRealloc(void *ctx, void *p, size_t nbytes)
 {
     debug_alloc_api_t *api = (debug_alloc_api_t *)ctx;
-    uint8_t *q = (uint8_t *)p, *oldq;
+    uint8_t *q = (uint8_t *)p;
     uint8_t *tail;
     size_t total;       /* nbytes + 4*SST */
     size_t original_nbytes;
@@ -1931,20 +1931,11 @@ _PyMem_DebugRawRealloc(void *ctx, void *p, size_t nbytes)
         /* overflow:  can't represent total as a Py_ssize_t */
         return NULL;
 
-    /* Resize and add decorations. We may get a new pointer here, in which
-     * case we didn't get the chance to mark the old memory with DEADBYTE,
-     * but we live with that.
-     */
-    oldq = q;
+    /* Resize and add decorations. */
     q = (uint8_t *)api->alloc.realloc(api->alloc.ctx, q - 2*SST, total);
     if (q == NULL)
         return NULL;
 
-    if (q == oldq && nbytes < original_nbytes) {
-        /* shrinking:  mark old extra memory dead */
-        memset(q + nbytes, DEADBYTE, original_nbytes - nbytes);
-    }
-
     write_size_t(q, nbytes);
     assert(q[SST] == (uint8_t)api->api_id);
     for (i = 1; i < SST; ++i)


From webhook-mailer at python.org  Tue Oct 31 09:58:58 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 31 Oct 2017 13:58:58 -0000
Subject: [Python-checkins] bpo-31897: Convert unexpected errors when read
 bogus binary plists into InvalidFileException. (GH-4171) (#4192)
Message-ID: <mailman.36.1509458343.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/6969d368c43d4c97e5f7b7b22904305ec68f79ba
commit: 6969d368c43d4c97e5f7b7b22904305ec68f79ba
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-31T15:58:55+02:00
summary:

bpo-31897: Convert unexpected errors when read bogus binary plists into InvalidFileException. (GH-4171) (#4192)

(cherry picked from commit db91e0fe2417f075693a194a492b1699829871e7)

files:
A Misc/NEWS.d/next/Library/2017-10-30-11-04-56.bpo-31897.yjwdEb.rst
M Lib/plistlib.py
M Lib/test/test_plistlib.py

diff --git a/Lib/plistlib.py b/Lib/plistlib.py
index 09be5fd369c..9cfc7949681 100644
--- a/Lib/plistlib.py
+++ b/Lib/plistlib.py
@@ -622,7 +622,8 @@ def parse(self, fp):
             self._object_offsets = self._read_ints(num_objects, offset_size)
             return self._read_object(self._object_offsets[top_object])
 
-        except (OSError, IndexError, struct.error):
+        except (OSError, IndexError, struct.error, OverflowError,
+                UnicodeDecodeError):
             raise InvalidFileException()
 
     def _get_size(self, tokenL):
@@ -640,6 +641,8 @@ def _read_ints(self, n, size):
         if size in _BINARY_FORMAT:
             return struct.unpack('>' + _BINARY_FORMAT[size] * n, data)
         else:
+            if not size or len(data) != size * n:
+                raise InvalidFileException()
             return tuple(int.from_bytes(data[i: i + size], 'big')
                          for i in range(0, size * n, size))
 
diff --git a/Lib/test/test_plistlib.py b/Lib/test/test_plistlib.py
index c77a6bf9d03..4c9ba4c3eaa 100644
--- a/Lib/test/test_plistlib.py
+++ b/Lib/test/test_plistlib.py
@@ -354,11 +354,13 @@ def test_controlcharacters(self):
             testString = "string containing %s" % c
             if i >= 32 or c in "\r\n\t":
                 # \r, \n and \t are the only legal control chars in XML
-                plistlib.dumps(testString, fmt=plistlib.FMT_XML)
+                data = plistlib.dumps(testString, fmt=plistlib.FMT_XML)
+                if c != "\r":
+                    self.assertEqual(plistlib.loads(data), testString)
             else:
-                self.assertRaises(ValueError,
-                                  plistlib.dumps,
-                                  testString)
+                with self.assertRaises(ValueError):
+                    plistlib.dumps(testString, fmt=plistlib.FMT_XML)
+            plistlib.dumps(testString, fmt=plistlib.FMT_BINARY)
 
     def test_non_bmp_characters(self):
         pl = {'python': '\U0001f40d'}
@@ -367,6 +369,14 @@ def test_non_bmp_characters(self):
                 data = plistlib.dumps(pl, fmt=fmt)
                 self.assertEqual(plistlib.loads(data), pl)
 
+    def test_lone_surrogates(self):
+        for fmt in ALL_FORMATS:
+            with self.subTest(fmt=fmt):
+                with self.assertRaises(UnicodeEncodeError):
+                    plistlib.dumps('\ud8ff', fmt=fmt)
+                with self.assertRaises(UnicodeEncodeError):
+                    plistlib.dumps('\udcff', fmt=fmt)
+
     def test_nondictroot(self):
         for fmt in ALL_FORMATS:
             with self.subTest(fmt=fmt):
@@ -443,6 +453,56 @@ def test_large_timestamp(self):
                 data = plistlib.dumps(d, fmt=plistlib.FMT_BINARY)
                 self.assertEqual(plistlib.loads(data), d)
 
+    def test_invalid_binary(self):
+        for data in [
+                # too short data
+                b'',
+                # too large offset_table_offset and nonstandard offset_size
+                b'\x00\x08'
+                b'\x00\x00\x00\x00\x00\x00\x03\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x2a',
+                # integer overflow in offset_table_offset
+                b'\x00\x08'
+                b'\x00\x00\x00\x00\x00\x00\x01\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+                b'\xff\xff\xff\xff\xff\xff\xff\xff',
+                # offset_size = 0
+                b'\x00\x08'
+                b'\x00\x00\x00\x00\x00\x00\x00\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x09',
+                # ref_size = 0
+                b'\xa1\x01\x00\x08\x0a'
+                b'\x00\x00\x00\x00\x00\x00\x01\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x02'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x0b',
+                # integer overflow in offset
+                b'\x00\xff\xff\xff\xff\xff\xff\xff\xff'
+                b'\x00\x00\x00\x00\x00\x00\x08\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x09',
+                # invalid ASCII
+                b'\x51\xff\x08'
+                b'\x00\x00\x00\x00\x00\x00\x01\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x0a',
+                # invalid UTF-16
+                b'\x61\xd8\x00\x08'
+                b'\x00\x00\x00\x00\x00\x00\x01\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x01'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x0b',
+                ]:
+            with self.assertRaises(plistlib.InvalidFileException):
+                plistlib.loads(b'bplist00' + data, fmt=plistlib.FMT_BINARY)
+
 
 class TestPlistlibDeprecated(unittest.TestCase):
     def test_io_deprecated(self):
diff --git a/Misc/NEWS.d/next/Library/2017-10-30-11-04-56.bpo-31897.yjwdEb.rst b/Misc/NEWS.d/next/Library/2017-10-30-11-04-56.bpo-31897.yjwdEb.rst
new file mode 100644
index 00000000000..229472cb489
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-30-11-04-56.bpo-31897.yjwdEb.rst
@@ -0,0 +1,2 @@
+plistlib now catches more errors when read binary plists and raises
+InvalidFileException instead of unexpected exceptions.


From webhook-mailer at python.org  Tue Oct 31 10:12:40 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 31 Oct 2017 14:12:40 -0000
Subject: [Python-checkins] [2.7] bpo-31891: Fix building the curses module
 on NetBSD. (GH-4165). (#4194)
Message-ID: <mailman.37.1509459162.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/e0fc1af67acb5684ae780128fbdb3c5419af51db
commit: e0fc1af67acb5684ae780128fbdb3c5419af51db
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T16:12:35+02:00
summary:

[2.7] bpo-31891: Fix building the curses module on NetBSD. (GH-4165). (#4194)

(cherry picked from commit baac01e629d90f63dfde6b5cc433f4bc65c5feeb)

files:
A Misc/NEWS.d/next/Library/2017-10-29-11-23-24.bpo-31891.9kAPha.rst
M Include/py_curses.h
M Lib/test/test_curses.py
M Modules/_cursesmodule.c
M configure
M configure.ac
M pyconfig.h.in

diff --git a/Include/py_curses.h b/Include/py_curses.h
index 657816cbd32..67b958c1463 100644
--- a/Include/py_curses.h
+++ b/Include/py_curses.h
@@ -7,7 +7,7 @@
 ** On Mac OS X 10.2 [n]curses.h and stdlib.h use different guards
 ** against multiple definition of wchar_t.
 */
-#ifdef	_BSD_WCHAR_T_DEFINED_
+#ifdef _BSD_WCHAR_T_DEFINED_
 #define _WCHAR_T
 #endif
 
@@ -22,7 +22,7 @@
 ** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards
 ** against multiple definition of wchar_t and wint_t.
 */
-#ifdef	_XOPEN_SOURCE_EXTENDED
+#ifdef _XOPEN_SOURCE_EXTENDED
 #ifndef __FreeBSD_version
 #include <osreldate.h>
 #endif
@@ -48,10 +48,6 @@
 #include <ncurses.h>
 #else
 #include <curses.h>
-#ifdef HAVE_TERM_H
-/* for tigetstr, which is not declared in SysV curses */
-#include <term.h>
-#endif
 #endif
 
 #ifdef HAVE_NCURSES_H
@@ -74,11 +70,11 @@ extern "C" {
 /* Type declarations */
 
 typedef struct {
-	PyObject_HEAD
-	WINDOW *win;
+    PyObject_HEAD
+    WINDOW *win;
 } PyCursesWindowObject;
 
-#define PyCursesWindow_Check(v)	 (Py_TYPE(v) == &PyCursesWindow_Type)
+#define PyCursesWindow_Check(v)  (Py_TYPE(v) == &PyCursesWindow_Type)
 
 #define PyCurses_CAPSULE_NAME "_curses._C_API"
 
diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index 743e56ec9cf..0ee8f058c03 100644
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -26,9 +26,12 @@
 
 # If either of these don't exist, skip the tests.
 curses = import_module('curses')
-import_module('curses.panel')
 import_module('curses.ascii')
 import_module('curses.textpad')
+try:
+    import curses.panel
+except ImportError:
+    pass
 
 def requires_curses_func(name):
     return unittest.skipUnless(hasattr(curses, name),
@@ -137,7 +140,8 @@ def test_window_funcs(self):
 
         stdscr.idcok(1)
         stdscr.idlok(1)
-        stdscr.immedok(1)
+        if hasattr(stdscr, 'immedok'):
+            stdscr.immedok(1)
         stdscr.insch('c')
         stdscr.insdelln(1)
         stdscr.insnstr('abc', 3)
@@ -171,7 +175,8 @@ def test_window_funcs(self):
         stdscr.setscrreg(10,15)
         win3 = stdscr.subwin(10,10)
         win3 = stdscr.subwin(10,10, 5,5)
-        stdscr.syncok(1)
+        if hasattr(stdscr, 'syncok'):
+            stdscr.syncok(1)
         stdscr.timeout(5)
         stdscr.touchline(5,5)
         stdscr.touchline(5,5,0)
@@ -201,14 +206,18 @@ def test_module_funcs(self):
         "Test module-level functions"
         for func in [curses.baudrate, curses.beep, curses.can_change_color,
                      curses.cbreak, curses.def_prog_mode, curses.doupdate,
-                     curses.filter, curses.flash, curses.flushinp,
+                     curses.flash, curses.flushinp,
                      curses.has_colors, curses.has_ic, curses.has_il,
                      curses.isendwin, curses.killchar, curses.longname,
                      curses.nocbreak, curses.noecho, curses.nonl,
                      curses.noqiflush, curses.noraw,
                      curses.reset_prog_mode, curses.termattrs,
-                     curses.termname, curses.erasechar, curses.getsyx]:
+                     curses.termname, curses.erasechar]:
             func()
+        if hasattr(curses, 'filter'):
+            curses.filter()
+        if hasattr(curses, 'getsyx'):
+            curses.getsyx()
 
         # Functions that actually need arguments
         if curses.tigetstr("cnorm"):
@@ -232,15 +241,18 @@ def test_module_funcs(self):
         curses.putp(b'abc')
         curses.qiflush()
         curses.raw() ; curses.raw(1)
-        curses.setsyx(5,5)
+        if hasattr(curses, 'setsyx'):
+            curses.setsyx(5,5)
         curses.tigetflag('hc')
         curses.tigetnum('co')
         curses.tigetstr('cr')
         curses.tparm(b'cr')
-        curses.typeahead(sys.__stdin__.fileno())
+        if hasattr(curses, 'typeahead'):
+            curses.typeahead(sys.__stdin__.fileno())
         curses.unctrl('a')
         curses.ungetch('a')
-        curses.use_env(1)
+        if hasattr(curses, 'use_env'):
+            curses.use_env(1)
 
     # Functions only available on a few platforms
     def test_colors_funcs(self):
@@ -274,6 +286,7 @@ def test_getmouse(self):
         curses.ungetmouse(0, 0, 0, 0, curses.BUTTON1_PRESSED)
         m = curses.getmouse()
 
+    @requires_curses_func('panel')
     def test_userptr_without_set(self):
         w = curses.newwin(10, 10)
         p = curses.panel.new_panel(w)
@@ -282,6 +295,7 @@ def test_userptr_without_set(self):
                                msg='userptr should fail since not set'):
             p.userptr()
 
+    @requires_curses_func('panel')
     def test_userptr_memory_leak(self):
         w = curses.newwin(10, 10)
         p = curses.panel.new_panel(w)
@@ -294,6 +308,7 @@ def test_userptr_memory_leak(self):
         self.assertEqual(sys.getrefcount(obj), nrefs,
                          "set_userptr leaked references")
 
+    @requires_curses_func('panel')
     def test_userptr_segfault(self):
         panel = curses.panel.new_panel(self.stdscr)
         class A:
@@ -302,6 +317,7 @@ def __del__(self):
         panel.set_userptr(A())
         panel.set_userptr(None)
 
+    @requires_curses_func('panel')
     def test_new_curses_panel(self):
         panel = curses.panel.new_panel(self.stdscr)
         self.assertRaises(TypeError, type(panel))
diff --git a/Misc/NEWS.d/next/Library/2017-10-29-11-23-24.bpo-31891.9kAPha.rst b/Misc/NEWS.d/next/Library/2017-10-29-11-23-24.bpo-31891.9kAPha.rst
new file mode 100644
index 00000000000..77b00e56906
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-29-11-23-24.bpo-31891.9kAPha.rst
@@ -0,0 +1 @@
+Fixed building the curses module on NetBSD.
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 9eab741a01d..fb51c43fe0e 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -113,13 +113,13 @@ char *PyCursesVersion = "2.2";
 #define CURSES_MODULE
 #include "py_curses.h"
 
-/*  These prototypes are in <term.h>, but including this header
-    #defines many common symbols (such as "lines") which breaks the
-    curses module in other ways.  So the code will just specify
-    explicit prototypes here. */
-extern int setupterm(char *,int,int *);
-#ifdef __sgi
+#if defined(HAVE_TERM_H) || defined(__sgi)
+/* For termname, longname, putp, tigetflag, tigetnum, tigetstr, tparm
+   which are not declared in SysV curses and for setupterm. */
 #include <term.h>
+/* Including <term.h> #defines many common symbols. */
+#undef lines
+#undef columns
 #endif
 
 #if !defined(HAVE_NCURSES_H) && (defined(sgi) || defined(__sun) || defined(SCO5))
@@ -314,7 +314,9 @@ Window_NoArgNoReturnVoidFunction(wclrtobot)
 Window_NoArgNoReturnVoidFunction(wclear)
 
 Window_OneArgNoReturnVoidFunction(idcok, int, "i;True(1) or False(0)")
+#ifdef HAVE_CURSES_IMMEDOK
 Window_OneArgNoReturnVoidFunction(immedok, int, "i;True(1) or False(0)")
+#endif
 Window_OneArgNoReturnVoidFunction(wtimeout, int, "i;delay")
 
 Window_NoArg2TupleReturnFunction(getyx, int, "ii")
@@ -324,21 +326,15 @@ Window_NoArg2TupleReturnFunction(getparyx, int, "ii")
 
 Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
 Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
-#if defined(__NetBSD__)
-Window_OneArgNoReturnVoidFunction(keypad, int, "i;True(1) or False(0)")
-#else
 Window_OneArgNoReturnFunction(keypad, int, "i;True(1) or False(0)")
-#endif
 Window_OneArgNoReturnFunction(leaveok, int, "i;True(1) or False(0)")
-#if defined(__NetBSD__)
-Window_OneArgNoReturnVoidFunction(nodelay, int, "i;True(1) or False(0)")
-#else
 Window_OneArgNoReturnFunction(nodelay, int, "i;True(1) or False(0)")
-#endif
 Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
 Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
 Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
+#ifdef HAVE_CURSES_SYNCOK
 Window_OneArgNoReturnFunction(syncok, int, "i;True(1) or False(0)")
+#endif
 
 Window_TwoArgNoReturnFunction(mvwin, int, "ii;y,x")
 Window_TwoArgNoReturnFunction(mvderwin, int, "ii;y,x")
@@ -894,12 +890,7 @@ PyCursesWindow_GetKey(PyCursesWindowObject *self, PyObject *args)
     } else if (rtn<=255) {
         return Py_BuildValue("c", rtn);
     } else {
-        const char *knp;
-#if defined(__NetBSD__)
-        knp = unctrl(rtn);
-#else
-        knp = keyname(rtn);
-#endif
+        const char *knp = keyname(rtn);
         return PyString_FromString((knp == NULL) ? "" : knp);
     }
 }
@@ -1598,7 +1589,9 @@ static PyMethodDef PyCursesWindow_Methods[] = {
     {"hline",           (PyCFunction)PyCursesWindow_Hline, METH_VARARGS},
     {"idcok",           (PyCFunction)PyCursesWindow_idcok, METH_VARARGS},
     {"idlok",           (PyCFunction)PyCursesWindow_idlok, METH_VARARGS},
+#ifdef HAVE_CURSES_IMMEDOK
     {"immedok",         (PyCFunction)PyCursesWindow_immedok, METH_VARARGS},
+#endif
     {"inch",            (PyCFunction)PyCursesWindow_InCh, METH_VARARGS},
     {"insch",           (PyCFunction)PyCursesWindow_InsCh, METH_VARARGS},
     {"insdelln",        (PyCFunction)PyCursesWindow_winsdelln, METH_VARARGS},
@@ -1636,7 +1629,9 @@ static PyMethodDef PyCursesWindow_Methods[] = {
     {"subpad",          (PyCFunction)PyCursesWindow_SubWin, METH_VARARGS},
     {"subwin",          (PyCFunction)PyCursesWindow_SubWin, METH_VARARGS},
     {"syncdown",        (PyCFunction)PyCursesWindow_wsyncdown, METH_NOARGS},
+#ifdef HAVE_CURSES_SYNCOK
     {"syncok",          (PyCFunction)PyCursesWindow_syncok, METH_VARARGS},
+#endif
     {"syncup",          (PyCFunction)PyCursesWindow_wsyncup, METH_NOARGS},
     {"timeout",         (PyCFunction)PyCursesWindow_wtimeout, METH_VARARGS},
     {"touchline",       (PyCFunction)PyCursesWindow_TouchLine, METH_VARARGS},
@@ -1710,6 +1705,7 @@ NoArgTrueFalseFunction(isendwin)
 NoArgNoReturnVoidFunction(flushinp)
 NoArgNoReturnVoidFunction(noqiflush)
 
+#ifdef HAVE_CURSES_FILTER
 static PyObject *
 PyCurses_filter(PyObject *self)
 {
@@ -1719,6 +1715,7 @@ PyCurses_filter(PyObject *self)
     Py_INCREF(Py_None);
     return Py_None;
 }
+#endif
 
 static PyObject *
 PyCurses_Color_Content(PyObject *self, PyObject *args)
@@ -1790,6 +1787,7 @@ PyCurses_EraseChar(PyObject *self)
     return PyString_FromStringAndSize(&ch, 1);
 }
 
+#ifdef getsyx
 static PyObject *
 PyCurses_getsyx(PyObject *self)
 {
@@ -1802,6 +1800,7 @@ PyCurses_getsyx(PyObject *self)
 
     return Py_BuildValue("(ii)", y, x);
 }
+#endif
 
 #ifdef NCURSES_MOUSE_VERSION
 static PyObject *
@@ -1873,9 +1872,9 @@ PyCurses_HalfDelay(PyObject *self, PyObject *args)
     return PyCursesCheckERR(halfdelay(tenths), "halfdelay");
 }
 
-#ifndef STRICT_SYSV_CURSES
-/* No has_key! */
-static PyObject * PyCurses_has_key(PyObject *self, PyObject *args)
+#ifdef HAVE_CURSES_HAS_KEY
+static PyObject *
+PyCurses_has_key(PyObject *self, PyObject *args)
 {
     int ch;
 
@@ -1890,7 +1889,7 @@ static PyObject * PyCurses_has_key(PyObject *self, PyObject *args)
     Py_INCREF(Py_True);
     return Py_True;
 }
-#endif /* STRICT_SYSV_CURSES */
+#endif
 
 static PyObject *
 PyCurses_Init_Color(PyObject *self, PyObject *args)
@@ -2128,7 +2127,6 @@ PyCurses_Is_Term_Resized(PyObject *self, PyObject *args)
 }
 #endif /* HAVE_CURSES_IS_TERM_RESIZED */
 
-#if !defined(__NetBSD__)
 static PyObject *
 PyCurses_KeyName(PyObject *self, PyObject *args)
 {
@@ -2147,7 +2145,6 @@ PyCurses_KeyName(PyObject *self, PyObject *args)
 
     return PyString_FromString((knp == NULL) ? "" : (char *)knp);
 }
-#endif
 
 static PyObject *
 PyCurses_KillChar(PyObject *self)
@@ -2443,6 +2440,7 @@ PyCurses_Resize_Term(PyObject *self, PyObject *args)
 }
 #endif /* HAVE_CURSES_RESIZE_TERM */
 
+#ifdef getsyx
 static PyObject *
 PyCurses_setsyx(PyObject *self, PyObject *args)
 {
@@ -2462,6 +2460,7 @@ PyCurses_setsyx(PyObject *self, PyObject *args)
     Py_INCREF(Py_None);
     return Py_None;
 }
+#endif
 
 static PyObject *
 PyCurses_Start_Color(PyObject *self)
@@ -2556,6 +2555,7 @@ PyCurses_tparm(PyObject *self, PyObject *args)
     return PyString_FromString(result);
 }
 
+#ifdef HAVE_CURSES_TYPEAHEAD
 static PyObject *
 PyCurses_TypeAhead(PyObject *self, PyObject *args)
 {
@@ -2567,6 +2567,7 @@ PyCurses_TypeAhead(PyObject *self, PyObject *args)
 
     return PyCursesCheckERR(typeahead( fd ), "typeahead");
 }
+#endif
 
 static PyObject *
 PyCurses_UnCtrl(PyObject *self, PyObject *args)
@@ -2618,6 +2619,7 @@ PyCurses_UngetCh(PyObject *self, PyObject *args)
     return PyCursesCheckERR(ungetch(ch), "ungetch");
 }
 
+#ifdef HAVE_CURSES_TYPEAHEAD
 static PyObject *
 PyCurses_Use_Env(PyObject *self, PyObject *args)
 {
@@ -2636,6 +2638,7 @@ PyCurses_Use_Env(PyObject *self, PyObject *args)
     Py_INCREF(Py_None);
     return Py_None;
 }
+#endif
 
 #ifndef STRICT_SYSV_CURSES
 static PyObject *
@@ -2674,19 +2677,23 @@ static PyMethodDef PyCurses_methods[] = {
     {"echo",                (PyCFunction)PyCurses_echo, METH_VARARGS},
     {"endwin",              (PyCFunction)PyCurses_endwin, METH_NOARGS},
     {"erasechar",           (PyCFunction)PyCurses_EraseChar, METH_NOARGS},
+#ifdef HAVE_CURSES_FILTER
     {"filter",              (PyCFunction)PyCurses_filter, METH_NOARGS},
+#endif
     {"flash",               (PyCFunction)PyCurses_flash, METH_NOARGS},
     {"flushinp",            (PyCFunction)PyCurses_flushinp, METH_NOARGS},
 #ifdef NCURSES_MOUSE_VERSION
     {"getmouse",            (PyCFunction)PyCurses_GetMouse, METH_NOARGS},
     {"ungetmouse",          (PyCFunction)PyCurses_UngetMouse, METH_VARARGS},
 #endif
+#ifdef getsyx
     {"getsyx",              (PyCFunction)PyCurses_getsyx, METH_NOARGS},
+#endif
     {"getwin",              (PyCFunction)PyCurses_GetWin, METH_O},
     {"has_colors",          (PyCFunction)PyCurses_has_colors, METH_NOARGS},
     {"has_ic",              (PyCFunction)PyCurses_has_ic, METH_NOARGS},
     {"has_il",              (PyCFunction)PyCurses_has_il, METH_NOARGS},
-#ifndef STRICT_SYSV_CURSES
+#ifdef HAVE_CURSES_HAS_KEY
     {"has_key",             (PyCFunction)PyCurses_has_key, METH_VARARGS},
 #endif
     {"halfdelay",           (PyCFunction)PyCurses_HalfDelay, METH_VARARGS},
@@ -2698,9 +2705,7 @@ static PyMethodDef PyCurses_methods[] = {
 #ifdef HAVE_CURSES_IS_TERM_RESIZED
     {"is_term_resized",     (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS},
 #endif
-#if !defined(__NetBSD__)
     {"keyname",             (PyCFunction)PyCurses_KeyName, METH_VARARGS},
-#endif
     {"killchar",            (PyCFunction)PyCurses_KillChar, METH_NOARGS},
     {"longname",            (PyCFunction)PyCurses_longname, METH_NOARGS},
     {"meta",                (PyCFunction)PyCurses_Meta, METH_VARARGS},
@@ -2732,7 +2737,9 @@ static PyMethodDef PyCurses_methods[] = {
     {"resize_term",         (PyCFunction)PyCurses_Resize_Term, METH_VARARGS},
 #endif
     {"savetty",             (PyCFunction)PyCurses_savetty, METH_NOARGS},
+#ifdef getsyx
     {"setsyx",              (PyCFunction)PyCurses_setsyx, METH_VARARGS},
+#endif
     {"setupterm",           (PyCFunction)PyCurses_setupterm,
      METH_VARARGS|METH_KEYWORDS},
     {"start_color",         (PyCFunction)PyCurses_Start_Color, METH_NOARGS},
@@ -2742,10 +2749,14 @@ static PyMethodDef PyCurses_methods[] = {
     {"tigetnum",            (PyCFunction)PyCurses_tigetnum, METH_VARARGS},
     {"tigetstr",            (PyCFunction)PyCurses_tigetstr, METH_VARARGS},
     {"tparm",               (PyCFunction)PyCurses_tparm, METH_VARARGS},
+#ifdef HAVE_CURSES_TYPEAHEAD
     {"typeahead",           (PyCFunction)PyCurses_TypeAhead, METH_VARARGS},
+#endif
     {"unctrl",              (PyCFunction)PyCurses_UnCtrl, METH_VARARGS},
     {"ungetch",             (PyCFunction)PyCurses_UngetCh, METH_VARARGS},
+#ifdef HAVE_CURSES_USE_ENV
     {"use_env",             (PyCFunction)PyCurses_Use_Env, METH_VARARGS},
+#endif
 #ifndef STRICT_SYSV_CURSES
     {"use_default_colors",  (PyCFunction)PyCurses_Use_Default_Colors, METH_NOARGS},
 #endif
@@ -2809,9 +2820,7 @@ init_curses(void)
     SetDictInt("A_DIM",                 A_DIM);
     SetDictInt("A_BOLD",                A_BOLD);
     SetDictInt("A_ALTCHARSET",          A_ALTCHARSET);
-#if !defined(__NetBSD__)
     SetDictInt("A_INVIS",           A_INVIS);
-#endif
     SetDictInt("A_PROTECT",         A_PROTECT);
     SetDictInt("A_CHARTEXT",        A_CHARTEXT);
     SetDictInt("A_COLOR",           A_COLOR);
@@ -2883,7 +2892,6 @@ init_curses(void)
         int key;
         char *key_n;
         char *key_n2;
-#if !defined(__NetBSD__)
         for (key=KEY_MIN;key < KEY_MAX; key++) {
             key_n = (char *)keyname(key);
             if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
@@ -2911,7 +2919,6 @@ init_curses(void)
             if (key_n2 != key_n)
                 free(key_n2);
         }
-#endif
         SetDictInt("KEY_MIN", KEY_MIN);
         SetDictInt("KEY_MAX", KEY_MAX);
     }
diff --git a/configure b/configure
index daa442883a8..52310f8efda 100755
--- a/configure
+++ b/configure
@@ -14754,6 +14754,186 @@ $as_echo "no" >&6; }
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for immedok" >&5
+$as_echo_n "checking for immedok... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef immedok
+void *x=immedok
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_IMMEDOK 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for syncok" >&5
+$as_echo_n "checking for syncok... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef syncok
+void *x=syncok
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_SYNCOK 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for filter" >&5
+$as_echo_n "checking for filter... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef filter
+void *x=filter
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_FILTER 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for has_key" >&5
+$as_echo_n "checking for has_key... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef has_key
+void *x=has_key
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_HAS_KEY 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for typeahead" >&5
+$as_echo_n "checking for typeahead... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef typeahead
+void *x=typeahead
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_TYPEAHEAD 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for use_env" >&5
+$as_echo_n "checking for use_env... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <curses.h>
+int
+main ()
+{
+
+#ifndef use_env
+void *x=use_env
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_CURSES_USE_ENV 1" >>confdefs.h
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # last curses configure check
 CPPFLAGS=$ac_save_cppflags
 
diff --git a/configure.ac b/configure.ac
index 8a31cc87526..2cc23cc32fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4553,6 +4553,72 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[void *x=resizeterm
    AC_MSG_RESULT(yes)],
   [AC_MSG_RESULT(no)]
 )
+
+AC_MSG_CHECKING(for immedok)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef immedok
+void *x=immedok
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_IMMEDOK, 1, Define if you have the 'immedok' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
+
+AC_MSG_CHECKING(for syncok)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef syncok
+void *x=syncok
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_SYNCOK, 1, Define if you have the 'syncok' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
+
+AC_MSG_CHECKING(for filter)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef filter
+void *x=filter
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_FILTER, 1, Define if you have the 'filter' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
+
+AC_MSG_CHECKING(for has_key)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef has_key
+void *x=has_key
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_HAS_KEY, 1, Define if you have the 'has_key' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
+
+AC_MSG_CHECKING(for typeahead)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef typeahead
+void *x=typeahead
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_TYPEAHEAD, 1, Define if you have the 'typeahead' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
+
+AC_MSG_CHECKING(for use_env)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+#ifndef use_env
+void *x=use_env
+#endif
+]])],
+  [AC_DEFINE(HAVE_CURSES_USE_ENV, 1, Define if you have the 'use_env' function.)
+   AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)]
+)
 # last curses configure check
 CPPFLAGS=$ac_save_cppflags
 
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 2815c15d391..f3a3ca092da 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -136,9 +136,18 @@
 /* Define if you have the 'ctermid_r' function. */
 #undef HAVE_CTERMID_R
 
+/* Define if you have the 'filter' function. */
+#undef HAVE_CURSES_FILTER
+
 /* Define to 1 if you have the <curses.h> header file. */
 #undef HAVE_CURSES_H
 
+/* Define if you have the 'has_key' function. */
+#undef HAVE_CURSES_HAS_KEY
+
+/* Define if you have the 'immedok' function. */
+#undef HAVE_CURSES_IMMEDOK
+
 /* Define if you have the 'is_term_resized' function. */
 #undef HAVE_CURSES_IS_TERM_RESIZED
 
@@ -148,6 +157,15 @@
 /* Define if you have the 'resize_term' function. */
 #undef HAVE_CURSES_RESIZE_TERM
 
+/* Define if you have the 'syncok' function. */
+#undef HAVE_CURSES_SYNCOK
+
+/* Define if you have the 'typeahead' function. */
+#undef HAVE_CURSES_TYPEAHEAD
+
+/* Define if you have the 'use_env' function. */
+#undef HAVE_CURSES_USE_ENV
+
 /* Define to 1 if you have the declaration of `isfinite', and to 0 if you
    don't. */
 #undef HAVE_DECL_ISFINITE


From webhook-mailer at python.org  Tue Oct 31 10:13:55 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 31 Oct 2017 14:13:55 -0000
Subject: [Python-checkins] [2.7] bpo-31893: Fixed select.kqueue(). (GH-4166)
 (#4193)
Message-ID: <mailman.38.1509459237.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/8cbf4e10646c3f5b8f0d274c2d7dea5bb6305f57
commit: 8cbf4e10646c3f5b8f0d274c2d7dea5bb6305f57
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T16:13:52+02:00
summary:

[2.7] bpo-31893: Fixed select.kqueue(). (GH-4166) (#4193)

* Fixed the layout of the kqueue_event structure on OpenBSD and NetBSD.
* Fixed the comparison of the kqueue_event objects..
(cherry picked from commit b9052a0f91d2e83bbc27267247a5920c82b242a3)

files:
A Misc/NEWS.d/next/Library/2017-10-29-13-51-01.bpo-31893.8LZKEz.rst
M Modules/selectmodule.c

diff --git a/Misc/NEWS.d/next/Library/2017-10-29-13-51-01.bpo-31893.8LZKEz.rst b/Misc/NEWS.d/next/Library/2017-10-29-13-51-01.bpo-31893.8LZKEz.rst
new file mode 100644
index 00000000000..46be7fb3731
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-29-13-51-01.bpo-31893.8LZKEz.rst
@@ -0,0 +1,2 @@
+Fixed the layout of the kqueue_event structure on OpenBSD and NetBSD. Fixed
+the comparison of the kqueue_event objects.
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index ce4c15b6946..12601713886 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1221,43 +1221,76 @@ static PyTypeObject kqueue_queue_Type;
 
 #if (SIZEOF_UINTPTR_T != SIZEOF_VOID_P)
 #   error uintptr_t does not match void *!
-#elif (SIZEOF_UINTPTR_T == SIZEOF_LONG_LONG)
+#elif defined(HAVE_LONG_LONG) && (SIZEOF_UINTPTR_T == SIZEOF_LONG_LONG)
 #   define T_UINTPTRT         T_ULONGLONG
 #   define T_INTPTRT          T_LONGLONG
-#   define PyLong_AsUintptr_t PyLong_AsUnsignedLongLong
 #   define UINTPTRT_FMT_UNIT  "K"
 #   define INTPTRT_FMT_UNIT   "L"
 #elif (SIZEOF_UINTPTR_T == SIZEOF_LONG)
 #   define T_UINTPTRT         T_ULONG
 #   define T_INTPTRT          T_LONG
-#   define PyLong_AsUintptr_t PyLong_AsUnsignedLong
 #   define UINTPTRT_FMT_UNIT  "k"
 #   define INTPTRT_FMT_UNIT   "l"
 #elif (SIZEOF_UINTPTR_T == SIZEOF_INT)
 #   define T_UINTPTRT         T_UINT
 #   define T_INTPTRT          T_INT
-#   define PyLong_AsUintptr_t PyLong_AsUnsignedLong
 #   define UINTPTRT_FMT_UNIT  "I"
 #   define INTPTRT_FMT_UNIT   "i"
 #else
 #   error uintptr_t does not match int, long, or long long!
 #endif
 
+#if defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 8
+#   define T_INT64          T_LONGLONG
+#   define INT64_FMT_UNIT   "L"
+#elif SIZEOF_LONG == 8
+#   define T_INT64          T_LONG
+#   define INT64_FMT_UNIT   "l"
+#elif SIZEOF_INT == 8
+#   define T_INT64          T_INT
+#   define INT64_FMT_UNIT   "i"
+#else
+#   define INT64_FMT_UNIT   "_"
+#endif
+
+#if defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 4
+#   define T_UINT32         T_ULONGLONG
+#   define UINT32_FMT_UNIT  "K"
+#elif SIZEOF_LONG == 4
+#   define T_UINT32         T_ULONG
+#   define UINT32_FMT_UNIT  "k"
+#elif SIZEOF_INT == 4
+#   define T_UINT32         T_UINT
+#   define UINT32_FMT_UNIT  "I"
+#else
+#   define UINT32_FMT_UNIT  "_"
+#endif
+
 /*
  * kevent is not standard and its members vary across BSDs.
  */
-#if !defined(__OpenBSD__)
-#   define IDENT_TYPE	T_UINTPTRT
-#   define IDENT_CAST	Py_intptr_t
-#   define DATA_TYPE	T_INTPTRT
-#   define DATA_FMT_UNIT INTPTRT_FMT_UNIT
-#   define IDENT_AsType	PyLong_AsUintptr_t
+#ifdef __NetBSD__
+#   define FILTER_TYPE      T_UINT32
+#   define FILTER_FMT_UNIT  UINT32_FMT_UNIT
+#   define FLAGS_TYPE       T_UINT32
+#   define FLAGS_FMT_UNIT   UINT32_FMT_UNIT
+#   define FFLAGS_TYPE      T_UINT32
+#   define FFLAGS_FMT_UNIT  UINT32_FMT_UNIT
 #else
-#   define IDENT_TYPE	T_UINT
-#   define IDENT_CAST	int
-#   define DATA_TYPE	T_INT
-#   define DATA_FMT_UNIT "i"
-#   define IDENT_AsType	PyLong_AsUnsignedLong
+#   define FILTER_TYPE      T_SHORT
+#   define FILTER_FMT_UNIT  "h"
+#   define FLAGS_TYPE       T_USHORT
+#   define FLAGS_FMT_UNIT   "H"
+#   define FFLAGS_TYPE      T_UINT
+#   define FFLAGS_FMT_UNIT  "I"
+#endif
+
+#ifdef __FreeBSD__
+#   define DATA_TYPE        T_INTPTRT
+#   define DATA_FMT_UNIT    INTPTR_FMT_UNIT
+#else
+#   define DATA_TYPE        T_INT64
+#   define DATA_FMT_UNIT    INT64_FMT_UNIT
 #endif
 
 /* Unfortunately, we can't store python objects in udata, because
@@ -1267,9 +1300,9 @@ static PyTypeObject kqueue_queue_Type;
 
 #define KQ_OFF(x) offsetof(kqueue_event_Object, x)
 static struct PyMemberDef kqueue_event_members[] = {
-    {"ident",           IDENT_TYPE,     KQ_OFF(e.ident)},
-    {"filter",          T_SHORT,        KQ_OFF(e.filter)},
-    {"flags",           T_USHORT,       KQ_OFF(e.flags)},
+    {"ident",           T_UINTPTRT,     KQ_OFF(e.ident)},
+    {"filter",          FILTER_TYPE,    KQ_OFF(e.filter)},
+    {"flags",           FLAGS_TYPE,     KQ_OFF(e.flags)},
     {"fflags",          T_UINT,         KQ_OFF(e.fflags)},
     {"data",            DATA_TYPE,      KQ_OFF(e.data)},
     {"udata",           T_UINTPTRT,     KQ_OFF(e.udata)},
@@ -1284,10 +1317,17 @@ kqueue_event_repr(kqueue_event_Object *s)
     char buf[1024];
     PyOS_snprintf(
         buf, sizeof(buf),
+#ifdef HAVE_LONG_LONG
+        "<select.kevent ident=%zu filter=%d flags=0x%x fflags=0x%x "
+        "data=0x%llx udata=%p>",
+        (size_t)(s->e.ident), (int)s->e.filter, (unsigned int)s->e.flags,
+        (unsigned int)s->e.fflags, (long long)(s->e.data), (void *)s->e.udata);
+#else
         "<select.kevent ident=%zu filter=%d flags=0x%x fflags=0x%x "
-        "data=0x%zd udata=%p>",
-        (size_t)(s->e.ident), s->e.filter, s->e.flags,
-        s->e.fflags, (Py_ssize_t)(s->e.data), s->e.udata);
+        "data=0x%llx udata=%p>",
+        (size_t)(s->e.ident), (int)s->e.filter, (unsigned int)s->e.flags,
+        (unsigned int)s->e.fflags, (long)(s->e.data), (void *)s->e.udata);
+#endif
     return PyString_FromString(buf);
 }
 
@@ -1297,7 +1337,9 @@ kqueue_event_init(kqueue_event_Object *self, PyObject *args, PyObject *kwds)
     PyObject *pfd;
     static char *kwlist[] = {"ident", "filter", "flags", "fflags",
                              "data", "udata", NULL};
-    static char *fmt = "O|hHI" DATA_FMT_UNIT UINTPTRT_FMT_UNIT ":kevent";
+    static const char fmt[] = "O|"
+                FILTER_FMT_UNIT FLAGS_FMT_UNIT FFLAGS_FMT_UNIT DATA_FMT_UNIT
+                UINTPTRT_FMT_UNIT ":kevent";
 
     EV_SET(&(self->e), 0, EVFILT_READ, EV_ADD, 0, 0, 0); /* defaults */
 
@@ -1307,12 +1349,12 @@ kqueue_event_init(kqueue_event_Object *self, PyObject *args, PyObject *kwds)
         return -1;
     }
 
-    if (PyLong_Check(pfd)
-#if IDENT_TYPE == T_UINT
-        && PyLong_AsUnsignedLong(pfd) <= UINT_MAX
-#endif
-    ) {
-        self->e.ident = IDENT_AsType(pfd);
+    if (PyInt_Check(pfd)) {
+        self->e.ident = PyInt_AsUnsignedLongMask(pfd);
+    }
+    else {
+    if (PyInt_Check(pfd) || PyLong_Check(pfd)) {
+        self->e.ident = PyLong_AsSize_t(pfd);
     }
     else {
         self->e.ident = PyObject_AsFileDescriptor(pfd);
@@ -1327,28 +1369,22 @@ static PyObject *
 kqueue_event_richcompare(kqueue_event_Object *s, kqueue_event_Object *o,
                          int op)
 {
-    Py_intptr_t result = 0;
+    int result;
 
     if (!kqueue_event_Check(o)) {
-        if (op == Py_EQ || op == Py_NE) {
-            PyObject *res = op == Py_EQ ? Py_False : Py_True;
-            Py_INCREF(res);
-            return res;
-        }
-        PyErr_Format(PyExc_TypeError,
-            "can't compare %.200s to %.200s",
-            Py_TYPE(s)->tp_name, Py_TYPE(o)->tp_name);
-        return NULL;
-    }
-    if (((result = (IDENT_CAST)(s->e.ident - o->e.ident)) == 0) &&
-        ((result = s->e.filter - o->e.filter) == 0) &&
-        ((result = s->e.flags - o->e.flags) == 0) &&
-        ((result = (int)(s->e.fflags - o->e.fflags)) == 0) &&
-        ((result = s->e.data - o->e.data) == 0) &&
-        ((result = s->e.udata - o->e.udata) == 0)
-       ) {
-        result = 0;
-    }
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    }
+
+#define CMP(a, b) ((a) != (b)) ? ((a) < (b) ? -1 : 1)
+    result = CMP(s->e.ident, o->e.ident)
+           : CMP(s->e.filter, o->e.filter)
+           : CMP(s->e.flags, o->e.flags)
+           : CMP(s->e.fflags, o->e.fflags)
+           : CMP(s->e.data, o->e.data)
+           : CMP((Py_intptr_t)s->e.udata, (Py_intptr_t)o->e.udata)
+           : 0;
+#undef CMP
 
     switch (op) {
         case Py_EQ:


From webhook-mailer at python.org  Tue Oct 31 11:41:02 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 31 Oct 2017 15:41:02 -0000
Subject: [Python-checkins] test_capi.test__testcapi() becomes more verbose
 (#4197)
Message-ID: <mailman.39.1509464463.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/e1a470bd6ae87f9501b8830caa64e7a8df0a2302
commit: e1a470bd6ae87f9501b8830caa64e7a8df0a2302
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T08:40:59-07:00
summary:

test_capi.test__testcapi() becomes more verbose (#4197)

Write the name of each subtest on a new line to help debugging when
a test does crash Python.

files:
M Lib/test/test_capi.py

diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
index 921735ef5d0..bb5b2a3b9f0 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -751,11 +751,16 @@ def callback():
 
 class Test_testcapi(unittest.TestCase):
     def test__testcapi(self):
+        if support.verbose:
+            print()
         for name in dir(_testcapi):
-            if name.startswith('test_'):
-                with self.subTest("internal", name=name):
-                    test = getattr(_testcapi, name)
-                    test()
+            if not name.startswith('test_'):
+                continue
+            with self.subTest("internal", name=name):
+                if support.verbose:
+                    print(f"  {name}", flush=True)
+                test = getattr(_testcapi, name)
+                test()
 
 
 class PyMemDebugTests(unittest.TestCase):


From webhook-mailer at python.org  Tue Oct 31 11:41:13 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 31 Oct 2017 15:41:13 -0000
Subject: [Python-checkins] pythoninfo: add Py_DEBUG (#4198)
Message-ID: <mailman.40.1509464474.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/afd055a59fe0291881fc2459215ce106e424da51
commit: afd055a59fe0291881fc2459215ce106e424da51
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T08:41:10-07:00
summary:

pythoninfo: add Py_DEBUG (#4198)

files:
M Lib/test/pythoninfo.py

diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
index 5447ab8274b..c238ef7b75c 100644
--- a/Lib/test/pythoninfo.py
+++ b/Lib/test/pythoninfo.py
@@ -115,6 +115,14 @@ def collect_sys(info_add):
             encoding = '%s/%s' % (encoding, errors)
         info_add('sys.%s.encoding' % name, encoding)
 
+    # Were we compiled --with-pydebug or with #define Py_DEBUG?
+    Py_DEBUG = hasattr(sys, 'gettotalrefcount')
+    if Py_DEBUG:
+        text = 'Yes (sys.gettotalrefcount() present)'
+    else:
+        text = 'No (sys.gettotalrefcount() missing)'
+    info_add('Py_DEBUG', text)
+
 
 def collect_platform(info_add):
     import platform


From webhook-mailer at python.org  Tue Oct 31 12:18:24 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 31 Oct 2017 16:18:24 -0000
Subject: [Python-checkins] bpo-31893: Fix errors in
 b9052a0f91d2e83bbc27267247a5920c82b242a3. (#4196)
Message-ID: <mailman.41.1509466708.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/2298fad5ff907dd48ea0fb5c71fa22334ef28c6b
commit: 2298fad5ff907dd48ea0fb5c71fa22334ef28c6b
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T18:18:21+02:00
summary:

bpo-31893: Fix errors in b9052a0f91d2e83bbc27267247a5920c82b242a3. (#4196)

* Fix a compilation error on FreeBSD.
* Fix the data attribute size on Mac OS X.

files:
M Modules/selectmodule.c

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index af265d89ff6..1cde6e849c4 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1840,12 +1840,12 @@ static PyTypeObject kqueue_queue_Type;
 #   define FFLAGS_FMT_UNIT  "I"
 #endif
 
-#ifdef __FreeBSD__
-#   define DATA_TYPE        T_INTPTRT
-#   define DATA_FMT_UNIT    INTPTR_FMT_UNIT
-#else
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 #   define DATA_TYPE        T_INT64
 #   define DATA_FMT_UNIT    INT64_FMT_UNIT
+#else
+#   define DATA_TYPE        T_INTPTRT
+#   define DATA_FMT_UNIT    INTPTRT_FMT_UNIT
 #endif
 
 /* Unfortunately, we can't store python objects in udata, because


From webhook-mailer at python.org  Tue Oct 31 12:37:30 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 31 Oct 2017 16:37:30 -0000
Subject: [Python-checkins] bpo-20064: Document PyObject_Malloc() (#4199)
Message-ID: <mailman.42.1509467854.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/ec2cbdd1dff2c51788136480b2085e77506ebf34
commit: ec2cbdd1dff2c51788136480b2085e77506ebf34
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T09:37:25-07:00
summary:

bpo-20064: Document PyObject_Malloc() (#4199)

Document the following functions:

* PyObject_Malloc()
* PyObject_Calloc()
* PyObject_Realloc()
* PyObject_Free()

Fix also PyMem_RawFree() documentation.

files:
M Doc/c-api/memory.rst

diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst
index 22b9fe2a4a4..0a5b0ef44b4 100644
--- a/Doc/c-api/memory.rst
+++ b/Doc/c-api/memory.rst
@@ -150,7 +150,7 @@ The default raw memory block allocator uses the following functions:
 
    Frees the memory block pointed to by *p*, which must have been returned by a
    previous call to :c:func:`PyMem_RawMalloc`, :c:func:`PyMem_RawRealloc` or
-   :c:func:`PyMem_RawCalloc`.  Otherwise, or if ``PyMem_Free(p)`` has been
+   :c:func:`PyMem_RawCalloc`.  Otherwise, or if ``PyMem_RawFree(p)`` has been
    called before, undefined behavior occurs.
 
    If *p* is *NULL*, no operation is performed.
@@ -263,6 +263,69 @@ versions and is therefore deprecated in extension modules.
 * ``PyMem_DEL(ptr)``
 
 
+Object allocators
+=================
+
+The following function sets, modeled after the ANSI C standard, but specifying
+behavior when requesting zero bytes, are available for allocating and releasing
+memory from the Python heap.
+
+By default, these functions use :ref:`pymalloc memory allocator <pymalloc>`.
+
+.. warning::
+
+   The :term:`GIL <global interpreter lock>` must be held when using these
+   functions.
+
+.. c:function:: void* PyObject_Malloc(size_t n)
+
+   Allocates *n* bytes and returns a pointer of type :c:type:`void\*` to the
+   allocated memory, or *NULL* if the request fails.
+
+   Requesting zero bytes returns a distinct non-*NULL* pointer if possible, as
+   if ``PyObject_Malloc(1)`` had been called instead. The memory will not have
+   been initialized in any way.
+
+
+.. c:function:: void* PyObject_Calloc(size_t nelem, size_t elsize)
+
+   Allocates *nelem* elements each whose size in bytes is *elsize* and returns
+   a pointer of type :c:type:`void\*` to the allocated memory, or *NULL* if the
+   request fails. The memory is initialized to zeros.
+
+   Requesting zero elements or elements of size zero bytes returns a distinct
+   non-*NULL* pointer if possible, as if ``PyObject_Calloc(1, 1)`` had been called
+   instead.
+
+   .. versionadded:: 3.5
+
+
+.. c:function:: void* PyObject_Realloc(void *p, size_t n)
+
+   Resizes the memory block pointed to by *p* to *n* bytes. The contents will be
+   unchanged to the minimum of the old and the new sizes.
+
+   If *p* is *NULL*, the call is equivalent to ``PyObject_Malloc(n)``; else if *n*
+   is equal to zero, the memory block is resized but is not freed, and the
+   returned pointer is non-*NULL*.
+
+   Unless *p* is *NULL*, it must have been returned by a previous call to
+   :c:func:`PyObject_Malloc`, :c:func:`PyObject_Realloc` or :c:func:`PyObject_Calloc`.
+
+   If the request fails, :c:func:`PyObject_Realloc` returns *NULL* and *p* remains
+   a valid pointer to the previous memory area.
+
+
+.. c:function:: void PyObject_Free(void *p)
+
+   Frees the memory block pointed to by *p*, which must have been returned by a
+   previous call to :c:func:`PyObject_Malloc`, :c:func:`PyObject_Realloc` or
+   :c:func:`PyObject_Calloc`.  Otherwise, or if ``PyObject_Free(p)`` has been called
+   before, undefined behavior occurs.
+
+   If *p* is *NULL*, no operation is performed.
+
+
 Customize Memory Allocators
 ===========================
 


From webhook-mailer at python.org  Tue Oct 31 12:56:18 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 31 Oct 2017 16:56:18 -0000
Subject: [Python-checkins] bpo-20064: Document PyObject_Malloc() (GH-4199)
 (#4203)
Message-ID: <mailman.43.1509468981.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/8543ce8ffd57d770b57fe653e0ab7fada1a4c343
commit: 8543ce8ffd57d770b57fe653e0ab7fada1a4c343
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-10-31T09:56:11-07:00
summary:

bpo-20064: Document PyObject_Malloc() (GH-4199) (#4203)

Document the following functions:

* PyObject_Malloc()
* PyObject_Calloc()
* PyObject_Realloc()
* PyObject_Free()

Fix also PyMem_RawFree() documentation.
(cherry picked from commit ec2cbdd1dff2c51788136480b2085e77506ebf34)

files:
M Doc/c-api/memory.rst

diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst
index 873fb2ac1d3..73bec7c95a1 100644
--- a/Doc/c-api/memory.rst
+++ b/Doc/c-api/memory.rst
@@ -150,7 +150,7 @@ The default raw memory block allocator uses the following functions:
 
    Frees the memory block pointed to by *p*, which must have been returned by a
    previous call to :c:func:`PyMem_RawMalloc`, :c:func:`PyMem_RawRealloc` or
-   :c:func:`PyMem_RawCalloc`.  Otherwise, or if ``PyMem_Free(p)`` has been
+   :c:func:`PyMem_RawCalloc`.  Otherwise, or if ``PyMem_RawFree(p)`` has been
    called before, undefined behavior occurs.
 
    If *p* is *NULL*, no operation is performed.
@@ -263,6 +263,69 @@ versions and is therefore deprecated in extension modules.
 * ``PyMem_DEL(ptr)``
 
 
+Object allocators
+=================
+
+The following function sets, modeled after the ANSI C standard, but specifying
+behavior when requesting zero bytes, are available for allocating and releasing
+memory from the Python heap.
+
+By default, these functions use :ref:`pymalloc memory allocator <pymalloc>`.
+
+.. warning::
+
+   The :term:`GIL <global interpreter lock>` must be held when using these
+   functions.
+
+.. c:function:: void* PyObject_Malloc(size_t n)
+
+   Allocates *n* bytes and returns a pointer of type :c:type:`void\*` to the
+   allocated memory, or *NULL* if the request fails.
+
+   Requesting zero bytes returns a distinct non-*NULL* pointer if possible, as
+   if ``PyObject_Malloc(1)`` had been called instead. The memory will not have
+   been initialized in any way.
+
+
+.. c:function:: void* PyObject_Calloc(size_t nelem, size_t elsize)
+
+   Allocates *nelem* elements each whose size in bytes is *elsize* and returns
+   a pointer of type :c:type:`void\*` to the allocated memory, or *NULL* if the
+   request fails. The memory is initialized to zeros.
+
+   Requesting zero elements or elements of size zero bytes returns a distinct
+   non-*NULL* pointer if possible, as if ``PyObject_Calloc(1, 1)`` had been called
+   instead.
+
+   .. versionadded:: 3.5
+
+
+.. c:function:: void* PyObject_Realloc(void *p, size_t n)
+
+   Resizes the memory block pointed to by *p* to *n* bytes. The contents will be
+   unchanged to the minimum of the old and the new sizes.
+
+   If *p* is *NULL*, the call is equivalent to ``PyObject_Malloc(n)``; else if *n*
+   is equal to zero, the memory block is resized but is not freed, and the
+   returned pointer is non-*NULL*.
+
+   Unless *p* is *NULL*, it must have been returned by a previous call to
+   :c:func:`PyObject_Malloc`, :c:func:`PyObject_Realloc` or :c:func:`PyObject_Calloc`.
+
+   If the request fails, :c:func:`PyObject_Realloc` returns *NULL* and *p* remains
+   a valid pointer to the previous memory area.
+
+
+.. c:function:: void PyObject_Free(void *p)
+
+   Frees the memory block pointed to by *p*, which must have been returned by a
+   previous call to :c:func:`PyObject_Malloc`, :c:func:`PyObject_Realloc` or
+   :c:func:`PyObject_Calloc`.  Otherwise, or if ``PyObject_Free(p)`` has been called
+   before, undefined behavior occurs.
+
+   If *p* is *NULL*, no operation is performed.
+
+
 Customize Memory Allocators
 ===========================
 


From webhook-mailer at python.org  Tue Oct 31 13:08:31 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 31 Oct 2017 17:08:31 -0000
Subject: [Python-checkins] bpo-20064: Document PyObject_Malloc() (#4204)
Message-ID: <mailman.44.1509469718.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/52ba7b447f41dad2754ddbc50ed97413b557bbe1
commit: 52ba7b447f41dad2754ddbc50ed97413b557bbe1
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T10:08:28-07:00
summary:

bpo-20064: Document PyObject_Malloc() (#4204)

Document the following functions:

* PyObject_Malloc()
* PyObject_Realloc()
* PyObject_Free()

Document also the pymalloc allocator.

files:
M Doc/c-api/memory.rst
M Objects/obmalloc.c

diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst
index 54655719045..258898d8702 100644
--- a/Doc/c-api/memory.rst
+++ b/Doc/c-api/memory.rst
@@ -155,6 +155,88 @@ versions and is therefore deprecated in extension modules.
 :c:func:`PyMem_NEW`, :c:func:`PyMem_RESIZE`, :c:func:`PyMem_DEL`.
 
 
+Object allocators
+=================
+
+The following function sets, modeled after the ANSI C standard, but specifying
+behavior when requesting zero bytes, are available for allocating and releasing
+memory from the Python heap.
+
+By default, these functions use :ref:`pymalloc memory allocator <pymalloc>`.
+
+.. warning::
+
+   The :term:`GIL <global interpreter lock>` must be held when using these
+   functions.
+
+.. c:function:: void* PyObject_Malloc(size_t n)
+
+   Allocates *n* bytes and returns a pointer of type :c:type:`void\*` to the
+   allocated memory, or *NULL* if the request fails.
+
+   Requesting zero bytes returns a distinct non-*NULL* pointer if possible, as
+   if ``PyObject_Malloc(1)`` had been called instead. The memory will not have
+   been initialized in any way.
+
+
+.. c:function:: void* PyObject_Realloc(void *p, size_t n)
+
+   Resizes the memory block pointed to by *p* to *n* bytes. The contents will be
+   unchanged to the minimum of the old and the new sizes.
+
+   If *p* is *NULL*, the call is equivalent to ``PyObject_Malloc(n)``; else if *n*
+   is equal to zero, the memory block is resized but is not freed, and the
+   returned pointer is non-*NULL*.
+
+   Unless *p* is *NULL*, it must have been returned by a previous call to
+   :c:func:`PyObject_Malloc`, :c:func:`PyObject_Realloc` or :c:func:`PyObject_Calloc`.
+
+   If the request fails, :c:func:`PyObject_Realloc` returns *NULL* and *p* remains
+   a valid pointer to the previous memory area.
+
+
+.. c:function:: void PyObject_Free(void *p)
+
+   Frees the memory block pointed to by *p*, which must have been returned by a
+   previous call to :c:func:`PyObject_Malloc`, :c:func:`PyObject_Realloc` or
+   :c:func:`PyObject_Calloc`.  Otherwise, or if ``PyObject_Free(p)`` has been called
+   before, undefined behavior occurs.
+
+   If *p* is *NULL*, no operation is performed.
+
+
+In addition, the following macro sets are provided:
+
+* :c:func:`PyObject_MALLOC`: alias to :c:func:`PyObject_Malloc`
+* :c:func:`PyObject_REALLOC`: alias to :c:func:`PyObject_Realloc`
+* :c:func:`PyObject_FREE`: alias to :c:func:`PyObject_Free`
+* :c:func:`PyObject_Del`: alias to :c:func:`PyObject_Free`
+* :c:func:`PyObject_DEL`: alias to :c:func:`PyObject_FREE` (so finally an alias
+  to :c:func:`PyObject_Free`)
+
+
+.. _pymalloc:
+
+The pymalloc allocator
+======================
+
+Python has a *pymalloc* allocator optimized for small objects (smaller or equal
+to 512 bytes) with a short lifetime. It uses memory mappings called "arenas"
+with a fixed size of 256 KiB. It falls back to :c:func:`malloc` and
+:c:func:`realloc` for allocations larger than 512 bytes.
+
+*pymalloc* is the default allocator of :c:func:`PyObject_Malloc`.
+
+The arena allocator uses the following functions:
+
+* :c:func:`mmap` and :c:func:`munmap` if available,
+* :c:func:`malloc` and :c:func:`free` otherwise.
+
+.. versionchanged:: 2.7.7
+   The threshold changed from 256 to 512 bytes. The arena allocator now
+   uses :c:func:`mmap` if available.
+
+
 .. _memoryexamples:
 
 Examples
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 1bb1866dc6f..5655554b82d 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -214,7 +214,7 @@ static int running_on_valgrind = -1;
  * Arenas are allocated with mmap() on systems supporting anonymous memory
  * mappings to reduce heap fragmentation.
  */
-#define ARENA_SIZE              (256 << 10)     /* 256KB */
+#define ARENA_SIZE              (256 << 10)     /* 256KiB */
 
 #ifdef WITH_MEMORY_LIMITS
 #define MAX_ARENAS              (SMALL_MEMORY_LIMIT / ARENA_SIZE)


From webhook-mailer at python.org  Tue Oct 31 14:16:10 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 31 Oct 2017 18:16:10 -0000
Subject: [Python-checkins] bpo-31893: Fix errors in
 b9052a0f91d2e83bbc27267247a5920c82b242a3. (GH-4196) (#4201)
Message-ID: <mailman.45.1509473773.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/84e252b79eed94bc9e9175f82191322c89e489ad
commit: 84e252b79eed94bc9e9175f82191322c89e489ad
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-31T20:16:07+02:00
summary:

bpo-31893: Fix errors in b9052a0f91d2e83bbc27267247a5920c82b242a3. (GH-4196) (#4201)

* Fix a compilation error on FreeBSD.
* Fix the data attribute size on Mac OS X.
(cherry picked from commit 2298fad5ff907dd48ea0fb5c71fa22334ef28c6b)

files:
M Modules/selectmodule.c

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 3b9c4d65c1d..7e81f1904c0 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1841,12 +1841,12 @@ static PyTypeObject kqueue_queue_Type;
 #   define FFLAGS_FMT_UNIT  "I"
 #endif
 
-#ifdef __FreeBSD__
-#   define DATA_TYPE        T_INTPTRT
-#   define DATA_FMT_UNIT    INTPTR_FMT_UNIT
-#else
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 #   define DATA_TYPE        T_INT64
 #   define DATA_FMT_UNIT    INT64_FMT_UNIT
+#else
+#   define DATA_TYPE        T_INTPTRT
+#   define DATA_FMT_UNIT    INTPTRT_FMT_UNIT
 #endif
 
 /* Unfortunately, we can't store python objects in udata, because


From webhook-mailer at python.org  Tue Oct 31 14:16:14 2017
From: webhook-mailer at python.org (Serhiy Storchaka)
Date: Tue, 31 Oct 2017 18:16:14 -0000
Subject: [Python-checkins] bpo-31893: Fix errors in
 b9052a0f91d2e83bbc27267247a5920c82b242a3. (GH-4196) (#4202)
Message-ID: <mailman.46.1509473777.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/e7531e54bf195b8d3ed35b4138901c82f7ed794c
commit: e7531e54bf195b8d3ed35b4138901c82f7ed794c
branch: 2.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-31T20:16:11+02:00
summary:

bpo-31893: Fix errors in b9052a0f91d2e83bbc27267247a5920c82b242a3. (GH-4196) (#4202)

* Fix a compilation error on FreeBSD.
* Fix the data attribute size on Mac OS X.
(cherry picked from commit 2298fad5ff907dd48ea0fb5c71fa22334ef28c6b)

files:
M Modules/selectmodule.c

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 12601713886..6cd32cd8a93 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1285,12 +1285,12 @@ static PyTypeObject kqueue_queue_Type;
 #   define FFLAGS_FMT_UNIT  "I"
 #endif
 
-#ifdef __FreeBSD__
-#   define DATA_TYPE        T_INTPTRT
-#   define DATA_FMT_UNIT    INTPTR_FMT_UNIT
-#else
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 #   define DATA_TYPE        T_INT64
 #   define DATA_FMT_UNIT    INT64_FMT_UNIT
+#else
+#   define DATA_TYPE        T_INTPTRT
+#   define DATA_FMT_UNIT    INTPTRT_FMT_UNIT
 #endif
 
 /* Unfortunately, we can't store python objects in udata, because


From webhook-mailer at python.org  Tue Oct 31 15:18:14 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 31 Oct 2017 19:18:14 -0000
Subject: [Python-checkins] bpo-18835: Cleanup pymalloc (#4200)
Message-ID: <mailman.47.1509477500.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/9ed83c40855b57c10988f76770a4eb825e034cd8
commit: 9ed83c40855b57c10988f76770a4eb825e034cd8
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T12:18:10-07:00
summary:

bpo-18835: Cleanup pymalloc (#4200)

Cleanup pymalloc:

* Rename _PyObject_Alloc() to pymalloc_alloc()
* Rename _PyObject_FreeImpl() to pymalloc_free()
* Rename _PyObject_Realloc() to pymalloc_realloc()
* pymalloc_alloc() and pymalloc_realloc() don't fallback on the raw
  allocator anymore, it now must be done by the caller
* Add "success" and "failed" labels to pymalloc_alloc() and
  pymalloc_free()
* pymalloc_alloc() and pymalloc_free() don't update
  num_allocated_blocks anymore: it should be done in the caller
* _PyObject_Calloc() is now responsible to fill the memory block
  allocated by pymalloc with zeros
* Simplify pymalloc_alloc() prototype
* _PyObject_Realloc() now calls _PyObject_Malloc() rather than
  calling directly pymalloc_alloc()

_PyMem_DebugRawAlloc() and _PyMem_DebugRawRealloc():

* document the layout of a memory block
* don't increase the serial number if the allocation failed
* check for integer overflow before computing the total size
* add a 'data' variable to make the code easiler to follow

test_setallocators() of _testcapimodule.c now test also the context.

files:
M Modules/_testcapimodule.c
M Objects/obmalloc.c

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 899c3d93701..1f71a09974e 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -3273,34 +3273,39 @@ typedef struct {
     void *realloc_ptr;
     size_t realloc_new_size;
     void *free_ptr;
+    void *ctx;
 } alloc_hook_t;
 
-static void* hook_malloc (void* ctx, size_t size)
+static void* hook_malloc(void* ctx, size_t size)
 {
     alloc_hook_t *hook = (alloc_hook_t *)ctx;
+    hook->ctx = ctx;
     hook->malloc_size = size;
     return hook->alloc.malloc(hook->alloc.ctx, size);
 }
 
-static void* hook_calloc (void* ctx, size_t nelem, size_t elsize)
+static void* hook_calloc(void* ctx, size_t nelem, size_t elsize)
 {
     alloc_hook_t *hook = (alloc_hook_t *)ctx;
+    hook->ctx = ctx;
     hook->calloc_nelem = nelem;
     hook->calloc_elsize = elsize;
     return hook->alloc.calloc(hook->alloc.ctx, nelem, elsize);
 }
 
-static void* hook_realloc (void* ctx, void* ptr, size_t new_size)
+static void* hook_realloc(void* ctx, void* ptr, size_t new_size)
 {
     alloc_hook_t *hook = (alloc_hook_t *)ctx;
+    hook->ctx = ctx;
     hook->realloc_ptr = ptr;
     hook->realloc_new_size = new_size;
     return hook->alloc.realloc(hook->alloc.ctx, ptr, new_size);
 }
 
-static void hook_free (void *ctx, void *ptr)
+static void hook_free(void *ctx, void *ptr)
 {
     alloc_hook_t *hook = (alloc_hook_t *)ctx;
+    hook->ctx = ctx;
     hook->free_ptr = ptr;
     hook->alloc.free(hook->alloc.ctx, ptr);
 }
@@ -3325,7 +3330,9 @@ test_setallocators(PyMemAllocatorDomain domain)
     PyMem_GetAllocator(domain, &hook.alloc);
     PyMem_SetAllocator(domain, &alloc);
 
+    /* malloc, realloc, free */
     size = 42;
+    hook.ctx = NULL;
     switch(domain)
     {
     case PYMEM_DOMAIN_RAW: ptr = PyMem_RawMalloc(size); break;
@@ -3334,11 +3341,18 @@ test_setallocators(PyMemAllocatorDomain domain)
     default: ptr = NULL; break;
     }
 
+#define CHECK_CTX(FUNC) \
+    if (hook.ctx != &hook) { \
+        error_msg = FUNC " wrong context"; \
+        goto fail; \
+    } \
+    hook.ctx = NULL;  /* reset for next check */
+
     if (ptr == NULL) {
         error_msg = "malloc failed";
         goto fail;
     }
-
+    CHECK_CTX("malloc");
     if (hook.malloc_size != size) {
         error_msg = "malloc invalid size";
         goto fail;
@@ -3357,7 +3371,7 @@ test_setallocators(PyMemAllocatorDomain domain)
         error_msg = "realloc failed";
         goto fail;
     }
-
+    CHECK_CTX("realloc");
     if (hook.realloc_ptr != ptr
         || hook.realloc_new_size != size2) {
         error_msg = "realloc invalid parameters";
@@ -3371,11 +3385,13 @@ test_setallocators(PyMemAllocatorDomain domain)
     case PYMEM_DOMAIN_OBJ: PyObject_Free(ptr2); break;
     }
 
+    CHECK_CTX("free");
     if (hook.free_ptr != ptr2) {
         error_msg = "free invalid pointer";
         goto fail;
     }
 
+    /* calloc, free */
     nelem = 2;
     elsize = 5;
     switch(domain)
@@ -3390,12 +3406,13 @@ test_setallocators(PyMemAllocatorDomain domain)
         error_msg = "calloc failed";
         goto fail;
     }
-
+    CHECK_CTX("calloc");
     if (hook.calloc_nelem != nelem || hook.calloc_elsize != elsize) {
         error_msg = "calloc invalid nelem or elsize";
         goto fail;
     }
 
+    hook.free_ptr = NULL;
     switch(domain)
     {
     case PYMEM_DOMAIN_RAW: PyMem_RawFree(ptr); break;
@@ -3403,6 +3420,12 @@ test_setallocators(PyMemAllocatorDomain domain)
     case PYMEM_DOMAIN_OBJ: PyObject_Free(ptr); break;
     }
 
+    CHECK_CTX("calloc free");
+    if (hook.free_ptr != ptr) {
+        error_msg = "calloc free invalid pointer";
+        goto fail;
+    }
+
     Py_INCREF(Py_None);
     res = Py_None;
     goto finally;
@@ -3413,6 +3436,8 @@ test_setallocators(PyMemAllocatorDomain domain)
 finally:
     PyMem_SetAllocator(domain, &hook.alloc);
     return res;
+
+#undef CHECK_CTX
 }
 
 static PyObject *
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 1485172102d..b92116cd554 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -18,7 +18,7 @@ extern void _PyMem_DumpTraceback(int fd, const void *ptr);
 static void* _PyMem_DebugRawMalloc(void *ctx, size_t size);
 static void* _PyMem_DebugRawCalloc(void *ctx, size_t nelem, size_t elsize);
 static void* _PyMem_DebugRawRealloc(void *ctx, void *ptr, size_t size);
-static void _PyMem_DebugRawFree(void *ctx, void *p);
+static void _PyMem_DebugRawFree(void *ctx, void *ptr);
 
 static void* _PyMem_DebugMalloc(void *ctx, size_t size);
 static void* _PyMem_DebugCalloc(void *ctx, size_t nelem, size_t elsize);
@@ -444,6 +444,7 @@ PyMem_RawFree(void *ptr)
     _PyMem_Raw.free(_PyMem_Raw.ctx, ptr);
 }
 
+
 void *
 PyMem_Malloc(size_t size)
 {
@@ -477,6 +478,7 @@ PyMem_Free(void *ptr)
     _PyMem.free(_PyMem.ctx, ptr);
 }
 
+
 char *
 _PyMem_RawStrdup(const char *str)
 {
@@ -556,6 +558,7 @@ PyObject_Free(void *ptr)
 static int running_on_valgrind = -1;
 #endif
 
+
 Py_ssize_t
 _Py_GetAllocatedBlocks(void)
 {
@@ -661,6 +664,7 @@ new_arena(void)
     return arenaobj;
 }
 
+
 /*
 address_in_range(P, POOL)
 
@@ -750,442 +754,289 @@ address_in_range(void *p, poolp pool)
         _PyRuntime.mem.arenas[arenaindex].address != 0;
 }
 
+
 /*==========================================================================*/
 
-/* malloc.  Note that nbytes==0 tries to return a non-NULL pointer, distinct
- * from all other currently live pointers.  This may not be possible.
- */
+/* pymalloc allocator
 
-/*
- * The basic blocks are ordered by decreasing execution frequency,
- * which minimizes the number of jumps in the most common cases,
- * improves branching prediction and instruction scheduling (small
- * block allocations typically result in a couple of instructions).
- * Unless the optimizer reorders everything, being too smart...
- */
+   The basic blocks are ordered by decreasing execution frequency,
+   which minimizes the number of jumps in the most common cases,
+   improves branching prediction and instruction scheduling (small
+   block allocations typically result in a couple of instructions).
+   Unless the optimizer reorders everything, being too smart...
 
-static void *
-_PyObject_Alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize)
+   Return 1 if pymalloc allocated memory and wrote the pointer into *ptr_p.
+
+   Return 0 if pymalloc failed to allocate the memory block: on bigger
+   requests, on error in the code below (as a last chance to serve the request)
+   or when the max memory limit has been reached. */
+static int
+pymalloc_alloc(void *ctx, void **ptr_p, size_t nbytes)
 {
-    size_t nbytes;
     pyblock *bp;
     poolp pool;
     poolp next;
     uint size;
 
-    _PyRuntime.mem.num_allocated_blocks++;
-
-    assert(elsize == 0 || nelem <= PY_SSIZE_T_MAX / elsize);
-    nbytes = nelem * elsize;
-
 #ifdef WITH_VALGRIND
-    if (UNLIKELY(running_on_valgrind == -1))
+    if (UNLIKELY(running_on_valgrind == -1)) {
         running_on_valgrind = RUNNING_ON_VALGRIND;
-    if (UNLIKELY(running_on_valgrind))
-        goto redirect;
+    }
+    if (UNLIKELY(running_on_valgrind)) {
+        return 0;
+    }
 #endif
 
-    if (nelem == 0 || elsize == 0)
-        goto redirect;
+    if (nbytes == 0) {
+        return 0;
+    }
+    if (nbytes > SMALL_REQUEST_THRESHOLD) {
+        return 0;
+    }
 
-    if ((nbytes - 1) < SMALL_REQUEST_THRESHOLD) {
-        LOCK();
+    LOCK();
+    /*
+     * Most frequent paths first
+     */
+    size = (uint)(nbytes - 1) >> ALIGNMENT_SHIFT;
+    pool = _PyRuntime.mem.usedpools[size + size];
+    if (pool != pool->nextpool) {
         /*
-         * Most frequent paths first
+         * There is a used pool for this size class.
+         * Pick up the head block of its free list.
          */
-        size = (uint)(nbytes - 1) >> ALIGNMENT_SHIFT;
-        pool = _PyRuntime.mem.usedpools[size + size];
-        if (pool != pool->nextpool) {
-            /*
-             * There is a used pool for this size class.
-             * Pick up the head block of its free list.
-             */
-            ++pool->ref.count;
-            bp = pool->freeblock;
-            assert(bp != NULL);
-            if ((pool->freeblock = *(pyblock **)bp) != NULL) {
-                UNLOCK();
-                if (use_calloc)
-                    memset(bp, 0, nbytes);
-                return (void *)bp;
-            }
-            /*
-             * Reached the end of the free list, try to extend it.
-             */
-            if (pool->nextoffset <= pool->maxnextoffset) {
-                /* There is room for another block. */
-                pool->freeblock = (pyblock*)pool +
-                                  pool->nextoffset;
-                pool->nextoffset += INDEX2SIZE(size);
-                *(pyblock **)(pool->freeblock) = NULL;
-                UNLOCK();
-                if (use_calloc)
-                    memset(bp, 0, nbytes);
-                return (void *)bp;
-            }
-            /* Pool is full, unlink from used pools. */
-            next = pool->nextpool;
-            pool = pool->prevpool;
-            next->prevpool = pool;
-            pool->nextpool = next;
-            UNLOCK();
-            if (use_calloc)
-                memset(bp, 0, nbytes);
-            return (void *)bp;
+        ++pool->ref.count;
+        bp = pool->freeblock;
+        assert(bp != NULL);
+        if ((pool->freeblock = *(pyblock **)bp) != NULL) {
+            goto success;
         }
 
-        /* There isn't a pool of the right size class immediately
-         * available:  use a free pool.
+        /*
+         * Reached the end of the free list, try to extend it.
          */
-        if (_PyRuntime.mem.usable_arenas == NULL) {
-            /* No arena has a free pool:  allocate a new arena. */
-#ifdef WITH_MEMORY_LIMITS
-            if (_PyRuntime.mem.narenas_currently_allocated >= MAX_ARENAS) {
-                UNLOCK();
-                goto redirect;
-            }
-#endif
-            _PyRuntime.mem.usable_arenas = new_arena();
-            if (_PyRuntime.mem.usable_arenas == NULL) {
-                UNLOCK();
-                goto redirect;
-            }
-            _PyRuntime.mem.usable_arenas->nextarena =
-                _PyRuntime.mem.usable_arenas->prevarena = NULL;
-        }
-        assert(_PyRuntime.mem.usable_arenas->address != 0);
-
-        /* Try to get a cached free pool. */
-        pool = _PyRuntime.mem.usable_arenas->freepools;
-        if (pool != NULL) {
-            /* Unlink from cached pools. */
-            _PyRuntime.mem.usable_arenas->freepools = pool->nextpool;
-
-            /* This arena already had the smallest nfreepools
-             * value, so decreasing nfreepools doesn't change
-             * that, and we don't need to rearrange the
-             * usable_arenas list.  However, if the arena has
-             * become wholly allocated, we need to remove its
-             * arena_object from usable_arenas.
-             */
-            --_PyRuntime.mem.usable_arenas->nfreepools;
-            if (_PyRuntime.mem.usable_arenas->nfreepools == 0) {
-                /* Wholly allocated:  remove. */
-                assert(_PyRuntime.mem.usable_arenas->freepools == NULL);
-                assert(_PyRuntime.mem.usable_arenas->nextarena == NULL ||
-                       _PyRuntime.mem.usable_arenas->nextarena->prevarena ==
-                       _PyRuntime.mem.usable_arenas);
-
-                _PyRuntime.mem.usable_arenas = _PyRuntime.mem.usable_arenas->nextarena;
-                if (_PyRuntime.mem.usable_arenas != NULL) {
-                    _PyRuntime.mem.usable_arenas->prevarena = NULL;
-                    assert(_PyRuntime.mem.usable_arenas->address != 0);
-                }
-            }
-            else {
-                /* nfreepools > 0:  it must be that freepools
-                 * isn't NULL, or that we haven't yet carved
-                 * off all the arena's pools for the first
-                 * time.
-                 */
-                assert(_PyRuntime.mem.usable_arenas->freepools != NULL ||
-                       _PyRuntime.mem.usable_arenas->pool_address <=
-                       (pyblock*)_PyRuntime.mem.usable_arenas->address +
-                           ARENA_SIZE - POOL_SIZE);
-            }
-        init_pool:
-            /* Frontlink to used pools. */
-            next = _PyRuntime.mem.usedpools[size + size]; /* == prev */
-            pool->nextpool = next;
-            pool->prevpool = next;
-            next->nextpool = pool;
-            next->prevpool = pool;
-            pool->ref.count = 1;
-            if (pool->szidx == size) {
-                /* Luckily, this pool last contained blocks
-                 * of the same size class, so its header
-                 * and free list are already initialized.
-                 */
-                bp = pool->freeblock;
-                assert(bp != NULL);
-                pool->freeblock = *(pyblock **)bp;
-                UNLOCK();
-                if (use_calloc)
-                    memset(bp, 0, nbytes);
-                return (void *)bp;
-            }
-            /*
-             * Initialize the pool header, set up the free list to
-             * contain just the second block, and return the first
-             * block.
-             */
-            pool->szidx = size;
-            size = INDEX2SIZE(size);
-            bp = (pyblock *)pool + POOL_OVERHEAD;
-            pool->nextoffset = POOL_OVERHEAD + (size << 1);
-            pool->maxnextoffset = POOL_SIZE - size;
-            pool->freeblock = bp + size;
+        if (pool->nextoffset <= pool->maxnextoffset) {
+            /* There is room for another block. */
+            pool->freeblock = (pyblock*)pool +
+                              pool->nextoffset;
+            pool->nextoffset += INDEX2SIZE(size);
             *(pyblock **)(pool->freeblock) = NULL;
-            UNLOCK();
-            if (use_calloc)
-                memset(bp, 0, nbytes);
-            return (void *)bp;
+            goto success;
         }
 
-        /* Carve off a new pool. */
-        assert(_PyRuntime.mem.usable_arenas->nfreepools > 0);
-        assert(_PyRuntime.mem.usable_arenas->freepools == NULL);
-        pool = (poolp)_PyRuntime.mem.usable_arenas->pool_address;
-        assert((pyblock*)pool <= (pyblock*)_PyRuntime.mem.usable_arenas->address +
-                                 ARENA_SIZE - POOL_SIZE);
-        pool->arenaindex = (uint)(_PyRuntime.mem.usable_arenas - _PyRuntime.mem.arenas);
-        assert(&_PyRuntime.mem.arenas[pool->arenaindex] == _PyRuntime.mem.usable_arenas);
-        pool->szidx = DUMMY_SIZE_IDX;
-        _PyRuntime.mem.usable_arenas->pool_address += POOL_SIZE;
-        --_PyRuntime.mem.usable_arenas->nfreepools;
+        /* Pool is full, unlink from used pools. */
+        next = pool->nextpool;
+        pool = pool->prevpool;
+        next->prevpool = pool;
+        pool->nextpool = next;
+        goto success;
+    }
 
+    /* There isn't a pool of the right size class immediately
+     * available:  use a free pool.
+     */
+    if (_PyRuntime.mem.usable_arenas == NULL) {
+        /* No arena has a free pool:  allocate a new arena. */
+#ifdef WITH_MEMORY_LIMITS
+        if (_PyRuntime.mem.narenas_currently_allocated >= MAX_ARENAS) {
+            goto failed;
+        }
+#endif
+        _PyRuntime.mem.usable_arenas = new_arena();
+        if (_PyRuntime.mem.usable_arenas == NULL) {
+            goto failed;
+        }
+        _PyRuntime.mem.usable_arenas->nextarena =
+            _PyRuntime.mem.usable_arenas->prevarena = NULL;
+    }
+    assert(_PyRuntime.mem.usable_arenas->address != 0);
+
+    /* Try to get a cached free pool. */
+    pool = _PyRuntime.mem.usable_arenas->freepools;
+    if (pool != NULL) {
+        /* Unlink from cached pools. */
+        _PyRuntime.mem.usable_arenas->freepools = pool->nextpool;
+
+        /* This arena already had the smallest nfreepools
+         * value, so decreasing nfreepools doesn't change
+         * that, and we don't need to rearrange the
+         * usable_arenas list.  However, if the arena has
+         * become wholly allocated, we need to remove its
+         * arena_object from usable_arenas.
+         */
+        --_PyRuntime.mem.usable_arenas->nfreepools;
         if (_PyRuntime.mem.usable_arenas->nfreepools == 0) {
+            /* Wholly allocated:  remove. */
+            assert(_PyRuntime.mem.usable_arenas->freepools == NULL);
             assert(_PyRuntime.mem.usable_arenas->nextarena == NULL ||
                    _PyRuntime.mem.usable_arenas->nextarena->prevarena ==
                    _PyRuntime.mem.usable_arenas);
-            /* Unlink the arena:  it is completely allocated. */
+
             _PyRuntime.mem.usable_arenas = _PyRuntime.mem.usable_arenas->nextarena;
             if (_PyRuntime.mem.usable_arenas != NULL) {
                 _PyRuntime.mem.usable_arenas->prevarena = NULL;
                 assert(_PyRuntime.mem.usable_arenas->address != 0);
             }
         }
+        else {
+            /* nfreepools > 0:  it must be that freepools
+             * isn't NULL, or that we haven't yet carved
+             * off all the arena's pools for the first
+             * time.
+             */
+            assert(_PyRuntime.mem.usable_arenas->freepools != NULL ||
+                   _PyRuntime.mem.usable_arenas->pool_address <=
+                   (pyblock*)_PyRuntime.mem.usable_arenas->address +
+                       ARENA_SIZE - POOL_SIZE);
+        }
 
-        goto init_pool;
+    init_pool:
+        /* Frontlink to used pools. */
+        next = _PyRuntime.mem.usedpools[size + size]; /* == prev */
+        pool->nextpool = next;
+        pool->prevpool = next;
+        next->nextpool = pool;
+        next->prevpool = pool;
+        pool->ref.count = 1;
+        if (pool->szidx == size) {
+            /* Luckily, this pool last contained blocks
+             * of the same size class, so its header
+             * and free list are already initialized.
+             */
+            bp = pool->freeblock;
+            assert(bp != NULL);
+            pool->freeblock = *(pyblock **)bp;
+            goto success;
+        }
+        /*
+         * Initialize the pool header, set up the free list to
+         * contain just the second block, and return the first
+         * block.
+         */
+        pool->szidx = size;
+        size = INDEX2SIZE(size);
+        bp = (pyblock *)pool + POOL_OVERHEAD;
+        pool->nextoffset = POOL_OVERHEAD + (size << 1);
+        pool->maxnextoffset = POOL_SIZE - size;
+        pool->freeblock = bp + size;
+        *(pyblock **)(pool->freeblock) = NULL;
+        goto success;
     }
 
-    /* The small block allocator ends here. */
-
-redirect:
-    /* Redirect the original request to the underlying (libc) allocator.
-     * We jump here on bigger requests, on error in the code above (as a
-     * last chance to serve the request) or when the max memory limit
-     * has been reached.
-     */
-    {
-        void *result;
-        if (use_calloc)
-            result = PyMem_RawCalloc(nelem, elsize);
-        else
-            result = PyMem_RawMalloc(nbytes);
-        if (!result)
-            _PyRuntime.mem.num_allocated_blocks--;
-        return result;
+    /* Carve off a new pool. */
+    assert(_PyRuntime.mem.usable_arenas->nfreepools > 0);
+    assert(_PyRuntime.mem.usable_arenas->freepools == NULL);
+    pool = (poolp)_PyRuntime.mem.usable_arenas->pool_address;
+    assert((pyblock*)pool <= (pyblock*)_PyRuntime.mem.usable_arenas->address +
+                             ARENA_SIZE - POOL_SIZE);
+    pool->arenaindex = (uint)(_PyRuntime.mem.usable_arenas - _PyRuntime.mem.arenas);
+    assert(&_PyRuntime.mem.arenas[pool->arenaindex] == _PyRuntime.mem.usable_arenas);
+    pool->szidx = DUMMY_SIZE_IDX;
+    _PyRuntime.mem.usable_arenas->pool_address += POOL_SIZE;
+    --_PyRuntime.mem.usable_arenas->nfreepools;
+
+    if (_PyRuntime.mem.usable_arenas->nfreepools == 0) {
+        assert(_PyRuntime.mem.usable_arenas->nextarena == NULL ||
+               _PyRuntime.mem.usable_arenas->nextarena->prevarena ==
+               _PyRuntime.mem.usable_arenas);
+        /* Unlink the arena:  it is completely allocated. */
+        _PyRuntime.mem.usable_arenas = _PyRuntime.mem.usable_arenas->nextarena;
+        if (_PyRuntime.mem.usable_arenas != NULL) {
+            _PyRuntime.mem.usable_arenas->prevarena = NULL;
+            assert(_PyRuntime.mem.usable_arenas->address != 0);
+        }
     }
+
+    goto init_pool;
+
+success:
+    UNLOCK();
+    assert(bp != NULL);
+    *ptr_p = (void *)bp;
+    return 1;
+
+failed:
+    UNLOCK();
+    return 0;
 }
 
+
 static void *
 _PyObject_Malloc(void *ctx, size_t nbytes)
 {
-    return _PyObject_Alloc(0, ctx, 1, nbytes);
+    void* ptr;
+    if (pymalloc_alloc(ctx, &ptr, nbytes)) {
+        _PyRuntime.mem.num_allocated_blocks++;
+        return ptr;
+    }
+
+    ptr = PyMem_RawMalloc(nbytes);
+    if (ptr != NULL) {
+        _PyRuntime.mem.num_allocated_blocks++;
+    }
+    return ptr;
 }
 
+
 static void *
 _PyObject_Calloc(void *ctx, size_t nelem, size_t elsize)
 {
-    return _PyObject_Alloc(1, ctx, nelem, elsize);
+    void* ptr;
+
+    assert(elsize == 0 || nelem <= (size_t)PY_SSIZE_T_MAX / elsize);
+    size_t nbytes = nelem * elsize;
+
+    if (pymalloc_alloc(ctx, &ptr, nbytes)) {
+        memset(ptr, 0, nbytes);
+        _PyRuntime.mem.num_allocated_blocks++;
+        return ptr;
+    }
+
+    ptr = PyMem_RawCalloc(nelem, elsize);
+    if (ptr != NULL) {
+        _PyRuntime.mem.num_allocated_blocks++;
+    }
+    return ptr;
 }
 
-/* free */
 
-static void
-_PyObject_Free(void *ctx, void *p)
+/* Free a memory block allocated by pymalloc_alloc().
+   Return 1 if it was freed.
+   Return 0 if the block was not allocated by pymalloc_alloc(). */
+static int
+pymalloc_free(void *ctx, void *p)
 {
     poolp pool;
     pyblock *lastfree;
     poolp next, prev;
     uint size;
 
-    if (p == NULL)      /* free(NULL) has no effect */
-        return;
-
-    _PyRuntime.mem.num_allocated_blocks--;
+    assert(p != NULL);
 
 #ifdef WITH_VALGRIND
-    if (UNLIKELY(running_on_valgrind > 0))
-        goto redirect;
+    if (UNLIKELY(running_on_valgrind > 0)) {
+        return 0;
+    }
 #endif
 
     pool = POOL_ADDR(p);
-    if (address_in_range(p, pool)) {
-        /* We allocated this address. */
-        LOCK();
-        /* Link p to the start of the pool's freeblock list.  Since
-         * the pool had at least the p block outstanding, the pool
-         * wasn't empty (so it's already in a usedpools[] list, or
-         * was full and is in no list -- it's not in the freeblocks
-         * list in any case).
-         */
-        assert(pool->ref.count > 0);            /* else it was empty */
-        *(pyblock **)p = lastfree = pool->freeblock;
-        pool->freeblock = (pyblock *)p;
-        if (lastfree) {
-            struct arena_object* ao;
-            uint nf;  /* ao->nfreepools */
-
-            /* freeblock wasn't NULL, so the pool wasn't full,
-             * and the pool is in a usedpools[] list.
-             */
-            if (--pool->ref.count != 0) {
-                /* pool isn't empty:  leave it in usedpools */
-                UNLOCK();
-                return;
-            }
-            /* Pool is now empty:  unlink from usedpools, and
-             * link to the front of freepools.  This ensures that
-             * previously freed pools will be allocated later
-             * (being not referenced, they are perhaps paged out).
-             */
-            next = pool->nextpool;
-            prev = pool->prevpool;
-            next->prevpool = prev;
-            prev->nextpool = next;
-
-            /* Link the pool to freepools.  This is a singly-linked
-             * list, and pool->prevpool isn't used there.
-             */
-            ao = &_PyRuntime.mem.arenas[pool->arenaindex];
-            pool->nextpool = ao->freepools;
-            ao->freepools = pool;
-            nf = ++ao->nfreepools;
-
-            /* All the rest is arena management.  We just freed
-             * a pool, and there are 4 cases for arena mgmt:
-             * 1. If all the pools are free, return the arena to
-             *    the system free().
-             * 2. If this is the only free pool in the arena,
-             *    add the arena back to the `usable_arenas` list.
-             * 3. If the "next" arena has a smaller count of free
-             *    pools, we have to "slide this arena right" to
-             *    restore that usable_arenas is sorted in order of
-             *    nfreepools.
-             * 4. Else there's nothing more to do.
-             */
-            if (nf == ao->ntotalpools) {
-                /* Case 1.  First unlink ao from usable_arenas.
-                 */
-                assert(ao->prevarena == NULL ||
-                       ao->prevarena->address != 0);
-                assert(ao ->nextarena == NULL ||
-                       ao->nextarena->address != 0);
-
-                /* Fix the pointer in the prevarena, or the
-                 * usable_arenas pointer.
-                 */
-                if (ao->prevarena == NULL) {
-                    _PyRuntime.mem.usable_arenas = ao->nextarena;
-                    assert(_PyRuntime.mem.usable_arenas == NULL ||
-                           _PyRuntime.mem.usable_arenas->address != 0);
-                }
-                else {
-                    assert(ao->prevarena->nextarena == ao);
-                    ao->prevarena->nextarena =
-                        ao->nextarena;
-                }
-                /* Fix the pointer in the nextarena. */
-                if (ao->nextarena != NULL) {
-                    assert(ao->nextarena->prevarena == ao);
-                    ao->nextarena->prevarena =
-                        ao->prevarena;
-                }
-                /* Record that this arena_object slot is
-                 * available to be reused.
-                 */
-                ao->nextarena = _PyRuntime.mem.unused_arena_objects;
-                _PyRuntime.mem.unused_arena_objects = ao;
-
-                /* Free the entire arena. */
-                _PyRuntime.obj.allocator_arenas.free(_PyRuntime.obj.allocator_arenas.ctx,
-                                     (void *)ao->address, ARENA_SIZE);
-                ao->address = 0;                        /* mark unassociated */
-                --_PyRuntime.mem.narenas_currently_allocated;
-
-                UNLOCK();
-                return;
-            }
-            if (nf == 1) {
-                /* Case 2.  Put ao at the head of
-                 * usable_arenas.  Note that because
-                 * ao->nfreepools was 0 before, ao isn't
-                 * currently on the usable_arenas list.
-                 */
-                ao->nextarena = _PyRuntime.mem.usable_arenas;
-                ao->prevarena = NULL;
-                if (_PyRuntime.mem.usable_arenas)
-                    _PyRuntime.mem.usable_arenas->prevarena = ao;
-                _PyRuntime.mem.usable_arenas = ao;
-                assert(_PyRuntime.mem.usable_arenas->address != 0);
-
-                UNLOCK();
-                return;
-            }
-            /* If this arena is now out of order, we need to keep
-             * the list sorted.  The list is kept sorted so that
-             * the "most full" arenas are used first, which allows
-             * the nearly empty arenas to be completely freed.  In
-             * a few un-scientific tests, it seems like this
-             * approach allowed a lot more memory to be freed.
-             */
-            if (ao->nextarena == NULL ||
-                         nf <= ao->nextarena->nfreepools) {
-                /* Case 4.  Nothing to do. */
-                UNLOCK();
-                return;
-            }
-            /* Case 3:  We have to move the arena towards the end
-             * of the list, because it has more free pools than
-             * the arena to its right.
-             * First unlink ao from usable_arenas.
-             */
-            if (ao->prevarena != NULL) {
-                /* ao isn't at the head of the list */
-                assert(ao->prevarena->nextarena == ao);
-                ao->prevarena->nextarena = ao->nextarena;
-            }
-            else {
-                /* ao is at the head of the list */
-                assert(_PyRuntime.mem.usable_arenas == ao);
-                _PyRuntime.mem.usable_arenas = ao->nextarena;
-            }
-            ao->nextarena->prevarena = ao->prevarena;
+    if (!address_in_range(p, pool)) {
+        return 0;
+    }
+    /* We allocated this address. */
 
-            /* Locate the new insertion point by iterating over
-             * the list, using our nextarena pointer.
-             */
-            while (ao->nextarena != NULL &&
-                            nf > ao->nextarena->nfreepools) {
-                ao->prevarena = ao->nextarena;
-                ao->nextarena = ao->nextarena->nextarena;
-            }
+    LOCK();
 
-            /* Insert ao at this point. */
-            assert(ao->nextarena == NULL ||
-                ao->prevarena == ao->nextarena->prevarena);
-            assert(ao->prevarena->nextarena == ao->nextarena);
-
-            ao->prevarena->nextarena = ao;
-            if (ao->nextarena != NULL)
-                ao->nextarena->prevarena = ao;
-
-            /* Verify that the swaps worked. */
-            assert(ao->nextarena == NULL ||
-                      nf <= ao->nextarena->nfreepools);
-            assert(ao->prevarena == NULL ||
-                      nf > ao->prevarena->nfreepools);
-            assert(ao->nextarena == NULL ||
-                ao->nextarena->prevarena == ao);
-            assert((_PyRuntime.mem.usable_arenas == ao &&
-                ao->prevarena == NULL) ||
-                ao->prevarena->nextarena == ao);
-
-            UNLOCK();
-            return;
-        }
+    /* Link p to the start of the pool's freeblock list.  Since
+     * the pool had at least the p block outstanding, the pool
+     * wasn't empty (so it's already in a usedpools[] list, or
+     * was full and is in no list -- it's not in the freeblocks
+     * list in any case).
+     */
+    assert(pool->ref.count > 0);            /* else it was empty */
+    *(pyblock **)p = lastfree = pool->freeblock;
+    pool->freeblock = (pyblock *)p;
+    if (!lastfree) {
         /* Pool was full, so doesn't currently live in any list:
          * link it to the front of the appropriate usedpools[] list.
          * This mimics LRU pool usage for new allocations and
@@ -1197,93 +1048,274 @@ _PyObject_Free(void *ctx, void *p)
         size = pool->szidx;
         next = _PyRuntime.mem.usedpools[size + size];
         prev = next->prevpool;
+
         /* insert pool before next:   prev <-> pool <-> next */
         pool->nextpool = next;
         pool->prevpool = prev;
         next->prevpool = pool;
         prev->nextpool = pool;
-        UNLOCK();
+        goto success;
+    }
+
+    struct arena_object* ao;
+    uint nf;  /* ao->nfreepools */
+
+    /* freeblock wasn't NULL, so the pool wasn't full,
+     * and the pool is in a usedpools[] list.
+     */
+    if (--pool->ref.count != 0) {
+        /* pool isn't empty:  leave it in usedpools */
+        goto success;
+    }
+    /* Pool is now empty:  unlink from usedpools, and
+     * link to the front of freepools.  This ensures that
+     * previously freed pools will be allocated later
+     * (being not referenced, they are perhaps paged out).
+     */
+    next = pool->nextpool;
+    prev = pool->prevpool;
+    next->prevpool = prev;
+    prev->nextpool = next;
+
+    /* Link the pool to freepools.  This is a singly-linked
+     * list, and pool->prevpool isn't used there.
+     */
+    ao = &_PyRuntime.mem.arenas[pool->arenaindex];
+    pool->nextpool = ao->freepools;
+    ao->freepools = pool;
+    nf = ++ao->nfreepools;
+
+    /* All the rest is arena management.  We just freed
+     * a pool, and there are 4 cases for arena mgmt:
+     * 1. If all the pools are free, return the arena to
+     *    the system free().
+     * 2. If this is the only free pool in the arena,
+     *    add the arena back to the `usable_arenas` list.
+     * 3. If the "next" arena has a smaller count of free
+     *    pools, we have to "slide this arena right" to
+     *    restore that usable_arenas is sorted in order of
+     *    nfreepools.
+     * 4. Else there's nothing more to do.
+     */
+    if (nf == ao->ntotalpools) {
+        /* Case 1.  First unlink ao from usable_arenas.
+         */
+        assert(ao->prevarena == NULL ||
+               ao->prevarena->address != 0);
+        assert(ao ->nextarena == NULL ||
+               ao->nextarena->address != 0);
+
+        /* Fix the pointer in the prevarena, or the
+         * usable_arenas pointer.
+         */
+        if (ao->prevarena == NULL) {
+            _PyRuntime.mem.usable_arenas = ao->nextarena;
+            assert(_PyRuntime.mem.usable_arenas == NULL ||
+                   _PyRuntime.mem.usable_arenas->address != 0);
+        }
+        else {
+            assert(ao->prevarena->nextarena == ao);
+            ao->prevarena->nextarena =
+                ao->nextarena;
+        }
+        /* Fix the pointer in the nextarena. */
+        if (ao->nextarena != NULL) {
+            assert(ao->nextarena->prevarena == ao);
+            ao->nextarena->prevarena =
+                ao->prevarena;
+        }
+        /* Record that this arena_object slot is
+         * available to be reused.
+         */
+        ao->nextarena = _PyRuntime.mem.unused_arena_objects;
+        _PyRuntime.mem.unused_arena_objects = ao;
+
+        /* Free the entire arena. */
+        _PyRuntime.obj.allocator_arenas.free(_PyRuntime.obj.allocator_arenas.ctx,
+                             (void *)ao->address, ARENA_SIZE);
+        ao->address = 0;                        /* mark unassociated */
+        --_PyRuntime.mem.narenas_currently_allocated;
+
+        goto success;
+    }
+
+    if (nf == 1) {
+        /* Case 2.  Put ao at the head of
+         * usable_arenas.  Note that because
+         * ao->nfreepools was 0 before, ao isn't
+         * currently on the usable_arenas list.
+         */
+        ao->nextarena = _PyRuntime.mem.usable_arenas;
+        ao->prevarena = NULL;
+        if (_PyRuntime.mem.usable_arenas)
+            _PyRuntime.mem.usable_arenas->prevarena = ao;
+        _PyRuntime.mem.usable_arenas = ao;
+        assert(_PyRuntime.mem.usable_arenas->address != 0);
+
+        goto success;
+    }
+
+    /* If this arena is now out of order, we need to keep
+     * the list sorted.  The list is kept sorted so that
+     * the "most full" arenas are used first, which allows
+     * the nearly empty arenas to be completely freed.  In
+     * a few un-scientific tests, it seems like this
+     * approach allowed a lot more memory to be freed.
+     */
+    if (ao->nextarena == NULL ||
+                 nf <= ao->nextarena->nfreepools) {
+        /* Case 4.  Nothing to do. */
+        goto success;
+    }
+    /* Case 3:  We have to move the arena towards the end
+     * of the list, because it has more free pools than
+     * the arena to its right.
+     * First unlink ao from usable_arenas.
+     */
+    if (ao->prevarena != NULL) {
+        /* ao isn't at the head of the list */
+        assert(ao->prevarena->nextarena == ao);
+        ao->prevarena->nextarena = ao->nextarena;
+    }
+    else {
+        /* ao is at the head of the list */
+        assert(_PyRuntime.mem.usable_arenas == ao);
+        _PyRuntime.mem.usable_arenas = ao->nextarena;
+    }
+    ao->nextarena->prevarena = ao->prevarena;
+
+    /* Locate the new insertion point by iterating over
+     * the list, using our nextarena pointer.
+     */
+    while (ao->nextarena != NULL && nf > ao->nextarena->nfreepools) {
+        ao->prevarena = ao->nextarena;
+        ao->nextarena = ao->nextarena->nextarena;
+    }
+
+    /* Insert ao at this point. */
+    assert(ao->nextarena == NULL || ao->prevarena == ao->nextarena->prevarena);
+    assert(ao->prevarena->nextarena == ao->nextarena);
+
+    ao->prevarena->nextarena = ao;
+    if (ao->nextarena != NULL) {
+        ao->nextarena->prevarena = ao;
+    }
+
+    /* Verify that the swaps worked. */
+    assert(ao->nextarena == NULL || nf <= ao->nextarena->nfreepools);
+    assert(ao->prevarena == NULL || nf > ao->prevarena->nfreepools);
+    assert(ao->nextarena == NULL || ao->nextarena->prevarena == ao);
+    assert((_PyRuntime.mem.usable_arenas == ao && ao->prevarena == NULL)
+           || ao->prevarena->nextarena == ao);
+
+    goto success;
+
+success:
+    UNLOCK();
+    return 1;
+}
+
+
+static void
+_PyObject_Free(void *ctx, void *p)
+{
+    /* PyObject_Free(NULL) has no effect */
+    if (p == NULL) {
         return;
     }
 
-#ifdef WITH_VALGRIND
-redirect:
-#endif
-    /* We didn't allocate this address. */
-    PyMem_RawFree(p);
+    _PyRuntime.mem.num_allocated_blocks--;
+    if (!pymalloc_free(ctx, p)) {
+        /* pymalloc didn't allocate this address */
+        PyMem_RawFree(p);
+    }
 }
 
-/* realloc.  If p is NULL, this acts like malloc(nbytes).  Else if nbytes==0,
- * then as the Python docs promise, we do not treat this like free(p), and
- * return a non-NULL result.
- */
 
-static void *
-_PyObject_Realloc(void *ctx, void *p, size_t nbytes)
+/* pymalloc realloc.
+
+   If nbytes==0, then as the Python docs promise, we do not treat this like
+   free(p), and return a non-NULL result.
+
+   Return 1 if pymalloc reallocated memory and wrote the new pointer into
+   newptr_p.
+
+   Return 0 if pymalloc didn't allocated p. */
+static int
+pymalloc_realloc(void *ctx, void **newptr_p, void *p, size_t nbytes)
 {
     void *bp;
     poolp pool;
     size_t size;
 
-    if (p == NULL)
-        return _PyObject_Alloc(0, ctx, 1, nbytes);
+    assert(p != NULL);
 
 #ifdef WITH_VALGRIND
     /* Treat running_on_valgrind == -1 the same as 0 */
-    if (UNLIKELY(running_on_valgrind > 0))
-        goto redirect;
+    if (UNLIKELY(running_on_valgrind > 0)) {
+        return 0;
+    }
 #endif
 
     pool = POOL_ADDR(p);
-    if (address_in_range(p, pool)) {
-        /* We're in charge of this block */
-        size = INDEX2SIZE(pool->szidx);
-        if (nbytes <= size) {
-            /* The block is staying the same or shrinking.  If
-             * it's shrinking, there's a tradeoff:  it costs
-             * cycles to copy the block to a smaller size class,
-             * but it wastes memory not to copy it.  The
-             * compromise here is to copy on shrink only if at
-             * least 25% of size can be shaved off.
-             */
-            if (4 * nbytes > 3 * size) {
-                /* It's the same,
-                 * or shrinking and new/old > 3/4.
-                 */
-                return p;
-            }
-            size = nbytes;
-        }
-        bp = _PyObject_Alloc(0, ctx, 1, nbytes);
-        if (bp != NULL) {
-            memcpy(bp, p, size);
-            _PyObject_Free(ctx, p);
+    if (!address_in_range(p, pool)) {
+        /* pymalloc is not managing this block.
+
+           If nbytes <= SMALL_REQUEST_THRESHOLD, it's tempting to try to take
+           over this block.  However, if we do, we need to copy the valid data
+           from the C-managed block to one of our blocks, and there's no
+           portable way to know how much of the memory space starting at p is
+           valid.
+
+           As bug 1185883 pointed out the hard way, it's possible that the
+           C-managed block is "at the end" of allocated VM space, so that a
+           memory fault can occur if we try to copy nbytes bytes starting at p.
+           Instead we punt: let C continue to manage this block. */
+        return 0;
+    }
+
+    /* pymalloc is in charge of this block */
+    size = INDEX2SIZE(pool->szidx);
+    if (nbytes <= size) {
+        /* The block is staying the same or shrinking.
+
+           If it's shrinking, there's a tradeoff: it costs cycles to copy the
+           block to a smaller size class, but it wastes memory not to copy it.
+
+           The compromise here is to copy on shrink only if at least 25% of
+           size can be shaved off. */
+        if (4 * nbytes > 3 * size) {
+            /* It's the same, or shrinking and new/old > 3/4. */
+            *newptr_p = p;
+            return 1;
         }
-        return bp;
+        size = nbytes;
     }
-#ifdef WITH_VALGRIND
- redirect:
-#endif
-    /* We're not managing this block.  If nbytes <=
-     * SMALL_REQUEST_THRESHOLD, it's tempting to try to take over this
-     * block.  However, if we do, we need to copy the valid data from
-     * the C-managed block to one of our blocks, and there's no portable
-     * way to know how much of the memory space starting at p is valid.
-     * As bug 1185883 pointed out the hard way, it's possible that the
-     * C-managed block is "at the end" of allocated VM space, so that
-     * a memory fault can occur if we try to copy nbytes bytes starting
-     * at p.  Instead we punt:  let C continue to manage this block.
-     */
-    if (nbytes)
-        return PyMem_RawRealloc(p, nbytes);
-    /* C doesn't define the result of realloc(p, 0) (it may or may not
-     * return NULL then), but Python's docs promise that nbytes==0 never
-     * returns NULL.  We don't pass 0 to realloc(), to avoid that endcase
-     * to begin with.  Even then, we can't be sure that realloc() won't
-     * return NULL.
-     */
-    bp = PyMem_RawRealloc(p, 1);
-    return bp ? bp : p;
+
+    bp = _PyObject_Malloc(ctx, nbytes);
+    if (bp != NULL) {
+        memcpy(bp, p, size);
+        _PyObject_Free(ctx, p);
+    }
+    *newptr_p = bp;
+    return 1;
+}
+
+
+static void *
+_PyObject_Realloc(void *ctx, void *ptr, size_t nbytes)
+{
+    void *ptr2;
+
+    if (ptr == NULL) {
+        return _PyObject_Malloc(ctx, nbytes);
+    }
+
+    if (pymalloc_realloc(ctx, &ptr2, ptr, nbytes)) {
+        return ptr2;
+    }
+
+    return PyMem_RawRealloc(ptr, nbytes);
 }
 
 #else   /* ! WITH_PYMALLOC */
@@ -1386,37 +1418,53 @@ static void *
 _PyMem_DebugRawAlloc(int use_calloc, void *ctx, size_t nbytes)
 {
     debug_alloc_api_t *api = (debug_alloc_api_t *)ctx;
-    uint8_t *p;           /* base address of malloc'ed block */
-    uint8_t *tail;        /* p + 2*SST + nbytes == pointer to tail pad bytes */
-    size_t total;       /* nbytes + 4*SST */
+    uint8_t *p;           /* base address of malloc'epad d block */
+    uint8_t *data;        /* p + 2*SST == pointer to data bytes */
+    uint8_t *tail;        /* data + nbytes == pointer to tail pad bytes */
+    size_t total;         /* 2 * SST + nbytes + 2 * SST */
 
-    bumpserialno();
-    total = nbytes + 4*SST;
-    if (nbytes > PY_SSIZE_T_MAX - 4*SST)
-        /* overflow:  can't represent total as a Py_ssize_t */
+    if (nbytes > (size_t)PY_SSIZE_T_MAX - 4 * SST) {
+        /* integer overflow: can't represent total as a Py_ssize_t */
         return NULL;
+    }
+    total = nbytes + 4 * SST;
 
-    if (use_calloc)
+    /* Layout: [SSSS IFFF CCCC...CCCC FFFF NNNN]
+     *          ^--- p    ^--- data   ^--- tail
+       S: nbytes stored as size_t
+       I: API identifier (1 byte)
+       F: Forbidden bytes (size_t - 1 bytes before, size_t bytes after)
+       C: Clean bytes used later to store actual data
+       N: Serial number stored as size_t */
+
+    if (use_calloc) {
         p = (uint8_t *)api->alloc.calloc(api->alloc.ctx, 1, total);
-    else
+    }
+    else {
         p = (uint8_t *)api->alloc.malloc(api->alloc.ctx, total);
-    if (p == NULL)
+    }
+    if (p == NULL) {
         return NULL;
+    }
+    data = p + 2*SST;
+
+    bumpserialno();
 
     /* at p, write size (SST bytes), id (1 byte), pad (SST-1 bytes) */
     write_size_t(p, nbytes);
     p[SST] = (uint8_t)api->api_id;
     memset(p + SST + 1, FORBIDDENBYTE, SST-1);
 
-    if (nbytes > 0 && !use_calloc)
-        memset(p + 2*SST, CLEANBYTE, nbytes);
+    if (nbytes > 0 && !use_calloc) {
+        memset(data, CLEANBYTE, nbytes);
+    }
 
     /* at tail, write pad (SST bytes) and serialno (SST bytes) */
-    tail = p + 2*SST + nbytes;
+    tail = data + nbytes;
     memset(tail, FORBIDDENBYTE, SST);
     write_size_t(tail + SST, _PyRuntime.mem.serialno);
 
-    return p + 2*SST;
+    return data;
 }
 
 static void *
@@ -1429,11 +1477,12 @@ static void *
 _PyMem_DebugRawCalloc(void *ctx, size_t nelem, size_t elsize)
 {
     size_t nbytes;
-    assert(elsize == 0 || nelem <= PY_SSIZE_T_MAX / elsize);
+    assert(elsize == 0 || nelem <= (size_t)PY_SSIZE_T_MAX / elsize);
     nbytes = nelem * elsize;
     return _PyMem_DebugRawAlloc(1, ctx, nbytes);
 }
 
+
 /* The debug free first checks the 2*SST bytes on each end for sanity (in
    particular, that the FORBIDDENBYTEs with the api ID are still intact).
    Then fills the original bytes with DEADBYTE.
@@ -1442,63 +1491,73 @@ _PyMem_DebugRawCalloc(void *ctx, size_t nelem, size_t elsize)
 static void
 _PyMem_DebugRawFree(void *ctx, void *p)
 {
+    /* PyMem_Free(NULL) has no effect */
+    if (p == NULL) {
+        return;
+    }
+
     debug_alloc_api_t *api = (debug_alloc_api_t *)ctx;
     uint8_t *q = (uint8_t *)p - 2*SST;  /* address returned from malloc */
     size_t nbytes;
 
-    if (p == NULL)
-        return;
     _PyMem_DebugCheckAddress(api->api_id, p);
     nbytes = read_size_t(q);
-    nbytes += 4*SST;
-    if (nbytes > 0)
-        memset(q, DEADBYTE, nbytes);
+    nbytes += 4 * SST;
+    memset(q, DEADBYTE, nbytes);
     api->alloc.free(api->alloc.ctx, q);
 }
 
+
 static void *
 _PyMem_DebugRawRealloc(void *ctx, void *p, size_t nbytes)
 {
+    if (p == NULL) {
+        return _PyMem_DebugRawAlloc(0, ctx, nbytes);
+    }
+
     debug_alloc_api_t *api = (debug_alloc_api_t *)ctx;
-    uint8_t *q = (uint8_t *)p;
-    uint8_t *tail;
-    size_t total;       /* nbytes + 4*SST */
+    uint8_t *q;           /* base address of malloc'epad d block */
+    uint8_t *data;        /* p + 2*SST == pointer to data bytes */
+    uint8_t *tail;        /* data + nbytes == pointer to tail pad bytes */
+    size_t total;         /* 2 * SST + nbytes + 2 * SST */
     size_t original_nbytes;
     int i;
 
-    if (p == NULL)
-        return _PyMem_DebugRawAlloc(0, ctx, nbytes);
-
     _PyMem_DebugCheckAddress(api->api_id, p);
-    bumpserialno();
+
+    q = (uint8_t *)p;
     original_nbytes = read_size_t(q - 2*SST);
-    total = nbytes + 4*SST;
-    if (nbytes > PY_SSIZE_T_MAX - 4*SST)
-        /* overflow:  can't represent total as a Py_ssize_t */
+    if (nbytes > (size_t)PY_SSIZE_T_MAX - 4*SST) {
+        /* integer overflow: can't represent total as a Py_ssize_t */
         return NULL;
+    }
+    total = nbytes + 4*SST;
 
     /* Resize and add decorations. */
     q = (uint8_t *)api->alloc.realloc(api->alloc.ctx, q - 2*SST, total);
-    if (q == NULL)
+    if (q == NULL) {
         return NULL;
+    }
 
+    bumpserialno();
     write_size_t(q, nbytes);
     assert(q[SST] == (uint8_t)api->api_id);
-    for (i = 1; i < SST; ++i)
+    for (i = 1; i < SST; ++i) {
         assert(q[SST + i] == FORBIDDENBYTE);
-    q += 2*SST;
+    }
+    data = q + 2*SST;
 
-    tail = q + nbytes;
+    tail = data + nbytes;
     memset(tail, FORBIDDENBYTE, SST);
     write_size_t(tail + SST, _PyRuntime.mem.serialno);
 
     if (nbytes > original_nbytes) {
         /* growing:  mark new extra memory clean */
-        memset(q + original_nbytes, CLEANBYTE,
+        memset(data + original_nbytes, CLEANBYTE,
                nbytes - original_nbytes);
     }
 
-    return q;
+    return data;
 }
 
 static void
@@ -1523,6 +1582,7 @@ _PyMem_DebugCalloc(void *ctx, size_t nelem, size_t elsize)
     return _PyMem_DebugRawCalloc(ctx, nelem, elsize);
 }
 
+
 static void
 _PyMem_DebugFree(void *ctx, void *ptr)
 {
@@ -1530,6 +1590,7 @@ _PyMem_DebugFree(void *ctx, void *ptr)
     _PyMem_DebugRawFree(ctx, ptr);
 }
 
+
 static void *
 _PyMem_DebugRealloc(void *ctx, void *ptr, size_t nbytes)
 {


From lp_benchmark_robot at intel.com  Tue Oct 31 18:21:52 2017
From: lp_benchmark_robot at intel.com (lp_benchmark_robot at intel.com)
Date: Tue, 31 Oct 2017 15:21:52 -0700
Subject: [Python-checkins] [65 flat] Results for Python (master branch)
 2017-10-31
Message-ID: <db59b258-f6b3-4ede-8e90-61924b036224@orsmsx156.amr.corp.intel.com>

Results for project python/master, build date: 2017-10-31 03:03:14-07:00.
  - commit:		f0f62cc
  - previous commit:	a231428
  - revision date:	2017-10-31 00:07:36-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.227% |  -0.084%   |  +4.452%   |  +7.996%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_method| 1.589% |  -0.412%   |  +22.315%  |  +11.703%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       call_method_slots| 0.968% |  +0.206%   |  +23.769%  |  +11.695%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     call_method_unknown| 1.059% |  +0.086%   |  +22.368%  |  +9.792%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             call_simple| 3.153% |  +1.416%   |  +8.945%   |  +7.342%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               chameleon| 1.203% |  +0.359%   |  +11.727%  |  +7.864%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   chaos| 1.865% |  -0.398%   |  +7.445%   |  +9.556%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            crypto_pyaes| 0.494% |  +0.352%   |  +4.160%   |  +4.163%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               deltablue| 3.356% |  +0.289%   |  +7.313%   |  +18.108%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         django_template| 6.588% |  -1.479%   |  +7.015%   |  +13.719%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             dulwich_log| 1.295% |  -0.008%   |  +3.306%   |  +6.399%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                fannkuch| 0.781% |  -0.237%   |  +3.511%   |  +6.551%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   float| 0.988% |  -0.157%   |  +3.066%   |  +6.909%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             genshi_text| 0.987% |  -0.172%   |  +13.190%  |  +6.515%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              genshi_xml| 1.805% |  -0.839%   |  +7.619%   |  +10.246%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                      go| 1.032% |  -0.276%   |  +4.818%   |  +12.082%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  hexiom| 0.537% |  +0.054%   |  +9.768%   |  +11.396%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                html5lib| 2.586% |  +0.191%   |  +8.222%   |  +9.719%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_dumps| 1.428% |  +0.210%   |  +3.234%   |  +8.763%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              json_loads| 2.263% |  -0.128%   |  -0.418%   |  +11.571%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_format| 1.895% |  -0.218%   |  +7.739%   |  +11.980%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_silent| 2.974% |  -0.498%   |  +47.104%  |  +11.039%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          logging_simple| 1.580% |  -0.483%   |  +8.277%   |  +12.850%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                    mako| 0.841% |  -0.247%   |  +17.061%  |  +12.632%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                     mdp| 2.269% |  +0.009%   |  +9.242%   |  +9.857%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          meteor_contest| 1.602% |  +0.194%   |  +2.995%   |  +5.723%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   nbody| 0.503% |  +0.065%   |  -0.157%   |  -1.205%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 nqueens| 0.604% |  +0.384%   |  +6.924%   |  +3.991%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                 pathlib| 1.121% |  -0.153%   |  +6.742%   |  +7.567%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                  pickle| 1.142% |  +0.169%   |  -0.905%   |  +22.743%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_dict| 2.177% |  -0.383%   |  +1.291%   |  +19.980%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             pickle_list| 0.811% |  -0.249%   |  +4.574%   |  +15.714%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      pickle_pure_python| 3.810% |  +0.570%   |  +10.831%  |  +9.759%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                pidigits| 0.302% |  -0.102%   |  +0.068%   |  +10.115%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |          python_startup| 0.125% |  -0.160%   |  +11.076%  |  +4.492%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  python_startup_no_site| 0.095% |  -0.144%   |  +2.406%   |  +4.662%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                raytrace| 1.524% |  -0.020%   |  +9.269%   |  +13.265%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           regex_compile| 5.240% |  +0.007%   |  -1.624%   |  +12.732%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               regex_dna| 1.308% |  -0.134%   |  -1.596%   |  +9.897%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            regex_effbot| 2.649% |  -0.311%   |  -2.730%   |  +0.694%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                regex_v8| 2.169% |  -0.175%   |  +5.999%   |  +8.003%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                richards| 1.571% |  -0.419%   |  +6.961%   |  +14.381%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_fft| 0.792% |  -0.259%   |  +2.529%   |  +0.730%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |              scimark_lu| 1.846% |  -0.384%   |  +27.753%  |  +6.014%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     scimark_monte_carlo| 1.521% |  -0.180%   |  +4.043%   |  +5.182%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |             scimark_sor| 0.394% |  +0.070%   |  +15.549%  |  +5.794%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| | scimark_sparse_mat_mult| 0.595% |  -0.063%   |  +4.087%   |  -2.624%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           spectral_norm| 0.526% |  -0.034%   |  +6.907%   |  +0.807%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |  sqlalchemy_declarative| 1.060% |  -0.380%   |  +6.231%   |  +6.569%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |   sqlalchemy_imperative| 2.937% |  +0.246%   |  +6.210%   |  +4.582%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sqlite_synth| 4.478% |  -1.028%   |  +17.712%  |  +11.983%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            sympy_expand| 2.611% |  -0.097%   |  +10.737%  |  +8.232%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         sympy_integrate| 2.006% |  -0.672%   |  +8.865%   |  +6.268%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_str| 4.266% |  -0.688%   |  +10.141%  |  +8.873%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |               sympy_sum| 5.409% |  -0.541%   |  +10.015%  |  +8.952%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                   telco| 5.567% |  -0.447%   |  +22.784%  |  +9.853%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |            tornado_http| 1.053% |  -0.178%   |  +5.349%   |  +7.120%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         unpack_sequence| 1.116% |  -0.221%   |  +2.151%   |  -0.695%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |                unpickle| 5.144% |  +4.937%   |  +10.764%  |  +17.504%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |           unpickle_list| 0.459% |  -0.100%   |  +4.975%   |  +11.774%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |    unpickle_pure_python| 2.002% |  +1.558%   |  +7.901%   |  +5.687%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |      xml_etree_generate| 0.850% |  -0.172%   |  +6.375%   |  +6.911%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |     xml_etree_iterparse| 2.198% |  -0.029%   |  +2.995%   |  +6.785%   |
+-----+------------------------+--------+------------+------------+------------+
| :-| |         xml_etree_parse| 2.486% |  +0.107%   |  -5.656%   |  +11.745%  |
+-----+------------------------+--------+------------+------------+------------+
| :-| |       xml_etree_process| 1.192% |  -0.072%   |  +7.661%   |  +7.593%   |
+-----+------------------------+--------+------------+------------+------------+

* 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-10-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.

From webhook-mailer at python.org  Tue Oct 31 22:48:16 2017
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 01 Nov 2017 02:48:16 -0000
Subject: [Python-checkins] Fix test_socket.test_create_connection() (#4206)
Message-ID: <mailman.48.1509504497.1484.python-checkins@python.org>

https://github.com/python/cpython/commit/280c22a82a6756e9caffef031c564fd98f1b50e7
commit: 280c22a82a6756e9caffef031c564fd98f1b50e7
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T19:48:14-07:00
summary:

Fix test_socket.test_create_connection() (#4206)

bpo-31910: test_create_connection() now catchs also EADDRNOTAVAIL to
fix the test on Travis CI.

files:
M Lib/test/test_socket.py

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 84ec4291335..41eac2396bb 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -4533,6 +4533,10 @@ def test_create_connection(self):
         expected_errnos = [ errno.ECONNREFUSED, ]
         if hasattr(errno, 'ENETUNREACH'):
             expected_errnos.append(errno.ENETUNREACH)
+        if hasattr(errno, 'EADDRNOTAVAIL'):
+            # bpo-31910: socket.create_connection() fails randomly
+            # with EADDRNOTAVAIL on Travis CI
+            expected_errnos.append(errno.EADDRNOTAVAIL)
 
         self.assertIn(cm.exception.errno, expected_errnos)